From 94f3ca142f155791d45b90b0c99f2a056eaab314 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <me@joshuakgoldberg.com>
Date: Sun, 8 Mar 2020 16:25:23 -0400
Subject: [PATCH 1/6] Added runtime TypeError for non-function, non-null
 __extends

As per the linked issue, although TypeScript already has checking in place that tries to prevent users from extending classes before their declaration, it's still possible to accidentally work around the checker. This adds a block to `__extends` that throws a `TypeError` if the base class `b` isn't a function.

My _hope_ is that this will not have a negative performance impact on community performance-critical applications, as they would likely already prefer newer browser/Node versions and output ES2015+ code. If there is something you can think of that I should do to verify that hope, I'd love to know!

For reference, runtime errors in Node 12.0.0 (Chrome exhibits the same messages):

```js
class X extends null { }
// undefined

class Y extends undefined { }
// TypeError: Class extends value undefined is not a constructor or null

class Z extends 0 { }
// TypeError: Class extends value 0 is not a constructor or null
```

`Class extends value {0} is not a constructor or null` matches the Node.js behavior:
* [Message template](https://github.com/nodejs/node/blob/2bdeb88c27b4d8de3a8f6b7a438cf0bcb88fa927/deps/v8/src/common/message-template.h) for `ExtendsValueNotConstructor`
* [Error thrown with that message](https://github.com/nodejs/node/blob/6ca81ad72a3c6fdf16c683335be748f22aaa9a0d/deps/v8/src/runtime/runtime-classes.cc#L617) when `!super_class->IsConstructor()`

Runtime errors in Firefox 72.0.1:

```js
class X extends null { }
// undefined

class Y extends undefined { }
// TypeError: class heritage undefined is not an object or null

class Z extends 0 { }
// TypeError: class heritage 0 is not an object or null
```
---
 src/compiler/transformers/es2015.ts           |   3 +
 ...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, 3095 insertions(+), 629 deletions(-)

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 6bffbe3b299..548e8d68277 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -4321,6 +4321,9 @@ namespace ts {
                 };
 
                 return function (d, b) {
+                    if (typeof b !== "function" && b !== null) {
+                        throw new TypeError("Class extends value " + b + " is not a constructor or null");
+                    }
                     extendStatics(d, b);
                     function __() { this.constructor = d; }
                     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
index 9074e2ad4c8..9557601efee 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7ffab769794..d4cf1fe69ae 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4e7b9f87095..4f71c72da59 100644
--- a/tests/baselines/reference/abstractClassInLocalScope.js
+++ b/tests/baselines/reference/abstractClassInLocalScope.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 60af14e625b..fe0304dc8bd 100644
--- a/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
+++ b/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5fc7f19d7c6..149339bc265 100644
--- a/tests/baselines/reference/abstractProperty.js
+++ b/tests/baselines/reference/abstractProperty.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ab830664d51..5c67c4c920a 100644
--- a/tests/baselines/reference/abstractPropertyInConstructor.js
+++ b/tests/baselines/reference/abstractPropertyInConstructor.js
@@ -80,6 +80,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a26369108ab..ac5c77c59a8 100644
--- a/tests/baselines/reference/abstractPropertyNegative.js
+++ b/tests/baselines/reference/abstractPropertyNegative.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6512ba01d67..b2005724d03 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.js
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 938bae03374..ecfe5fc34fd 100644
--- a/tests/baselines/reference/accessorsOverrideProperty7.js
+++ b/tests/baselines/reference/accessorsOverrideProperty7.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9d0a9689e05..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,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8f9b50367df..da5b2725fe9 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -47,6 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5c695af5101..68833218d2c 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d47b38d7122..d010bdf1072 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 27e4106b46e..177b1a5cea7 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 847bc0fcb0a..ae171ff395d 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b2a06fc061a..0e06ab07a16 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d65977dd09e..bca20359e01 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fa5fa26384d..9d387ff62cb 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -70,6 +73,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2d570d3cccc..c569781f1ff 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 56bef268fb4..11669a4b006 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.js
+++ b/tests/baselines/reference/ambiguousOverloadResolution.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f8f25a4e1aa..886f7ae5280 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 50090286ffa..36cbcaa0275 100644
--- a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
+++ b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " 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,6 +87,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 606f33724d0..58a2cfc4623 100644
--- a/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
+++ b/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2e9987f1e0d..6d54f798fb2 100644
--- a/tests/baselines/reference/apparentTypeSubtyping.js
+++ b/tests/baselines/reference/apparentTypeSubtyping.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 82443d22197..09c6abe3491 100644
--- a/tests/baselines/reference/apparentTypeSupertype.js
+++ b/tests/baselines/reference/apparentTypeSupertype.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 baf1e8bfa3a..c3f3338c811 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.js
+++ b/tests/baselines/reference/arrayAssignmentTest1.js
@@ -94,6 +94,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5b1a655d781..fcb5ff5df68 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.js
+++ b/tests/baselines/reference/arrayAssignmentTest2.js
@@ -68,6 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7b8da4f7970..9e74206c132 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.js
+++ b/tests/baselines/reference/arrayBestCommonTypes.js
@@ -116,6 +116,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fcd8a62ce0b..8c9d99dc46e 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.js
+++ b/tests/baselines/reference/arrayLiteralTypeInference.js
@@ -60,6 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c4d257dd546..1cf819168e5 100644
--- a/tests/baselines/reference/arrayLiterals.js
+++ b/tests/baselines/reference/arrayLiterals.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 25a76bec5c7..ef77fb3ea15 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 45b587c0e62..c22456b5eac 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 466131ea206..84ec5e76414 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -104,6 +104,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 46e88e61ad0..fa95311ea24 100644
--- a/tests/baselines/reference/assertionTypePredicates1.js
+++ b/tests/baselines/reference/assertionTypePredicates1.js
@@ -174,6 +174,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a051b4e5194..136312daaae 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
@@ -109,6 +109,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fc83877023b..5d172b9b5a3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
@@ -108,6 +108,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fb6d0be1be1..3f754e20256 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
@@ -75,6 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9e752a43a17..40d925b99f4 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 932f9bb5d66..6b9ea414bba 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
@@ -109,6 +109,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4dad18cea8f..9a14d501a7c 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
@@ -108,6 +108,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5f16895caf2..9b6b6f2983f 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
@@ -75,6 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dfce487fff1..3fd0675a214 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6cdab6f3bed..81289abd59e 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
@@ -53,6 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 54eb5e3ac9b..ca864f24df8 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
@@ -50,6 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dd8d9d1bf46..56e0ca2b037 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
@@ -101,6 +101,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fa8ca3f7ad8..2af39acd2aa 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
@@ -98,6 +98,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 918c2739ace..a8f0991cf64 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -101,6 +101,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9a67a00bac0..08e335b55a9 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
@@ -63,6 +63,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dd7f28cb003..644f66e5abf 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.js
+++ b/tests/baselines/reference/assignmentLHSIsValue.js
@@ -79,6 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7e8b5990238..3cdf95df073 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 53ce6dc9dc3..f96ad8fc6ab 100644
--- a/tests/baselines/reference/autolift4.js
+++ b/tests/baselines/reference/autolift4.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 114bbf655e4..516adec8694 100644
--- a/tests/baselines/reference/baseCheck.js
+++ b/tests/baselines/reference/baseCheck.js
@@ -38,6 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2b864807570..4d64e8af1d2 100644
--- a/tests/baselines/reference/baseClassImprovedMismatchErrors.js
+++ b/tests/baselines/reference/baseClassImprovedMismatchErrors.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8b496c83a03..396adade09b 100644
--- a/tests/baselines/reference/baseConstraintOfDecorator.js
+++ b/tests/baselines/reference/baseConstraintOfDecorator.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 aa16fcebf55..38f60f7fd97 100644
--- a/tests/baselines/reference/baseExpressionTypeParameters.js
+++ b/tests/baselines/reference/baseExpressionTypeParameters.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 09aabe21ac4..b947fd1216c 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.js
+++ b/tests/baselines/reference/baseIndexSignatureResolution.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 31fa3391af5..9b3417dc995 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.js
+++ b/tests/baselines/reference/baseTypeOrderChecking.js
@@ -45,6 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 de50a58205d..6ee6efc8933 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 25cf4073d5c..9f6b20a71eb 100644
--- a/tests/baselines/reference/bases.js
+++ b/tests/baselines/reference/bases.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b755bf200a5..26fb7952d44 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b7afc3eee41..d357dd5363d 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a3672a76423..df3bd9deec0 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.js
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5487991bc29..325dc56370b 100644
--- a/tests/baselines/reference/callChainWithSuper(target=es5).js
+++ b/tests/baselines/reference/callChainWithSuper(target=es5).js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e139bcca598..f3a4ed31761 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
@@ -79,6 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b8a024a8a09..2b10f0e3851 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
@@ -124,6 +124,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a969d77fb03..b98cd8a885b 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
@@ -59,6 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cf8889cbf27..830901db1ca 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
@@ -59,6 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 baa98cb72d5..cfbd3f9a181 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
@@ -62,6 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ee0ab6fe8a7..c1977dc9981 100644
--- a/tests/baselines/reference/callWithSpread.js
+++ b/tests/baselines/reference/callWithSpread.js
@@ -67,6 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dd433fc1db7..42899e76c33 100644
--- a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 919f8491114..5032900df2a 100644
--- a/tests/baselines/reference/captureThisInSuperCall.js
+++ b/tests/baselines/reference/captureThisInSuperCall.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ac21b229a3c..5a2f89298ce 100644
--- a/tests/baselines/reference/castingTuple.js
+++ b/tests/baselines/reference/castingTuple.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c3e73310188..81c9e0d4159 100644
--- a/tests/baselines/reference/chainedAssignment3.js
+++ b/tests/baselines/reference/chainedAssignment3.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 69ecf8cd52d..dfb8d8a455c 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d03127eaa7d..87995535308 100644
--- a/tests/baselines/reference/checkForObjectTooStrict.js
+++ b/tests/baselines/reference/checkForObjectTooStrict.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 30e59613eb9..63f811a67c7 100644
--- a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
+++ b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 44fe4e1053d..af28d3eb339 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dcdf7ac1e88..480c7baabaa 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 12051095b6a..e213c7c05e6 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7ebf2ec717a..bae227dd449 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 02480bc17c9..ddd75f2d3ce 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.js
@@ -54,6 +54,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2e29ee2a2fb..d3c34622b84 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 825f38b92ac..b4f77ae0ff6 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.js
@@ -53,6 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a8b5e4e9fa4..f96a0585b0a 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.js
@@ -38,6 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f085c94f5ed..d6e371fd197 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.js
@@ -39,6 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cbdf2835c0b..af389ce3fce 100644
--- a/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
+++ b/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d1d6dd7eeec..ed629829b97 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e507ddaecc1..d99574f3051 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 74a40ba6f29..30de6e92a83 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 199ab08d993..6452059dd39 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fcb45365bfc..bdc6e55bc32 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c6372d5a436..fbddda517ec 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5e0e9000e7d..9cfaf4afec4 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2c32bc82248..4c82d7b2b29 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 74bd178a888..a8301289def 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 175f48d4bca..1bd6fb4e401 100644
--- a/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
+++ b/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 11049041b18..3b3181bacb3 100644
--- a/tests/baselines/reference/circularImportAlias.js
+++ b/tests/baselines/reference/circularImportAlias.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 97dec519a99..d83696bfc50 100644
--- a/tests/baselines/reference/circularTypeofWithFunctionModule.js
+++ b/tests/baselines/reference/circularTypeofWithFunctionModule.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b19f6788fed..ea86d2bf083 100644
--- a/tests/baselines/reference/classAbstractConstructorAssignability.js
+++ b/tests/baselines/reference/classAbstractConstructorAssignability.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ec0680fe873..ea2db89e9cf 100644
--- a/tests/baselines/reference/classAbstractCrashedOnce.js
+++ b/tests/baselines/reference/classAbstractCrashedOnce.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 24357c0bdc6..7dd4b30bcb0 100644
--- a/tests/baselines/reference/classAbstractExtends.js
+++ b/tests/baselines/reference/classAbstractExtends.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 002b065c641..7ca0b425cc8 100644
--- a/tests/baselines/reference/classAbstractFactoryFunction.js
+++ b/tests/baselines/reference/classAbstractFactoryFunction.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e7e77bd47df..510f492b522 100644
--- a/tests/baselines/reference/classAbstractGeneric.js
+++ b/tests/baselines/reference/classAbstractGeneric.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ff2103d78ac..288b452c88c 100644
--- a/tests/baselines/reference/classAbstractInAModule.js
+++ b/tests/baselines/reference/classAbstractInAModule.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 478c2f5979d..ce76c42f190 100644
--- a/tests/baselines/reference/classAbstractInheritance.js
+++ b/tests/baselines/reference/classAbstractInheritance.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fc3a2448346..fd2222a5377 100644
--- a/tests/baselines/reference/classAbstractInstantiations1.js
+++ b/tests/baselines/reference/classAbstractInstantiations1.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4beafc415f7..d43568f3dbb 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.js
+++ b/tests/baselines/reference/classAbstractInstantiations2.js
@@ -60,6 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1765b8958c8..8502b5aa21e 100644
--- a/tests/baselines/reference/classAbstractOverrideWithAbstract.js
+++ b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f812c4425a8..cff0842ff9b 100644
--- a/tests/baselines/reference/classAbstractSuperCalls.js
+++ b/tests/baselines/reference/classAbstractSuperCalls.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9f855223f17..5099fe11971 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0a8e4893496..4e5b2ade0c8 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1868df64fd8..4c66edf5103 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.js
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -54,6 +54,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 412f4f95bca..888e9c5316b 100644
--- a/tests/baselines/reference/classConstructorAccessibility4.js
+++ b/tests/baselines/reference/classConstructorAccessibility4.js
@@ -38,6 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ec950634e11..94dd91637aa 100644
--- a/tests/baselines/reference/classConstructorAccessibility5.js
+++ b/tests/baselines/reference/classConstructorAccessibility5.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2bb0f49a481..453900bf32d 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 de647fc282a..a6b497780ad 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bf034cde19b..13cd7db5e4a 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 53ed374116f..2c9c7ae1642 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 78fee53c66c..f3664491f83 100644
--- a/tests/baselines/reference/classDeclaredBeforeClassFactory.js
+++ b/tests/baselines/reference/classDeclaredBeforeClassFactory.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0a3e6698f3c..2369bda834d 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3ad11c2b731..0dd173f34e8 100644
--- a/tests/baselines/reference/classExpression2.js
+++ b/tests/baselines/reference/classExpression2.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a87515f3f2f..16ea2823a2f 100644
--- a/tests/baselines/reference/classExpression3.js
+++ b/tests/baselines/reference/classExpression3.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fe8e4ce19df..bef91534fe1 100644
--- a/tests/baselines/reference/classExpressionExtendingAbstractClass.js
+++ b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cb635f9eee2..1c8fa8aa34e 100644
--- a/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
+++ b/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8d2c2dfdd31..83cd9b04bfa 100644
--- a/tests/baselines/reference/classExtendingBuiltinType.js
+++ b/tests/baselines/reference/classExtendingBuiltinType.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cd462784c4f..1b6b7f9a76a 100644
--- a/tests/baselines/reference/classExtendingClass.js
+++ b/tests/baselines/reference/classExtendingClass.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 016454073ec..61af83d198d 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.js
+++ b/tests/baselines/reference/classExtendingClassLikeType.js
@@ -67,6 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c83ea16696e..a1698b831d3 100644
--- a/tests/baselines/reference/classExtendingNonConstructor.js
+++ b/tests/baselines/reference/classExtendingNonConstructor.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 99c8fb76501..65c4fff4373 100644
--- a/tests/baselines/reference/classExtendingNull.js
+++ b/tests/baselines/reference/classExtendingNull.js
@@ -13,6 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8ad1eb89c1b..5d9ee3c76bd 100644
--- a/tests/baselines/reference/classExtendingPrimitive.js
+++ b/tests/baselines/reference/classExtendingPrimitive.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b6524e2bd04..9cca267f309 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.js
+++ b/tests/baselines/reference/classExtendingPrimitive2.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1465af9739a..42d82f6ea0f 100644
--- a/tests/baselines/reference/classExtendingQualifiedName.js
+++ b/tests/baselines/reference/classExtendingQualifiedName.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 20e9994ea2e..f0454c72f27 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.js
+++ b/tests/baselines/reference/classExtendingQualifiedName2.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 16b8095cc45..953f7bd630b 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -64,6 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 18dd63364b6..7613c23ae8d 100644
--- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f746f36daef..8ad72c59b1e 100644
--- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7fcb678fc65..6624104b8ba 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f8c5f110389..e11d58af787 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 047e6161354..84aea7bdf8b 100644
--- a/tests/baselines/reference/classExtendsInterface.js
+++ b/tests/baselines/reference/classExtendsInterface.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a930feed6cf..261777267c7 100644
--- a/tests/baselines/reference/classExtendsInterfaceInExpression.js
+++ b/tests/baselines/reference/classExtendsInterfaceInExpression.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7aa057a9227..22a852a58bd 100644
--- a/tests/baselines/reference/classExtendsInterfaceInModule.js
+++ b/tests/baselines/reference/classExtendsInterfaceInModule.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 238a00bbbd2..407e55690cc 100644
--- a/tests/baselines/reference/classExtendsInterface_not.js
+++ b/tests/baselines/reference/classExtendsInterface_not.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ba71ae1df91..1b9eac2a341 100644
--- a/tests/baselines/reference/classExtendsItself.js
+++ b/tests/baselines/reference/classExtendsItself.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 04d5a9879d5..fa2026179d3 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 310d96ee7ab..bd1d4afddce 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 af882e651d0..4546e39b74c 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly3.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly3.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -48,6 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -69,6 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -90,6 +99,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -111,6 +123,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -132,6 +147,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1727a582238..27427f54141 100644
--- a/tests/baselines/reference/classExtendsMultipleBaseClasses.js
+++ b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2fef0e405f1..82fedc750a2 100644
--- a/tests/baselines/reference/classExtendsNull.js
+++ b/tests/baselines/reference/classExtendsNull.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3b86d7739cd..23305ebdfce 100644
--- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6570beaf8c9..cb8781c1562 100644
--- a/tests/baselines/reference/classExtendsValidConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e2c80c242e4..5bcc85966ae 100644
--- a/tests/baselines/reference/classExtensionNameOutput.js
+++ b/tests/baselines/reference/classExtensionNameOutput.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 993a8c37afb..13537655316 100644
--- a/tests/baselines/reference/classHeritageWithTrailingSeparator.js
+++ b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ac9348b90a2..80f8863586f 100644
--- a/tests/baselines/reference/classImplementsClass2.js
+++ b/tests/baselines/reference/classImplementsClass2.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e06c47c60cf..afa01e4c613 100644
--- a/tests/baselines/reference/classImplementsClass3.js
+++ b/tests/baselines/reference/classImplementsClass3.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dfba80d1543..5ad639f311a 100644
--- a/tests/baselines/reference/classImplementsClass4.js
+++ b/tests/baselines/reference/classImplementsClass4.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0ab2ff23fdd..8555a3f262c 100644
--- a/tests/baselines/reference/classImplementsClass5.js
+++ b/tests/baselines/reference/classImplementsClass5.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 28e8b574403..c373354722f 100644
--- a/tests/baselines/reference/classImplementsClass6.js
+++ b/tests/baselines/reference/classImplementsClass6.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 217bfa7958e..a63e1777a67 100644
--- a/tests/baselines/reference/classIndexer3.js
+++ b/tests/baselines/reference/classIndexer3.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 99206a1e8ff..ed3e55e2726 100644
--- a/tests/baselines/reference/classInheritence.js
+++ b/tests/baselines/reference/classInheritence.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c185c546ad9..98da3b47181 100644
--- a/tests/baselines/reference/classIsSubtypeOfBaseType.js
+++ b/tests/baselines/reference/classIsSubtypeOfBaseType.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 16eb43631c9..8615a47ee4f 100644
--- a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
+++ b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 27a8d9091dd..437fe85c776 100644
--- a/tests/baselines/reference/classOrder2.js
+++ b/tests/baselines/reference/classOrder2.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6660407f8ad..eb0aed3c132 100644
--- a/tests/baselines/reference/classOrderBug.js
+++ b/tests/baselines/reference/classOrderBug.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0cce6704987..48b65706657 100644
--- a/tests/baselines/reference/classSideInheritance1.js
+++ b/tests/baselines/reference/classSideInheritance1.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0794de5d946..67b2022c460 100644
--- a/tests/baselines/reference/classSideInheritance2.js
+++ b/tests/baselines/reference/classSideInheritance2.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e407b85ecfb..8d36c5915c6 100644
--- a/tests/baselines/reference/classSideInheritance3.js
+++ b/tests/baselines/reference/classSideInheritance3.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 916ac9baa47..7ee6920b472 100644
--- a/tests/baselines/reference/classUpdateTests.js
+++ b/tests/baselines/reference/classUpdateTests.js
@@ -122,6 +122,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 eb3e7908ea5..1dab28c11d7 100644
--- a/tests/baselines/reference/classUsedBeforeInitializedVariables.js
+++ b/tests/baselines/reference/classUsedBeforeInitializedVariables.js
@@ -48,6 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 54b0fd482e5..6721e1db675 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 db3fcb05a34..57be5658324 100644
--- a/tests/baselines/reference/classWithConstructors.js
+++ b/tests/baselines/reference/classWithConstructors.js
@@ -58,6 +58,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 91d4564a5d3..826be5fa6f1 100644
--- a/tests/baselines/reference/classWithProtectedProperty.js
+++ b/tests/baselines/reference/classWithProtectedProperty.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d2a181c5b8d..094cd7a31ac 100644
--- a/tests/baselines/reference/classWithStaticMembers.js
+++ b/tests/baselines/reference/classWithStaticMembers.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a3506a88035..a6f42a59592 100644
--- a/tests/baselines/reference/classdecl.js
+++ b/tests/baselines/reference/classdecl.js
@@ -102,6 +102,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fbd431d4709..dfe890598cc 100644
--- a/tests/baselines/reference/cloduleGenericOnSelfMember.js
+++ b/tests/baselines/reference/cloduleGenericOnSelfMember.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1d522b86089..75d2ffeafbf 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.js
+++ b/tests/baselines/reference/clodulesDerivedClasses.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2814b7dc2b4..2e9aee055c3 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
@@ -48,6 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 abb43068394..6fa8bfc0592 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 30bd47f7cdc..54be5b45431 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7f1f6d38c95..c5632e0d8a2 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7aa17672460..8abe8522273 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ffd052dfe75..2398903bc89 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 110323d4973..058ed5f399e 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e1330ff822a..d541d6e0ad1 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e3df51d1f99..3e7ebcd6c48 100644
--- a/tests/baselines/reference/collisionSuperAndNameResolution.js
+++ b/tests/baselines/reference/collisionSuperAndNameResolution.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8b85ad6b9c5..49b31b9baf7 100644
--- a/tests/baselines/reference/collisionSuperAndParameter.js
+++ b/tests/baselines/reference/collisionSuperAndParameter.js
@@ -71,6 +71,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e06489e356a..6713c8e3dc7 100644
--- a/tests/baselines/reference/collisionSuperAndParameter1.js
+++ b/tests/baselines/reference/collisionSuperAndParameter1.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5e066b7ad09..ed4af66689a 100644
--- a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
+++ b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
@@ -39,6 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0c952a75e2c..63b0c9ca0b0 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0ea3bbbe422..48c5f9875be 100644
--- a/tests/baselines/reference/commentsInheritance.js
+++ b/tests/baselines/reference/commentsInheritance.js
@@ -159,6 +159,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ca1da60a4a1..1f34a4ba2da 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
@@ -203,6 +203,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 aa6a690d944..c5820aac9ab 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
@@ -177,6 +177,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 899dd0ef869..95fb1535ef3 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
@@ -177,6 +177,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 767cdeb8fa1..bc5d5fffcdd 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
@@ -120,6 +120,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 86f331fe7f8..654ec54a782 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
@@ -158,6 +158,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 47b05d80160..a0267f10229 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
@@ -158,6 +158,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2ae8047795a..36a8fc96d84 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
@@ -268,6 +268,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9cb62f69f60..a51047a2904 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
@@ -230,6 +230,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b66a68fe3d7..7facdf34b27 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
@@ -116,6 +116,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 84743940cf3..6326646f02d 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
@@ -173,6 +173,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4a6566b993f..f3a0d730ae6 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
@@ -173,6 +173,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4bef13950ad..cec08c5ac47 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
@@ -87,6 +87,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cf2133f765c..b95142e2c1b 100644
--- a/tests/baselines/reference/complexClassRelationships.js
+++ b/tests/baselines/reference/complexClassRelationships.js
@@ -56,6 +56,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 96293dafa59..fff7d089798 100644
--- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
+++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0cd13bc7fff..92dbd05ee78 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
@@ -131,6 +131,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b3e1312cd69..d9fa2ce9a30 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
@@ -94,6 +94,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7dc995ad72e..e2f3a414716 100644
--- a/tests/baselines/reference/computedPropertyNames24_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames24_ES5.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bb728c8d6ad..fa02344de45 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a8efb6fa5a7..048f85fa1de 100644
--- a/tests/baselines/reference/computedPropertyNames26_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames26_ES5.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bafb780c3b1..f21ed47c6dc 100644
--- a/tests/baselines/reference/computedPropertyNames27_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames27_ES5.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ad5df468f13..28fa01c7293 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8342b3db263..698c0483498 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1e0fe03a116..c3f81fd59f5 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4069ebc6d6a..217b6ee5898 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 378fa73c217..4f4556e594c 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e93fe496eee..2d362a321bb 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 85c97190ade..564a5fc9ccc 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
@@ -56,6 +56,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dd17f5b1967..a7f919df1dd 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 54b2686d904..90d6d34c545 100644
--- a/tests/baselines/reference/constantOverloadFunction.js
+++ b/tests/baselines/reference/constantOverloadFunction.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b60a0714e3e..fff4f8402c8 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 19cb064dd37..f3331c5009b 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0fb1dcc3e54..51057da5d50 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
@@ -79,6 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 26207746fb8..ea051f36b58 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
@@ -122,6 +122,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5a47d0327a7..ceb28ef993e 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
@@ -69,6 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f946ff88fc1..b6f817c795b 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
@@ -59,6 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 427fa2f1b55..becb659f7c0 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
@@ -62,6 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8384613193e..7d23d6d79ee 100644
--- a/tests/baselines/reference/constructorArgs.js
+++ b/tests/baselines/reference/constructorArgs.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f9a54a616a8..27b6d3c28f8 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 542f9621bb8..fec56a77170 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 739b240847e..9951397b09e 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.js
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8ee3a8126ce..05a842a2c23 100644
--- a/tests/baselines/reference/constructorOverloads2.js
+++ b/tests/baselines/reference/constructorOverloads2.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dc1bdc2fe5f..c41d9b2f4ce 100644
--- a/tests/baselines/reference/constructorOverloads3.js
+++ b/tests/baselines/reference/constructorOverloads3.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 75030bccdf2..4a744035945 100644
--- a/tests/baselines/reference/constructorWithCapturedSuper.js
+++ b/tests/baselines/reference/constructorWithCapturedSuper.js
@@ -61,6 +61,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3872e27c5f3..c58d19843e2 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -288,6 +288,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0ded7accd42..fbe58ad0e51 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c00f8ddfb53..e74122b9210 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 82f204bae6b..f3246f8abf3 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5c33f22f877..30b2175316b 100644
--- a/tests/baselines/reference/controlFlowSuperPropertyAccess.js
+++ b/tests/baselines/reference/controlFlowSuperPropertyAccess.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5ee99967e15..d8e8abe81c9 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 daf54d47ade..d27b6643840 100644
--- a/tests/baselines/reference/declFileClassExtendsNull.js
+++ b/tests/baselines/reference/declFileClassExtendsNull.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5b55aeca977..bc6ee7e27c0 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0116eccdeec..672c5f64d32 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8e84a857d46..a6b3a7d626a 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9b08417109f..e533c31005d 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -50,6 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1a923471206..43c47781845 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1072b7fe1e5..424e2dcfe7d 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d3e82411976..7ad5d0f9d4a 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 54ced8d3baf..91121fdcaa8 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends2.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2c711f939f2..037ad6cf347 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 27c7b4350ca..0db8521a858 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends4.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends4.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f19d0c8862c..f89052b5112 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends5.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4d0006d52e6..7fd1e0c0848 100644
--- a/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
+++ b/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ae49a99d745..328209def1e 100644
--- a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
+++ b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6098f5c93e5..e8f97f7bd15 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts3.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts3.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 63b4eafbc82..818b35bda85 100644
--- a/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
+++ b/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0569d6d291b..a378890ec38 100644
--- a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
+++ b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
@@ -48,6 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ae696091aae..84b9bbbc239 100644
--- a/tests/baselines/reference/declarationEmitProtectedMembers.js
+++ b/tests/baselines/reference/declarationEmitProtectedMembers.js
@@ -58,6 +58,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5c605ca60ab..170ff04db29 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5aa93e461c4..ad78d445e7c 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 99aa165f5fb..8de69c43c16 100644
--- a/tests/baselines/reference/declarationNoDanglingGenerics.js
+++ b/tests/baselines/reference/declarationNoDanglingGenerics.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5e422c30a6b..ae8a0c17d78 100644
--- a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
+++ b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4adc5fb3292..35ee4e49b38 100644
--- a/tests/baselines/reference/declareDottedExtend.js
+++ b/tests/baselines/reference/declareDottedExtend.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 71c56d00ee6..033d3d2aad3 100644
--- a/tests/baselines/reference/decoratorOnClass9.js
+++ b/tests/baselines/reference/decoratorOnClass9.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1ebdc5d1e69..4dcb1eb9f6a 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5e11c3d2a0c..1247ed58709 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 eddda104575..150b15ee0e7 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor4.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 345f4c9aeee..ad42c9e2d3e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d3ce8ea25c4..8b6874afe31 100644
--- a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
+++ b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -61,6 +64,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c7ef0c6d39c..f1ddf5b6786 100644
--- a/tests/baselines/reference/defineProperty(target=es5).js
+++ b/tests/baselines/reference/defineProperty(target=es5).js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7e8ee59f1a9..90ee8409287 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bba1f96570e..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 56a565db980..a0834cd6035 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
@@ -16,6 +16,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
+>>>        if (typeof b !== "function" && b !== null) {
+>>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -25,7 +28,7 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(14, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function C(value) {
 1->^^^^
@@ -40,9 +43,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               value: number
-1->Emitted(15, 5) Source(6, 5) + SourceIndex(0)
-2 >Emitted(15, 16) Source(6, 17) + SourceIndex(0)
-3 >Emitted(15, 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->^^^^^^^^
@@ -55,11 +58,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 3 >                   = 
 4 >                     10
 5 >                       ;
-1->Emitted(16, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(16, 19) Source(2, 10) + SourceIndex(0)
-3 >Emitted(16, 22) Source(2, 13) + SourceIndex(0)
-4 >Emitted(16, 24) Source(2, 15) + SourceIndex(0)
-5 >Emitted(16, 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 >^^^^^^^^
@@ -72,8 +75,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    constructor(value: number) {
   >        
 2 >        return 
-1 >Emitted(17, 9) Source(7, 9) + SourceIndex(0)
-2 >Emitted(17, 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->^^^^^^^^^^^^
@@ -86,10 +89,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            cProp
 3 >                 : 
 4 >                   value
-1->Emitted(18, 13) Source(8, 13) + SourceIndex(0)
-2 >Emitted(18, 18) Source(8, 18) + SourceIndex(0)
-3 >Emitted(18, 20) Source(8, 20) + SourceIndex(0)
-4 >Emitted(18, 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->^^^^^^^^^^^^
@@ -98,8 +101,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->,
   >            
 2 >            foo
-1->Emitted(19, 13) Source(9, 13) + SourceIndex(0)
-2 >Emitted(19, 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->^^^^^^^^^^^^^^^^
@@ -111,10 +114,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                return 
 3 >                       "well this looks kinda C-ish."
 4 >                                                     ;
-1->Emitted(20, 17) Source(10, 17) + SourceIndex(0)
-2 >Emitted(20, 24) Source(10, 24) + SourceIndex(0)
-3 >Emitted(20, 54) Source(10, 54) + SourceIndex(0)
-4 >Emitted(20, 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 >^^^^^^^^^^^^
@@ -122,8 +125,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            }
-1 >Emitted(21, 13) Source(11, 13) + SourceIndex(0)
-2 >Emitted(21, 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 >^^^^^^^^^
@@ -131,8 +134,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >        }
 2 >         
-1 >Emitted(22, 10) Source(12, 10) + SourceIndex(0)
-2 >Emitted(22, 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 >^^^^
@@ -141,8 +144,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(23, 5) Source(13, 5) + SourceIndex(0)
-2 >Emitted(23, 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->^^^^
@@ -163,15 +166,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                                  ;
 8 >                                                                    
 9 >                                                                    }
-1->Emitted(24, 5) Source(4, 5) + SourceIndex(0)
-2 >Emitted(24, 20) Source(4, 8) + SourceIndex(0)
-3 >Emitted(24, 23) Source(4, 5) + SourceIndex(0)
-4 >Emitted(24, 37) Source(4, 13) + SourceIndex(0)
-5 >Emitted(24, 44) Source(4, 20) + SourceIndex(0)
-6 >Emitted(24, 67) Source(4, 43) + SourceIndex(0)
-7 >Emitted(24, 68) Source(4, 44) + SourceIndex(0)
-8 >Emitted(24, 69) Source(4, 45) + SourceIndex(0)
-9 >Emitted(24, 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 >^^^^
@@ -188,8 +191,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    }
   >
 2 >    }
-1 >Emitted(25, 5) Source(14, 1) + SourceIndex(0)
-2 >Emitted(25, 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 >
@@ -214,10 +217,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >         }
   >     }
   > }
-1 >Emitted(26, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(26, 2) Source(14, 2) + SourceIndex(0)
-3 >Emitted(26, 2) Source(1, 1) + SourceIndex(0)
-4 >Emitted(26, 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->
@@ -225,15 +228,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
   >
-1->Emitted(27, 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(28, 5) Source(16, 17) + SourceIndex(0)
-2 >Emitted(28, 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 >^^^^
@@ -246,9 +249,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               a = 100
-1 >Emitted(29, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(29, 16) Source(19, 17) + SourceIndex(0)
-3 >Emitted(29, 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->^^^^^^^^
@@ -260,10 +263,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >        
 3 >                          
 4 >                            a = 100
-1->Emitted(30, 9) Source(19, 17) + SourceIndex(0)
-2 >Emitted(30, 27) Source(19, 17) + SourceIndex(0)
-3 >Emitted(30, 29) Source(19, 17) + SourceIndex(0)
-4 >Emitted(30, 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->^^^^^^^^
@@ -292,12 +295,12 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >                                                else
   >                                                    return null;
   >                                            }
-1->Emitted(31, 9) Source(19, 5) + SourceIndex(0)
-2 >Emitted(31, 21) Source(20, 9) + SourceIndex(0)
-3 >Emitted(31, 39) Source(20, 15) + SourceIndex(0)
-4 >Emitted(31, 40) Source(20, 16) + SourceIndex(0)
-5 >Emitted(31, 41) Source(20, 17) + SourceIndex(0)
-6 >Emitted(31, 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->^^^^^^^^
@@ -318,15 +321,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                
 8 >                                                  this
 9 >                                                   ;
-1->Emitted(32, 9) Source(17, 5) + SourceIndex(0)
-2 >Emitted(32, 20) Source(17, 10) + SourceIndex(0)
-3 >Emitted(32, 23) Source(17, 13) + SourceIndex(0)
-4 >Emitted(32, 37) Source(17, 19) + SourceIndex(0)
-5 >Emitted(32, 44) Source(17, 19) + SourceIndex(0)
-6 >Emitted(32, 49) Source(17, 23) + SourceIndex(0)
-7 >Emitted(32, 51) Source(17, 19) + SourceIndex(0)
-8 >Emitted(32, 52) Source(17, 23) + SourceIndex(0)
-9 >Emitted(32, 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 >^^^^^^^^
@@ -352,15 +355,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                          < 
 8 >                            0.5
 9 >                               ) 
-1 >Emitted(33, 9) Source(22, 9) + SourceIndex(0)
-2 >Emitted(33, 13) Source(22, 13) + SourceIndex(0)
-3 >Emitted(33, 17) Source(22, 17) + SourceIndex(0)
-4 >Emitted(33, 18) Source(22, 18) + SourceIndex(0)
-5 >Emitted(33, 24) Source(22, 24) + SourceIndex(0)
-6 >Emitted(33, 26) Source(22, 26) + SourceIndex(0)
-7 >Emitted(33, 29) Source(22, 29) + SourceIndex(0)
-8 >Emitted(33, 32) Source(22, 32) + SourceIndex(0)
-9 >Emitted(33, 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 >^^^^^^^^^^^^
@@ -370,9 +373,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >            
 2 >            "You win!"
 3 >                      
-1 >Emitted(34, 13) Source(23, 13) + SourceIndex(0)
-2 >Emitted(34, 23) Source(23, 23) + SourceIndex(0)
-3 >Emitted(34, 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 >^^^^^^^^^^^^
@@ -381,8 +384,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            return 
-1 >Emitted(35, 13) Source(24, 13) + SourceIndex(0)
-2 >Emitted(35, 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->^^^^^^^^^^^^^^^^
@@ -395,10 +398,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                cProp
 3 >                     : 
 4 >                       1
-1->Emitted(36, 17) Source(25, 17) + SourceIndex(0)
-2 >Emitted(36, 22) Source(25, 22) + SourceIndex(0)
-3 >Emitted(36, 24) Source(25, 24) + SourceIndex(0)
-4 >Emitted(36, 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->^^^^^^^^^^^^^^^^
@@ -419,14 +422,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                            this
 7 >                                                 
 8 >                                                   this
-1->Emitted(37, 17) Source(26, 17) + SourceIndex(0)
-2 >Emitted(37, 22) Source(26, 22) + SourceIndex(0)
-3 >Emitted(37, 24) Source(26, 24) + SourceIndex(0)
-4 >Emitted(37, 38) Source(26, 30) + SourceIndex(0)
-5 >Emitted(37, 45) Source(26, 30) + SourceIndex(0)
-6 >Emitted(37, 50) Source(26, 34) + SourceIndex(0)
-7 >Emitted(37, 52) Source(26, 30) + SourceIndex(0)
-8 >Emitted(37, 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->^^^^^^^^^^^^^^^^
@@ -446,14 +449,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                                        
 7 >                                                          
 8 >                                                          }
-1->Emitted(38, 17) Source(27, 17) + SourceIndex(0)
-2 >Emitted(38, 20) Source(27, 20) + SourceIndex(0)
-3 >Emitted(38, 36) Source(27, 25) + SourceIndex(0)
-4 >Emitted(38, 43) Source(27, 32) + SourceIndex(0)
-5 >Emitted(38, 57) Source(27, 46) + SourceIndex(0)
-6 >Emitted(38, 58) Source(27, 46) + SourceIndex(0)
-7 >Emitted(38, 59) Source(27, 47) + SourceIndex(0)
-8 >Emitted(38, 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 >^^^^^^^^^^^^^
@@ -461,15 +464,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            }
 2 >             ;
-1 >Emitted(39, 14) Source(28, 14) + SourceIndex(0)
-2 >Emitted(39, 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(40, 10) Source(29, 10) + SourceIndex(0)
+1 >Emitted(43, 10) Source(29, 10) + SourceIndex(0)
 ---
 >>>        else
 >>>            return null;
@@ -483,10 +486,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            return 
 3 >                   null
 4 >                       ;
-1->Emitted(42, 13) Source(31, 13) + SourceIndex(0)
-2 >Emitted(42, 20) Source(31, 20) + SourceIndex(0)
-3 >Emitted(42, 24) Source(31, 24) + SourceIndex(0)
-4 >Emitted(42, 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 >^^^^
@@ -495,8 +498,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(43, 5) Source(32, 5) + SourceIndex(0)
-2 >Emitted(43, 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->^^^^
@@ -504,8 +507,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
 2 >    }
-1->Emitted(44, 5) Source(33, 1) + SourceIndex(0)
-2 >Emitted(44, 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 >
@@ -538,11 +541,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >               return null;
   >       }
   >   }
-1 >Emitted(45, 1) Source(33, 1) + SourceIndex(0)
-2 >Emitted(45, 2) Source(33, 2) + SourceIndex(0)
-3 >Emitted(45, 2) Source(16, 1) + SourceIndex(0)
-4 >Emitted(45, 3) Source(16, 17) + SourceIndex(0)
-5 >Emitted(45, 4) Source(16, 18) + SourceIndex(0)
-6 >Emitted(45, 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 32edf0885e9..0442aaf8911 100644
--- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
+++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6c7ef87451b..8394b689589 100644
--- a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
+++ b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2b7977f27ff..79922c29bbb 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f5019942482..2dc09fab050 100644
--- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
+++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b84daa18b66..d098bbdb490 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d313a5b5647..bfdd788f4de 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivates.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivates.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9c8a5ecd12c..c9db50fe9ac 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c956c36d1e5..8874eb394d0 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
@@ -72,6 +72,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d709622f356..aee578cbc60 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
@@ -79,6 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 099c450f692..f7f18d97f4d 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f0c9651258b..1595028eab3 100644
--- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
@@ -71,6 +71,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e526f7d8d9b..b65ee3a90e6 100644
--- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
+++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a3213b0ebbd..46aecf42832 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.js
+++ b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -104,6 +104,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b21d847aa57..38a49bdb3fe 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 93599cfbeea..34c814e023a 100644
--- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
+++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3a5641b5feb..2b706a3a395 100644
--- a/tests/baselines/reference/derivedClassTransitivity.js
+++ b/tests/baselines/reference/derivedClassTransitivity.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fcd9a6eb6dc..f2da0b4b077 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.js
+++ b/tests/baselines/reference/derivedClassTransitivity2.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b0b8481b224..9e7eee5b13d 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.js
+++ b/tests/baselines/reference/derivedClassTransitivity3.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b5785a3cb4f..504db3a6197 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.js
+++ b/tests/baselines/reference/derivedClassTransitivity4.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 57d540bed82..08bbf88c1cd 100644
--- a/tests/baselines/reference/derivedClassWithAny.js
+++ b/tests/baselines/reference/derivedClassWithAny.js
@@ -68,6 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 550927ab3ac..28fa8c1ac35 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b2fc8c9ccb0..d17bed39ec0 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 35ef4038dd4..255623d51c4 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 35b9386cd94..fd0a171d499 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0a33ed849d0..c014ac9eb73 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b74a76f85a2..26c593bd39b 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 efc9e5655ec..e037862cbb4 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
@@ -56,6 +56,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 74de644d40c..dd683cb066b 100644
--- a/tests/baselines/reference/derivedClasses.js
+++ b/tests/baselines/reference/derivedClasses.js
@@ -39,6 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ef245a7ee1e..c8d57a9f13a 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.js
+++ b/tests/baselines/reference/derivedGenericClassWithAny.js
@@ -51,6 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3073a8182d0..ad17cf35af8 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9fee874620f..8fc7af93c9c 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a1536dafca4..b3967c88377 100644
--- a/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
+++ b/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
@@ -92,6 +92,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6ceabf38507..6fa2fb6666e 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.js
@@ -60,6 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fa76dab7464..cf7aa47ef55 100644
--- a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
+++ b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1e11f3c45bb..d44fe6c6c6f 100644
--- a/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0e19e997c6c..444833aa7ab 100644
--- a/tests/baselines/reference/emitBundleWithShebang1.js
+++ b/tests/baselines/reference/emitBundleWithShebang1.js
@@ -13,6 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ac0a54bd4d2..c2808ec4217 100644
--- a/tests/baselines/reference/emitBundleWithShebang2.js
+++ b/tests/baselines/reference/emitBundleWithShebang2.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 99590f80d01..d423664c32c 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9aac22c9c07..f092a6bc426 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7d84518a75d..0b4df59fb1f 100644
--- a/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
+++ b/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 efb14f6a077..61c823d57fc 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7c74ad06888..12e5b71a113 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
@@ -39,6 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 46979a25b15..3d3d5431c05 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 09985c47478..47581e1937d 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f94699c64a4..f31339e38af 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 399cd122285..e91b339e6d3 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fa9c9f3a515..05ac3119e17 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -579,6 +579,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 eaefba8304f..c9823bfaa55 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -13,6 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 36abfb4d741..9edd01767fb 100644
--- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
+++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5239c92a10f..8610f95e0a8 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -83,6 +83,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e63854304d7..a33ff30d328 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.js
+++ b/tests/baselines/reference/errorSuperPropertyAccess.js
@@ -137,6 +137,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d64719af602..002bb48ded6 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.js
+++ b/tests/baselines/reference/errorsInGenericTypeReference.js
@@ -80,6 +80,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 634223c8005..f5a6bfc1d4d 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.js
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c9384e6b48c..2114d5b6f66 100644
--- a/tests/baselines/reference/es6ClassTest.js
+++ b/tests/baselines/reference/es6ClassTest.js
@@ -93,6 +93,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 86edc5adcdb..82bdeec82ae 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -167,6 +167,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0884a7ed382..fa9d38908a0 100644
--- a/tests/baselines/reference/es6ClassTest7.js
+++ b/tests/baselines/reference/es6ClassTest7.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c9b807c8dfd..c93f9f6bcba 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c363e0a7a02..a610a625d3d 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.js
+++ b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -55,6 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -82,6 +85,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a0bb5687fd8..b35a297f9ae 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cf11705bdb5..de04b0eee54 100644
--- a/tests/baselines/reference/exportDefaultAbstractClass.js
+++ b/tests/baselines/reference/exportDefaultAbstractClass.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -52,6 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1891a78c422..2a131e2ac04 100644
--- a/tests/baselines/reference/extBaseClass1.js
+++ b/tests/baselines/reference/extBaseClass1.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 703f8070a44..87ce7bc8778 100644
--- a/tests/baselines/reference/extBaseClass2.js
+++ b/tests/baselines/reference/extBaseClass2.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 24a9d09e190..67c63726580 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b18e331a902..c0bba1d8980 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 149b33c1ff2..14f79f4a0f7 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8878af7efb6..99d8156784b 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f94010bef97..2881f233649 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.js
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d7d4a4b8ba2..96559b8bf23 100644
--- a/tests/baselines/reference/extendFromAny.js
+++ b/tests/baselines/reference/extendFromAny.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cb5cf45baa2..80118ec8d08 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.js
+++ b/tests/baselines/reference/extendNonClassSymbol1.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6f6cebbdf28..de1f20636a9 100644
--- a/tests/baselines/reference/extendNonClassSymbol2.js
+++ b/tests/baselines/reference/extendNonClassSymbol2.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 96c06ca6e68..86126a9c3e2 100644
--- a/tests/baselines/reference/extendPrivateConstructorClass.js
+++ b/tests/baselines/reference/extendPrivateConstructorClass.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fd154a744bb..3126b860342 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -78,6 +81,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c75d2dc8c6e..5a3ff7e44f2 100644
--- a/tests/baselines/reference/extendsClause.js
+++ b/tests/baselines/reference/extendsClause.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d1ffec90d29..3a0fe12fe6a 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2a3bac4008d..da112e48983 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen2.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c239ca4af0f..5284a2e9a74 100644
--- a/tests/baselines/reference/extendsUntypedModule.js
+++ b/tests/baselines/reference/extendsUntypedModule.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9f68730010d..859ad1a3975 100644
--- a/tests/baselines/reference/fluentClasses.js
+++ b/tests/baselines/reference/fluentClasses.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 37349f4d6e6..093eaad8b40 100644
--- a/tests/baselines/reference/for-inStatements.js
+++ b/tests/baselines/reference/for-inStatements.js
@@ -89,6 +89,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 195f166317c..bdde889ee8c 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.js
+++ b/tests/baselines/reference/for-inStatementsInvalid.js
@@ -72,6 +72,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0dcda5b1bbb..71b35c8cced 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
@@ -62,6 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 10595e3152c..3f516cbd55b 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -82,6 +82,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d78f694377d..1b116bc2fa6 100644
--- a/tests/baselines/reference/functionImplementations.js
+++ b/tests/baselines/reference/functionImplementations.js
@@ -165,6 +165,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6a039fa4821..decf4f4eaa9 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 16b2b9537e7..920cae18c83 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 961510504f9..acb1b0f320f 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -363,6 +363,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5756b5aedff..fce1e33177e 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 48dc4da7aa3..a66374608a5 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 daa564b9915..23f2f4b0410 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
@@ -117,6 +117,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 06b0267b269..d5a36344ea6 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cf8c30e6430..d0e74ec1bff 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c9d4de80643..3b0256a25c8 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
@@ -47,6 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4056291f961..fab42865555 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bf93d5d336b..54861fd3fbf 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.js
+++ b/tests/baselines/reference/genericClassExpressionInFunction.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2f36fc1290c..90a0c0098b9 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d99e89f06c0..247e88490a0 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
@@ -84,6 +84,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 216d915d6e5..65c7603d5f8 100644
--- a/tests/baselines/reference/genericClassStaticMethod.js
+++ b/tests/baselines/reference/genericClassStaticMethod.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ff4e5e1a095..e70b7d84721 100644
--- a/tests/baselines/reference/genericClasses3.js
+++ b/tests/baselines/reference/genericClasses3.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b5d7064c993..8412efa8091 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 dae891378a2..96af28b411e 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7803c463eb8..59fb2d8ccc0 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 08674c5a251..42c00f9f8bb 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9ebf6c517ea..f643bd1524f 100644
--- a/tests/baselines/reference/genericInheritedDefaultConstructors.js
+++ b/tests/baselines/reference/genericInheritedDefaultConstructors.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4d9c9fced86..3b61fe8299d 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.js
+++ b/tests/baselines/reference/genericPrototypeProperty2.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 433b57906c3..998459333fc 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.js
+++ b/tests/baselines/reference/genericPrototypeProperty3.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e2567e52764..bba2d444601 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3f95abc3c35..b5a2e0a6588 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
@@ -39,6 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 786ce3440d2..f29478f932a 100644
--- a/tests/baselines/reference/genericTypeAssertions2.js
+++ b/tests/baselines/reference/genericTypeAssertions2.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bcf6c1e7b8e..9e1f0dcea28 100644
--- a/tests/baselines/reference/genericTypeAssertions4.js
+++ b/tests/baselines/reference/genericTypeAssertions4.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 70136b61e2a..c9b25616295 100644
--- a/tests/baselines/reference/genericTypeAssertions6.js
+++ b/tests/baselines/reference/genericTypeAssertions6.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8cf0092ce71..926506cb276 100644
--- a/tests/baselines/reference/genericTypeConstraints.js
+++ b/tests/baselines/reference/genericTypeConstraints.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ad5c6d483e3..8b7d96f7406 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
@@ -48,6 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c0eb72cf288..05ce07def37 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
@@ -48,6 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9b6ea15c12b..09a8b085be6 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b3d710a63b9..a9a265b1668 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.js
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.js
@@ -141,6 +141,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d81331b5a99..2e024b6ae5f 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -171,6 +171,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2c914494b80..8fb94fe80e8 100644
--- a/tests/baselines/reference/illegalSuperCallsInConstructor.js
+++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f915ba4514a..b3e92f279c5 100644
--- a/tests/baselines/reference/implementClausePrecedingExtends.js
+++ b/tests/baselines/reference/implementClausePrecedingExtends.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 65cd2a5c28d..b51171c9276 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
@@ -94,6 +94,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 315a26b124a..c2da946bc0a 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
@@ -50,6 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 78f468f54f8..3986c4477c5 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a32077ae476..4f2cabab68f 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -95,6 +95,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2fdea1ff579..eda722c3b39 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -89,6 +89,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 80a25f8758b..29fe586b316 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -69,6 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9af5664d338..c6e650d3245 100644
--- a/tests/baselines/reference/importNotElidedWhenNotFound.js
+++ b/tests/baselines/reference/importNotElidedWhenNotFound.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c1ae9b816fc..39fdf2fb183 100644
--- a/tests/baselines/reference/importShadowsGlobalName.js
+++ b/tests/baselines/reference/importShadowsGlobalName.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 215e2e1df70..b3ed00c7b1f 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2ff1261fd79..24dde4f12e7 100644
--- a/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
+++ b/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 643200eaf6e..5224aa9da28 100644
--- a/tests/baselines/reference/indexedAccessRelation.js
+++ b/tests/baselines/reference/indexedAccessRelation.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 47007268c2b..cfa47c66a60 100644
--- a/tests/baselines/reference/indexedAccessTypeConstraints.js
+++ b/tests/baselines/reference/indexedAccessTypeConstraints.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 634be50d22b..a3553eb1f1d 100644
--- a/tests/baselines/reference/indexerConstraints2.js
+++ b/tests/baselines/reference/indexerConstraints2.js
@@ -90,6 +90,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9cf86981793..0e559acbfe2 100644
--- a/tests/baselines/reference/indirectSelfReference.js
+++ b/tests/baselines/reference/indirectSelfReference.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a70fdaddac5..4e1d7a3247c 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.js
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 406ae7e5fc4..79b052f3ab9 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9821870ab35..9d3e2fab9ef 100644
--- a/tests/baselines/reference/inheritFromGenericTypeParameter.js
+++ b/tests/baselines/reference/inheritFromGenericTypeParameter.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f0db5d77f18..4167db52554 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6ef3652ce02..12069905f8b 100644
--- a/tests/baselines/reference/inheritance.js
+++ b/tests/baselines/reference/inheritance.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c6c01b716dd..cb8593451bf 100644
--- a/tests/baselines/reference/inheritance1.js
+++ b/tests/baselines/reference/inheritance1.js
@@ -70,6 +70,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 394c139e9aa..a3b4c4f4bee 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 63b2bfe7baf..a6e3aeeda6b 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e6d9647a29d..aceab2377b5 100644
--- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b8255468e15..570e6811867 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 537be89bb5e..0b5df5bcea0 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 246cd5548fe..21cef954352 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2a05146e053..731011b3374 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8236df5357f..25f523fc639 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f6d1413cb36..42aad59f3b3 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 99c69af4853..f762a338b5d 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3b29c457ef3..dfda6dbc0f9 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b9bb7dc695f..5b15a34c41c 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2b346e8a0fa..ef745a281aa 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8635b909d65..b2a5694f0f9 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 909680e76e1..f35d95365a7 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 82813d3724e..015f571e4a6 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6ce9dd493b2..ed4f33fcdb5 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 95c48fac138..7e57d9fd510 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 07523c67356..cf7102ddbc6 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cb83e666784..6ac475f5f06 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bf32cc8ecb7..21303e8e5a0 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 aed7d3109cd..8016a044a05 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7af6c7abc69..6f287a65ea3 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 18a5fba9fbc..d21d81f3efb 100644
--- a/tests/baselines/reference/inheritanceStaticMembersCompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3b1d0da9111..ca14c995ae1 100644
--- a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bb39efe42b4..54ba35af2e4 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7a7368dcaeb..68d2b9334e0 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 347e1c3ddb1..f4c16b35e70 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 85d1f41d926..928e1845a2c 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 92eacb7d32b..1560f85c825 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7e352b29e7b..0e06d1c67f1 100644
--- a/tests/baselines/reference/inheritedModuleMembersForClodule.js
+++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9a93ea71e66..a5a33e22457 100644
--- a/tests/baselines/reference/instanceOfAssignability.js
+++ b/tests/baselines/reference/instanceOfAssignability.js
@@ -98,6 +98,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a63976a830e..bfa315e0059 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
@@ -51,6 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2924ae3be05..b19479a46b3 100644
--- a/tests/baselines/reference/instanceSubtypeCheck2.js
+++ b/tests/baselines/reference/instanceSubtypeCheck2.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 125e5d8a310..66875077615 100644
--- a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
@@ -80,6 +80,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c6cbd93e8bc..71664cfe99e 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.js
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
@@ -39,6 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 67e99f40a37..37fdaecaf88 100644
--- a/tests/baselines/reference/interfaceClassMerging.js
+++ b/tests/baselines/reference/interfaceClassMerging.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6a636cfebb8..c8f2791736c 100644
--- a/tests/baselines/reference/interfaceClassMerging2.js
+++ b/tests/baselines/reference/interfaceClassMerging2.js
@@ -45,6 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e63dce8f199..284f98f966a 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.js
+++ b/tests/baselines/reference/interfaceExtendsClass1.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6da140d08c3..01b312cdee9 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c135119dd04..924ba1d609d 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6138af53977..92f5f6a24a0 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersection.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersection.js
@@ -63,6 +63,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ece951d7d97..8b0ed42431d 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
@@ -57,6 +57,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f4fba428a1e..39685c25879 100644
--- a/tests/baselines/reference/interfaceImplementation8.js
+++ b/tests/baselines/reference/interfaceImplementation8.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 29eb714d366..1309e467e92 100644
--- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
@@ -88,6 +88,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e9cbbf2a2d2..23b4f19d74c 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
@@ -62,6 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 99e75dff032..236612cc444 100644
--- a/tests/baselines/reference/invalidReturnStatements.js
+++ b/tests/baselines/reference/invalidReturnStatements.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ba817b92b82..dcd0494edba 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a65f487a81a..8ed5331e2e2 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d639c862cb9..dfb3551fe0c 100644
--- a/tests/baselines/reference/jsDeclarationsClasses.js
+++ b/tests/baselines/reference/jsDeclarationsClasses.js
@@ -204,6 +204,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4345c92adbd..9fa59e40433 100644
--- a/tests/baselines/reference/jsDeclarationsClassesErr.js
+++ b/tests/baselines/reference/jsDeclarationsClassesErr.js
@@ -82,6 +82,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2c7df6d14b9..a29d40099cc 100644
--- a/tests/baselines/reference/jsDeclarationsDefault.js
+++ b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -77,6 +77,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 52933132cb4..14769f07fc3 100644
--- a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
+++ b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 53bf465b41a..94269ff3774 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.js
+++ b/tests/baselines/reference/jsdocTypeTagCast.js
@@ -87,6 +87,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2569315133a..11fd8c72359 100644
--- a/tests/baselines/reference/jsxCallbackWithDestructuring.js
+++ b/tests/baselines/reference/jsxCallbackWithDestructuring.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e212514d699..e602b8e949e 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a32d8ec409b..d921994e725 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4ccb1b2d33f..a2ef9bf3796 100644
--- a/tests/baselines/reference/jsxInExtendsClause.js
+++ b/tests/baselines/reference/jsxInExtendsClause.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8f68e25cf93..233d8b8d1fc 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 28ef5ac96da..56204c64e9b 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e56ad3d5434..166f21a9979 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -667,6 +667,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 50f166548c1..e6ce8d50c11 100644
--- a/tests/baselines/reference/lambdaArgCrash.js
+++ b/tests/baselines/reference/lambdaArgCrash.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d2e9d4351d3..5db64b3e5e3 100644
--- a/tests/baselines/reference/lift.js
+++ b/tests/baselines/reference/lift.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8f59847f258..18eaf3f1b37 100644
--- a/tests/baselines/reference/localTypes1.js
+++ b/tests/baselines/reference/localTypes1.js
@@ -149,6 +149,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 442d320e5a7..c832bf0bb45 100644
--- a/tests/baselines/reference/m7Bugs.js
+++ b/tests/baselines/reference/m7Bugs.js
@@ -35,6 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ba39eb341e9..f1070604bbd 100644
--- a/tests/baselines/reference/mappedTypePartialConstraints.js
+++ b/tests/baselines/reference/mappedTypePartialConstraints.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c54082e7490..71e0ab2df52 100644
--- a/tests/baselines/reference/mergedDeclarations5.js
+++ b/tests/baselines/reference/mergedDeclarations5.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6dfc6015a96..2e097a6868a 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 374ba758996..1e5964c78e9 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.js
+++ b/tests/baselines/reference/mergedInheritedClassInterface.js
@@ -55,6 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4f6814b7524..1f9f1aac057 100644
--- a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8a4084f8ddc..0e44c6441f8 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0e16f4a5c3d..149e0ca3437 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
@@ -47,6 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 09bd027beac..6977750e44e 100644
--- a/tests/baselines/reference/missingPropertiesOfClassExpression.js
+++ b/tests/baselines/reference/missingPropertiesOfClassExpression.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2d158f6841e..40bf6cb94c1 100644
--- a/tests/baselines/reference/mixinAccessModifiers.js
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -141,6 +141,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4c5269508f4..b3c16804410 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.js
+++ b/tests/baselines/reference/mixinClassesAnnotated.js
@@ -75,6 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f2328d4c6d1..426ee329a73 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.js
+++ b/tests/baselines/reference/mixinClassesAnonymous.js
@@ -74,6 +74,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 173ee687a35..59e94b72b08 100644
--- a/tests/baselines/reference/mixinClassesMembers.js
+++ b/tests/baselines/reference/mixinClassesMembers.js
@@ -107,6 +107,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3c489812625..e1caf9bf307 100644
--- a/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
+++ b/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 601cce00e37..2b1b2804d2e 100644
--- a/tests/baselines/reference/mixinPrivateAndProtected.js
+++ b/tests/baselines/reference/mixinPrivateAndProtected.js
@@ -99,6 +99,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 74f9afc8389..2be97b8e1be 100644
--- a/tests/baselines/reference/mixingApparentTypeOverrides.js
+++ b/tests/baselines/reference/mixingApparentTypeOverrides.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 260735687ca..800feed7f02 100644
--- a/tests/baselines/reference/moduleAsBaseType.js
+++ b/tests/baselines/reference/moduleAsBaseType.js
@@ -13,6 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b0ad743cffa..948febd9a17 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 723e266e6d3..0dd2426f2d6 100644
--- a/tests/baselines/reference/moduleNoneOutFile.js
+++ b/tests/baselines/reference/moduleNoneOutFile.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 af336676867..d9a300e4814 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
@@ -67,6 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b80794c1e71..50a22cd1d0d 100644
--- a/tests/baselines/reference/multipleInheritance.js
+++ b/tests/baselines/reference/multipleInheritance.js
@@ -47,6 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 54fea7b4d53..2fc06167b66 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f43ea313001..073f0346887 100644
--- a/tests/baselines/reference/mutuallyRecursiveInference.js
+++ b/tests/baselines/reference/mutuallyRecursiveInference.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4b4d9ada399..77a0e12869b 100644
--- a/tests/baselines/reference/narrowingOfDottedNames.js
+++ b/tests/baselines/reference/narrowingOfDottedNames.js
@@ -102,6 +102,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 512c8205ce4..c7f34b2afe0 100644
--- a/tests/baselines/reference/neverReturningFunctions1.js
+++ b/tests/baselines/reference/neverReturningFunctions1.js
@@ -259,6 +259,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 92be98d08fb..98e99c275e3 100644
--- a/tests/baselines/reference/newTarget.es5.js
+++ b/tests/baselines/reference/newTarget.es5.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2a72e5ba185..b09a5fff4ea 100644
--- a/tests/baselines/reference/noCrashOnMixin.js
+++ b/tests/baselines/reference/noCrashOnMixin.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d5c7bdb0915..31fe2ba0746 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c4db0caa2ce..04f290c4dc3 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 93a8b21daae..f58f22d8cab 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
@@ -14,6 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 37b827cc8c4..bddf70e93c2 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
@@ -55,6 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f6e1a201de6..cf6a801e0ca 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.js
+++ b/tests/baselines/reference/numericIndexerConstraint3.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e2cb7c58dff..1327d749ed2 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.js
+++ b/tests/baselines/reference/numericIndexerConstraint4.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 28af1636aec..d53219bee57 100644
--- a/tests/baselines/reference/numericIndexerTyping2.js
+++ b/tests/baselines/reference/numericIndexerTyping2.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ed67113d387..ae688652efd 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.js
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
@@ -64,6 +64,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9cdb3cf42fd..ec9743c369b 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
@@ -63,6 +63,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f6d5a970664..ada58bded67 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
@@ -132,6 +132,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bbc9351a922..6462cc88cd4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
@@ -135,6 +135,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ffe0bcc558f..75e272e63a5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
@@ -132,6 +132,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3774b171204..9bf759ee3bf 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
@@ -130,6 +130,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e18a0096cb4..3ea79327af2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
@@ -48,6 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2fe25fdfaec..f36622caf79 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 070686b15cc..d900e81e504 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
@@ -132,6 +132,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bc882c7ecd8..268eed44ce2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
@@ -135,6 +135,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 29535a3b317..c88f02effb7 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.js
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0a409e935eb..2e8e12f1b6e 100644
--- a/tests/baselines/reference/optionalMethods.js
+++ b/tests/baselines/reference/optionalMethods.js
@@ -65,6 +65,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a89d3d39273..4778adaf18f 100644
--- a/tests/baselines/reference/optionalParamArgsTest.js
+++ b/tests/baselines/reference/optionalParamArgsTest.js
@@ -133,6 +133,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e4d417bbc65..df56d1fc907 100644
--- a/tests/baselines/reference/optionalParamInOverride.js
+++ b/tests/baselines/reference/optionalParamInOverride.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 80c3ce96f66..ad83510bc04 100644
--- a/tests/baselines/reference/optionalParameterProperty.js
+++ b/tests/baselines/reference/optionalParameterProperty.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f3e7fa6a5a2..0eebf4ec01a 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 eee5f37e3a3..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 98fe55766af..6861c54ac13 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -16,6 +16,9 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
+>>>        if (typeof b !== "function" && b !== null) {
+>>>            throw new TypeError("Class extends value " + b + " 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,13 +32,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(18, 5) Source(1, 1) + SourceIndex(0)
+1 >Emitted(21, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(19, 9) Source(1, 1) + SourceIndex(0)
+1->Emitted(22, 9) Source(1, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -43,16 +46,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >         ^^^^^^^^^->
 1->export class A { 
 2 >        }
-1->Emitted(20, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(20, 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(21, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(21, 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 >^^^^
@@ -64,18 +67,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >    }
 3 >     
 4 >     export class A { }
-1 >Emitted(22, 5) Source(1, 18) + SourceIndex(0)
-2 >Emitted(22, 6) Source(1, 19) + SourceIndex(0)
-3 >Emitted(22, 6) Source(1, 1) + SourceIndex(0)
-4 >Emitted(22, 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(23, 5) Source(1, 14) + SourceIndex(0)
-2 >Emitted(23, 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
@@ -91,21 +94,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(29, 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(30, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(30, 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(31, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(34, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -114,16 +117,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(33, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(33, 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(34, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(34, 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 >^^^^
@@ -139,20 +142,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(35, 5) Source(2, 28) + SourceIndex(1)
-2 >Emitted(35, 6) Source(2, 29) + SourceIndex(1)
-3 >Emitted(35, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(35, 7) Source(2, 24) + SourceIndex(1)
-5 >Emitted(35, 12) Source(2, 25) + SourceIndex(1)
-6 >Emitted(35, 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(36, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(36, 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 b566b887736..daf40adfdb5 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0e08511fab4..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 08aa323aa83..d77bf0e86a0 100644
--- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -16,6 +16,9 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
+>>>        if (typeof b !== "function" && b !== null) {
+>>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -32,13 +35,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(21, 13) Source(1, 1) + SourceIndex(0)
+1 >Emitted(24, 13) Source(1, 1) + SourceIndex(0)
 ---
 >>>                function A() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(22, 17) Source(1, 1) + SourceIndex(0)
+1->Emitted(25, 17) Source(1, 1) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -46,16 +49,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                 ^^^^^^^^^->
 1->export class A { 
 2 >                }
-1->Emitted(23, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(23, 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(24, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(24, 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 >^^^^^^^^^^^^
@@ -67,10 +70,10 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >            }
 3 >             
 4 >             export class A { }
-1 >Emitted(25, 13) Source(1, 18) + SourceIndex(0)
-2 >Emitted(25, 14) Source(1, 19) + SourceIndex(0)
-3 >Emitted(25, 14) Source(1, 1) + SourceIndex(0)
-4 >Emitted(25, 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);
 >>>        }
@@ -79,8 +82,8 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->
   >
 2 >        
-1->Emitted(27, 9) Source(2, 1) + SourceIndex(0)
-2 >Emitted(27, 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
@@ -104,21 +107,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(41, 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(42, 17) Source(2, 24) + SourceIndex(1)
-2 >Emitted(42, 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(43, 17) Source(2, 1) + SourceIndex(1)
+1 >Emitted(46, 17) Source(2, 1) + SourceIndex(1)
 ---
 >>>                    return _super !== null && _super.apply(this, arguments) || this;
 >>>                }
@@ -127,16 +130,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >                 ^^^^^^^^^->
 1->export class B extends A { 
 2 >                }
-1->Emitted(45, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(45, 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(46, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(46, 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 >^^^^^^^^^^^^
@@ -152,12 +155,12 @@ sourceFile:tests/cases/compiler/b.ts
 4 >             export class B extends 
 5 >              A
 6 >                    { }
-1 >Emitted(47, 13) Source(2, 28) + SourceIndex(1)
-2 >Emitted(47, 14) Source(2, 29) + SourceIndex(1)
-3 >Emitted(47, 14) Source(2, 1) + SourceIndex(1)
-4 >Emitted(47, 15) Source(2, 24) + SourceIndex(1)
-5 >Emitted(47, 20) Source(2, 25) + SourceIndex(1)
-6 >Emitted(47, 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);
 >>>        }
@@ -165,8 +168,8 @@ sourceFile:tests/cases/compiler/b.ts
 2 >        ^
 1->
 2 >        
-1->Emitted(49, 9) Source(2, 29) + SourceIndex(1)
-2 >Emitted(49, 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 9e9beae947a..0da2aab44c2 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -38,6 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5ebe6183470..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 e148cb692a4..f89bac38001 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -16,6 +16,9 @@ sourceFile:tests/cases/compiler/ref/b.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
+>>>        if (typeof b !== "function" && b !== null) {
+>>>            throw new TypeError("Class extends value " + b + " 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,21 +30,21 @@ sourceFile:tests/cases/compiler/ref/b.ts
 3 >                                 ^^^^^^->
 1 >
 2 >/// <reference path="./c.d.ts" />
-1 >Emitted(14, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(14, 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(15, 1) Source(2, 1) + SourceIndex(0)
+1->Emitted(18, 1) Source(2, 1) + SourceIndex(0)
 ---
 >>>    function Foo() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(16, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -51,16 +54,16 @@ sourceFile:tests/cases/compiler/ref/b.ts
   >	member: Bar;
   >
 2 >    }
-1->Emitted(17, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(17, 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(18, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(18, 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 >
@@ -74,10 +77,10 @@ sourceFile:tests/cases/compiler/ref/b.ts
 4 > class Foo {
   > 	member: Bar;
   > }
-1 >Emitted(19, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(19, 2) Source(4, 2) + SourceIndex(0)
-3 >Emitted(19, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(19, 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
@@ -93,21 +96,21 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                                   ^^^^^^->
 1->
 2 >    /// <reference path="./b.ts" />
-1->Emitted(24, 5) Source(1, 1) + SourceIndex(1)
-2 >Emitted(24, 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(25, 5) Source(2, 1) + SourceIndex(1)
+1->Emitted(28, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(26, 9) Source(2, 1) + SourceIndex(1)
+1->Emitted(29, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -117,16 +120,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
   >	member: typeof GlobalFoo;
   >
 2 >        }
-1->Emitted(27, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(27, 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(28, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(28, 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 >^^^^
@@ -140,18 +143,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >     export class A {
   >     	member: typeof GlobalFoo;
   >     }
-1 >Emitted(29, 5) Source(4, 1) + SourceIndex(1)
-2 >Emitted(29, 6) Source(4, 2) + SourceIndex(1)
-3 >Emitted(29, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(29, 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(30, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(30, 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
@@ -167,21 +170,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(36, 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(37, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(37, 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(38, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(41, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -190,16 +193,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(40, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(40, 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(41, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(41, 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 >^^^^
@@ -215,20 +218,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(42, 5) Source(2, 28) + SourceIndex(2)
-2 >Emitted(42, 6) Source(2, 29) + SourceIndex(2)
-3 >Emitted(42, 6) Source(2, 1) + SourceIndex(2)
-4 >Emitted(42, 7) Source(2, 24) + SourceIndex(2)
-5 >Emitted(42, 12) Source(2, 25) + SourceIndex(2)
-6 >Emitted(42, 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(43, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(43, 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 9a14efd2ae6..4405bf7c8df 100644
--- a/tests/baselines/reference/overload1.js
+++ b/tests/baselines/reference/overload1.js
@@ -48,6 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 94bb534a26d..7cb2efd947c 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d38132dae57..e12ff81fd12 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 73bcfbb2397..a7f413ff3e5 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b0b8e76eacd..eeeb0717ff8 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 00768a84e42..ee2d71cf0a9 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 509483c61be..b8f69215ce9 100644
--- a/tests/baselines/reference/overloadResolution.js
+++ b/tests/baselines/reference/overloadResolution.js
@@ -103,6 +103,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7c852c21914..b2193425996 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.js
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.js
@@ -110,6 +110,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 31a0309ae23..f5ad8ac1839 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.js
+++ b/tests/baselines/reference/overloadResolutionConstructors.js
@@ -111,6 +111,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8c742c8fda2..baaeb86eb6d 100644
--- a/tests/baselines/reference/overloadingOnConstants1.js
+++ b/tests/baselines/reference/overloadingOnConstants1.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 978f9524a1c..5d21dd547ed 100644
--- a/tests/baselines/reference/overloadingOnConstants2.js
+++ b/tests/baselines/reference/overloadingOnConstants2.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b58c1f78674..697131ab8ed 100644
--- a/tests/baselines/reference/overrideBaseIntersectionMethod.js
+++ b/tests/baselines/reference/overrideBaseIntersectionMethod.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9ced500351f..114aa968d45 100644
--- a/tests/baselines/reference/overridingPrivateStaticMembers.js
+++ b/tests/baselines/reference/overridingPrivateStaticMembers.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d0d1331e44a..951de322d75 100644
--- a/tests/baselines/reference/parseErrorInHeritageClause1.js
+++ b/tests/baselines/reference/parseErrorInHeritageClause1.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c0d6d667543..061489933ac 100644
--- a/tests/baselines/reference/parser509630.js
+++ b/tests/baselines/reference/parser509630.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0cf04e89a30..b2f0649ae9c 100644
--- a/tests/baselines/reference/parserAstSpans1.js
+++ b/tests/baselines/reference/parserAstSpans1.js
@@ -228,6 +228,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 65c9d46babb..adb0aa59cc4 100644
--- a/tests/baselines/reference/parserClassDeclaration1.js
+++ b/tests/baselines/reference/parserClassDeclaration1.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 07e15c82f26..8f32ccd4b1a 100644
--- a/tests/baselines/reference/parserClassDeclaration3.js
+++ b/tests/baselines/reference/parserClassDeclaration3.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ce636f307a9..ad3de685e4e 100644
--- a/tests/baselines/reference/parserClassDeclaration4.js
+++ b/tests/baselines/reference/parserClassDeclaration4.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0d276534cf6..060a81492f4 100644
--- a/tests/baselines/reference/parserClassDeclaration5.js
+++ b/tests/baselines/reference/parserClassDeclaration5.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 89f5518c86d..b74c78df764 100644
--- a/tests/baselines/reference/parserClassDeclaration6.js
+++ b/tests/baselines/reference/parserClassDeclaration6.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cb35279660c..f47cd7cae02 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 227af5ebf4d..93e5e579360 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 77ba94cd3eb..4069a34360c 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f221d429b3f..16ca6a0704f 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 39b2d2c5e70..cb967d32950 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 968cecc30ed..b55289f9efc 100644
--- a/tests/baselines/reference/parserRealSource10.js
+++ b/tests/baselines/reference/parserRealSource10.js
@@ -466,6 +466,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cd48bcc4fd6..384b89cd525 100644
--- a/tests/baselines/reference/parserRealSource11.js
+++ b/tests/baselines/reference/parserRealSource11.js
@@ -2375,6 +2375,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 53ae2f28510..b96a879fa03 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2104,6 +2104,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8412890ee19..005af817d22 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 89f698cff0e..e54c78e7cec 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 37a92e41617..e4e889ca71d 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c09f3890ca3..e90891e3f1a 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -137,6 +137,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0090e03260a..0db9898a07b 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -106,6 +106,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -302,6 +305,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3665d45e9f3..c20a6d17a30 100644
--- a/tests/baselines/reference/privacyGloClass.js
+++ b/tests/baselines/reference/privacyGloClass.js
@@ -69,6 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6d6edb5c6a6..f43d4d3039f 100644
--- a/tests/baselines/reference/privateAccessInSubclass1.js
+++ b/tests/baselines/reference/privateAccessInSubclass1.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ffcefc92836..85b6eb408b5 100644
--- a/tests/baselines/reference/privateInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/privateInstanceMemberAccessibility.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 eb45924bda7..7695f95f952 100644
--- a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
+++ b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 389f614e72c..1b058e6e4ed 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.js
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2d9007b9501..d1192072623 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 345b99e5672..67edbb32c76 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
@@ -6,6 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 345b99e5672..67edbb32c76 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
@@ -6,6 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f758fc4a85f..1a64f288ebb 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/out.js
+++ b/tests/baselines/reference/project/prologueEmit/amd/out.js
@@ -6,6 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f758fc4a85f..1a64f288ebb 100644
--- a/tests/baselines/reference/project/prologueEmit/node/out.js
+++ b/tests/baselines/reference/project/prologueEmit/node/out.js
@@ -6,6 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 351bc0f0af6..0a0b0ec9d43 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
@@ -7,6 +7,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 351bc0f0af6..0a0b0ec9d43 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
@@ -7,6 +7,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ba5ec00d539..2caa4f9aff4 100644
--- a/tests/baselines/reference/propertiesAndIndexers.js
+++ b/tests/baselines/reference/propertiesAndIndexers.js
@@ -60,6 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8681c3fb404..5fe7cc85599 100644
--- a/tests/baselines/reference/propertyAccess.js
+++ b/tests/baselines/reference/propertyAccess.js
@@ -159,6 +159,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cf5315528db..cc40b669491 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
@@ -91,6 +91,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bde85a52f38..ee4a4553559 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
@@ -66,6 +66,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ea74da04fd7..dab1983f8a7 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -53,6 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1c284e6aa49..d6f89d3d44a 100644
--- a/tests/baselines/reference/propertyOverridesAccessors4.js
+++ b/tests/baselines/reference/propertyOverridesAccessors4.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 67d70fb3c35..f701af5227d 100644
--- a/tests/baselines/reference/propertyOverridingPrototype.js
+++ b/tests/baselines/reference/propertyOverridingPrototype.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9cc42fa96f1..0718ddf1a2e 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cd4a43d05e5..58adf2a7e32 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
@@ -123,6 +123,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 18e6100afe1..657cbbc62f2 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0d3d47efff3..c784adc5070 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
@@ -103,6 +103,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e8b32190035..d60de9a2278 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a7372dfc15c..4f2a7b479da 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
@@ -53,6 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b90e487fd21..b5ef7a42d14 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -124,6 +124,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2a7bb5ecaa1..092e0d760bc 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 86d5df89867..4d5dff9bfbe 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8d91be85bbd..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,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a87e225a148..085a4df0905 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
@@ -79,6 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 45ecbe35f68..aa2b6137d93 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.js
+++ b/tests/baselines/reference/reactHOCSpreadprops.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 57f6680e098..8989621f076 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3c2cb0e7626..d823384e47e 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -157,6 +157,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9807f417017..13f10b8d70f 100644
--- a/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
+++ b/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0b42900e5b2..9d83fe78e86 100644
--- a/tests/baselines/reference/readonlyConstructorAssignment.js
+++ b/tests/baselines/reference/readonlyConstructorAssignment.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ee8cd3f8914..fef99a0e1c1 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.js
+++ b/tests/baselines/reference/recursiveBaseCheck3.js
@@ -13,6 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 aace4c73cb9..2c483b0a0ee 100644
--- a/tests/baselines/reference/recursiveBaseCheck4.js
+++ b/tests/baselines/reference/recursiveBaseCheck4.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b372d21c57e..df5d3b06b73 100644
--- a/tests/baselines/reference/recursiveBaseCheck6.js
+++ b/tests/baselines/reference/recursiveBaseCheck6.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fb5d8b95226..68b7bf6319e 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
@@ -15,6 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 31a63524f92..0b869b23b20 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 078959861b9..c4c68166bf8 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js
@@ -113,6 +113,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 687e1773c26..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 bef310b69d6..2540891baa0 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -34,6 +34,9 @@ sourceFile:recursiveClassReferenceTest.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
+>>>        if (typeof b !== "function" && b !== null) {
+>>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -89,10 +92,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >          		}
   >          	}
   >          }
-1 >Emitted(16, 1) Source(32, 1) + SourceIndex(0)
-2 >Emitted(16, 5) Source(32, 8) + SourceIndex(0)
-3 >Emitted(16, 11) Source(32, 14) + SourceIndex(0)
-4 >Emitted(16, 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->
@@ -101,9 +104,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >module 
 3 >           Sample
-1->Emitted(17, 1) Source(32, 1) + SourceIndex(0)
-2 >Emitted(17, 12) Source(32, 8) + SourceIndex(0)
-3 >Emitted(17, 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 >^^^^
@@ -125,10 +128,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >               		}
   >               	}
   >               }
-1 >Emitted(18, 5) Source(32, 15) + SourceIndex(0)
-2 >Emitted(18, 9) Source(32, 15) + SourceIndex(0)
-3 >Emitted(18, 16) Source(32, 22) + SourceIndex(0)
-4 >Emitted(18, 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->^^^^
@@ -137,9 +140,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Actions
-1->Emitted(19, 5) Source(32, 15) + SourceIndex(0)
-2 >Emitted(19, 16) Source(32, 15) + SourceIndex(0)
-3 >Emitted(19, 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 >^^^^^^^^
@@ -161,10 +164,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		}
   >                 	}
   >                 }
-1 >Emitted(20, 9) Source(32, 23) + SourceIndex(0)
-2 >Emitted(20, 13) Source(32, 23) + SourceIndex(0)
-3 >Emitted(20, 18) Source(32, 28) + SourceIndex(0)
-4 >Emitted(20, 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->^^^^^^^^
@@ -173,9 +176,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Thing
-1->Emitted(21, 9) Source(32, 23) + SourceIndex(0)
-2 >Emitted(21, 20) Source(32, 23) + SourceIndex(0)
-3 >Emitted(21, 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 >^^^^^^^^^^^^
@@ -197,10 +200,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-1 >Emitted(22, 13) Source(32, 29) + SourceIndex(0)
-2 >Emitted(22, 17) Source(32, 29) + SourceIndex(0)
-3 >Emitted(22, 21) Source(32, 33) + SourceIndex(0)
-4 >Emitted(22, 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->^^^^^^^^^^^^
@@ -210,22 +213,22 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       Find
-1->Emitted(23, 13) Source(32, 29) + SourceIndex(0)
-2 >Emitted(23, 24) Source(32, 29) + SourceIndex(0)
-3 >Emitted(23, 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(24, 17) Source(33, 2) + SourceIndex(0)
+1->Emitted(27, 17) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    function StartFindAction() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(25, 21) Source(33, 2) + SourceIndex(0)
+1->Emitted(28, 21) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -241,8 +244,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		}
   >	
 2 >                    }
-1->Emitted(26, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(26, 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->^^^^^^^^^^^^^^^^^^^^
@@ -263,15 +266,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                               ;
 8 >                                                                                 
 9 >                                                                                 }
-1->Emitted(27, 21) Source(35, 10) + SourceIndex(0)
-2 >Emitted(27, 52) Source(35, 15) + SourceIndex(0)
-3 >Emitted(27, 55) Source(35, 3) + SourceIndex(0)
-4 >Emitted(27, 69) Source(35, 20) + SourceIndex(0)
-5 >Emitted(27, 76) Source(35, 27) + SourceIndex(0)
-6 >Emitted(27, 80) Source(35, 31) + SourceIndex(0)
-7 >Emitted(27, 81) Source(35, 32) + SourceIndex(0)
-8 >Emitted(27, 82) Source(35, 33) + SourceIndex(0)
-9 >Emitted(27, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -286,11 +289,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                                 
 4 >                                                    public run(
 5 >                                                              Thing:Sample.Thing.ICodeThing
-1 >Emitted(28, 21) Source(37, 10) + SourceIndex(0)
-2 >Emitted(28, 50) Source(37, 13) + SourceIndex(0)
-3 >Emitted(28, 53) Source(37, 3) + SourceIndex(0)
-4 >Emitted(28, 63) Source(37, 14) + SourceIndex(0)
-5 >Emitted(28, 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 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -303,10 +306,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               true
 4 >                                   ;
-1 >Emitted(29, 25) Source(39, 4) + SourceIndex(0)
-2 >Emitted(29, 32) Source(39, 11) + SourceIndex(0)
-3 >Emitted(29, 36) Source(39, 15) + SourceIndex(0)
-4 >Emitted(29, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -315,8 +318,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(30, 21) Source(40, 3) + SourceIndex(0)
-2 >Emitted(30, 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->^^^^^^^^^^^^^^^^^^^^
@@ -324,8 +327,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
 2 >                    }
-1->Emitted(31, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(31, 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 >^^^^^^^^^^^^^^^^
@@ -345,10 +348,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 			return true;
   >                 		}
   >                 	}
-1 >Emitted(32, 17) Source(41, 2) + SourceIndex(0)
-2 >Emitted(32, 18) Source(41, 3) + SourceIndex(0)
-3 >Emitted(32, 18) Source(33, 2) + SourceIndex(0)
-4 >Emitted(32, 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->^^^^^^^^^^^^^^^^
@@ -368,10 +371,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                    		}
   >                                    	}
 4 >                                                      
-1->Emitted(33, 17) Source(33, 15) + SourceIndex(0)
-2 >Emitted(33, 37) Source(33, 30) + SourceIndex(0)
-3 >Emitted(33, 55) Source(41, 3) + SourceIndex(0)
-4 >Emitted(33, 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->^^^^^^^^^^^^
@@ -403,15 +406,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                   		}
   >                                                   	}
   >                                                   }
-1->Emitted(34, 13) Source(42, 1) + SourceIndex(0)
-2 >Emitted(34, 14) Source(42, 2) + SourceIndex(0)
-3 >Emitted(34, 16) Source(32, 29) + SourceIndex(0)
-4 >Emitted(34, 20) Source(32, 33) + SourceIndex(0)
-5 >Emitted(34, 23) Source(32, 29) + SourceIndex(0)
-6 >Emitted(34, 35) Source(32, 33) + SourceIndex(0)
-7 >Emitted(34, 40) Source(32, 29) + SourceIndex(0)
-8 >Emitted(34, 52) Source(32, 33) + SourceIndex(0)
-9 >Emitted(34, 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 >^^^^^^^^
@@ -443,15 +446,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-1 >Emitted(35, 9) Source(42, 1) + SourceIndex(0)
-2 >Emitted(35, 10) Source(42, 2) + SourceIndex(0)
-3 >Emitted(35, 12) Source(32, 23) + SourceIndex(0)
-4 >Emitted(35, 17) Source(32, 28) + SourceIndex(0)
-5 >Emitted(35, 20) Source(32, 23) + SourceIndex(0)
-6 >Emitted(35, 33) Source(32, 28) + SourceIndex(0)
-7 >Emitted(35, 38) Source(32, 23) + SourceIndex(0)
-8 >Emitted(35, 51) Source(32, 28) + SourceIndex(0)
-9 >Emitted(35, 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->^^^^
@@ -482,15 +485,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-1->Emitted(36, 5) Source(42, 1) + SourceIndex(0)
-2 >Emitted(36, 6) Source(42, 2) + SourceIndex(0)
-3 >Emitted(36, 8) Source(32, 15) + SourceIndex(0)
-4 >Emitted(36, 15) Source(32, 22) + SourceIndex(0)
-5 >Emitted(36, 18) Source(32, 15) + SourceIndex(0)
-6 >Emitted(36, 32) Source(32, 22) + SourceIndex(0)
-7 >Emitted(36, 37) Source(32, 15) + SourceIndex(0)
-8 >Emitted(36, 51) Source(32, 22) + SourceIndex(0)
-9 >Emitted(36, 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 >
@@ -517,13 +520,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-1 >Emitted(37, 1) Source(42, 1) + SourceIndex(0)
-2 >Emitted(37, 2) Source(42, 2) + SourceIndex(0)
-3 >Emitted(37, 4) Source(32, 8) + SourceIndex(0)
-4 >Emitted(37, 10) Source(32, 14) + SourceIndex(0)
-5 >Emitted(37, 15) Source(32, 8) + SourceIndex(0)
-6 >Emitted(37, 21) Source(32, 14) + SourceIndex(0)
-7 >Emitted(37, 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 >
@@ -534,9 +537,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-1 >Emitted(38, 1) Source(44, 1) + SourceIndex(0)
-2 >Emitted(38, 12) Source(44, 8) + SourceIndex(0)
-3 >Emitted(38, 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 >^^^^
@@ -568,10 +571,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-1 >Emitted(39, 5) Source(44, 15) + SourceIndex(0)
-2 >Emitted(39, 9) Source(44, 15) + SourceIndex(0)
-3 >Emitted(39, 14) Source(44, 20) + SourceIndex(0)
-4 >Emitted(39, 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->^^^^
@@ -581,9 +584,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-1->Emitted(40, 5) Source(44, 15) + SourceIndex(0)
-2 >Emitted(40, 16) Source(44, 15) + SourceIndex(0)
-3 >Emitted(40, 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->^^^^^^^^
@@ -615,10 +618,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                   
   >                   	}
   >                   }
-1->Emitted(41, 9) Source(44, 21) + SourceIndex(0)
-2 >Emitted(41, 13) Source(44, 21) + SourceIndex(0)
-3 >Emitted(41, 20) Source(44, 28) + SourceIndex(0)
-4 >Emitted(41, 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->^^^^^^^^
@@ -628,16 +631,16 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Widgets
-1->Emitted(42, 9) Source(44, 21) + SourceIndex(0)
-2 >Emitted(42, 20) Source(44, 21) + SourceIndex(0)
-3 >Emitted(42, 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(43, 13) Source(45, 2) + SourceIndex(0)
+1->Emitted(46, 13) Source(45, 2) + SourceIndex(0)
 ---
 >>>                function FindWidget(codeThing) {
 1->^^^^^^^^^^^^^^^^
@@ -652,9 +655,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		
 2 >                constructor(private 
 3 >                                    codeThing: Sample.Thing.ICodeThing
-1->Emitted(44, 17) Source(50, 3) + SourceIndex(0)
-2 >Emitted(44, 37) Source(50, 23) + SourceIndex(0)
-3 >Emitted(44, 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->^^^^^^^^^^^^^^^^^^^^
@@ -667,11 +670,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                  
 4 >                                     codeThing
 5 >                                              : Sample.Thing.ICodeThing
-1->Emitted(45, 21) Source(50, 23) + SourceIndex(0)
-2 >Emitted(45, 35) Source(50, 32) + SourceIndex(0)
-3 >Emitted(45, 38) Source(50, 23) + SourceIndex(0)
-4 >Emitted(45, 47) Source(50, 32) + SourceIndex(0)
-5 >Emitted(45, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -684,11 +687,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                :any = 
 4 >                                   null
 5 >                                       ;
-1 >Emitted(46, 21) Source(49, 11) + SourceIndex(0)
-2 >Emitted(46, 33) Source(49, 18) + SourceIndex(0)
-3 >Emitted(46, 36) Source(49, 25) + SourceIndex(0)
-4 >Emitted(46, 40) Source(49, 29) + SourceIndex(0)
-5 >Emitted(46, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -698,8 +701,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		constructor(private codeThing: Sample.Thing.ICodeThing) {
   >		    
 2 >                    // scenario 1
-1 >Emitted(47, 21) Source(51, 7) + SourceIndex(0)
-2 >Emitted(47, 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->^^^^^^^^^^^^^^^^^^^^
@@ -723,16 +726,16 @@ sourceFile:recursiveClassReferenceTest.ts
 8 >                                                     this
 9 >                                                         )
 10>                                                          ;
-1->Emitted(48, 21) Source(52, 7) + SourceIndex(0)
-2 >Emitted(48, 30) Source(52, 16) + SourceIndex(0)
-3 >Emitted(48, 31) Source(52, 17) + SourceIndex(0)
-4 >Emitted(48, 40) Source(52, 26) + SourceIndex(0)
-5 >Emitted(48, 41) Source(52, 27) + SourceIndex(0)
-6 >Emitted(48, 52) Source(52, 38) + SourceIndex(0)
-7 >Emitted(48, 54) Source(52, 40) + SourceIndex(0)
-8 >Emitted(48, 58) Source(52, 44) + SourceIndex(0)
-9 >Emitted(48, 59) Source(52, 45) + SourceIndex(0)
-10>Emitted(48, 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 >^^^^^^^^^^^^^^^^
@@ -741,8 +744,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(49, 17) Source(53, 3) + SourceIndex(0)
-2 >Emitted(49, 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->^^^^^^^^^^^^^^^^
@@ -763,15 +766,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                               if (
 8 >                                                                   true
 9 >                                                                       ) 
-1->Emitted(50, 17) Source(47, 10) + SourceIndex(0)
-2 >Emitted(50, 41) Source(47, 13) + SourceIndex(0)
-3 >Emitted(50, 44) Source(47, 3) + SourceIndex(0)
-4 >Emitted(50, 54) Source(47, 14) + SourceIndex(0)
-5 >Emitted(50, 60) Source(47, 55) + SourceIndex(0)
-6 >Emitted(50, 64) Source(47, 59) + SourceIndex(0)
-7 >Emitted(50, 68) Source(47, 63) + SourceIndex(0)
-8 >Emitted(50, 72) Source(47, 67) + SourceIndex(0)
-9 >Emitted(50, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -788,13 +791,13 @@ sourceFile:recursiveClassReferenceTest.ts
 5 >                                  this
 6 >                                      )
 7 >                                       ;
-1 >Emitted(51, 21) Source(47, 70) + SourceIndex(0)
-2 >Emitted(51, 28) Source(47, 77) + SourceIndex(0)
-3 >Emitted(51, 34) Source(47, 83) + SourceIndex(0)
-4 >Emitted(51, 35) Source(47, 84) + SourceIndex(0)
-5 >Emitted(51, 39) Source(47, 88) + SourceIndex(0)
-6 >Emitted(51, 40) Source(47, 89) + SourceIndex(0)
-7 >Emitted(51, 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 >^^^^^^^^^^^^^^^^^
@@ -804,9 +807,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >}
 2 >                 
 3 >                  }
-1 >Emitted(52, 18) Source(47, 91) + SourceIndex(0)
-2 >Emitted(52, 19) Source(47, 91) + SourceIndex(0)
-3 >Emitted(52, 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->^^^^^^^^^^^^^^^^
@@ -823,9 +826,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                getDomNode
 3 >                                               
-1->Emitted(53, 17) Source(55, 10) + SourceIndex(0)
-2 >Emitted(53, 48) Source(55, 20) + SourceIndex(0)
-3 >Emitted(53, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -837,10 +840,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                    return 
 3 >                           domNode
 4 >                                  ;
-1 >Emitted(54, 21) Source(56, 4) + SourceIndex(0)
-2 >Emitted(54, 28) Source(56, 11) + SourceIndex(0)
-3 >Emitted(54, 35) Source(56, 18) + SourceIndex(0)
-4 >Emitted(54, 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 >^^^^^^^^^^^^^^^^
@@ -849,8 +852,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(55, 17) Source(57, 3) + SourceIndex(0)
-2 >Emitted(55, 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->^^^^^^^^^^^^^^^^
@@ -861,9 +864,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                destroy
 3 >                                            
-1->Emitted(56, 17) Source(59, 10) + SourceIndex(0)
-2 >Emitted(56, 45) Source(59, 17) + SourceIndex(0)
-3 >Emitted(56, 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 >^^^^^^^^^^^^^^^^
@@ -873,8 +876,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >		
 2 >                }
-1 >Emitted(57, 17) Source(61, 3) + SourceIndex(0)
-2 >Emitted(57, 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->^^^^^^^^^^^^^^^^
@@ -883,8 +886,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                }
-1->Emitted(58, 17) Source(63, 2) + SourceIndex(0)
-2 >Emitted(58, 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 >^^^^^^^^^^^^
@@ -914,10 +917,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             		}
   >             
   >             	}
-1 >Emitted(59, 13) Source(63, 2) + SourceIndex(0)
-2 >Emitted(59, 14) Source(63, 3) + SourceIndex(0)
-3 >Emitted(59, 14) Source(45, 2) + SourceIndex(0)
-4 >Emitted(59, 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->^^^^^^^^^^^^
@@ -947,10 +950,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                           
-1->Emitted(60, 13) Source(45, 15) + SourceIndex(0)
-2 >Emitted(60, 31) Source(45, 25) + SourceIndex(0)
-3 >Emitted(60, 44) Source(63, 3) + SourceIndex(0)
-4 >Emitted(60, 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->^^^^^^^^
@@ -992,15 +995,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                    
   >                                                    	}
   >                                                    }
-1->Emitted(61, 9) Source(64, 1) + SourceIndex(0)
-2 >Emitted(61, 10) Source(64, 2) + SourceIndex(0)
-3 >Emitted(61, 12) Source(44, 21) + SourceIndex(0)
-4 >Emitted(61, 19) Source(44, 28) + SourceIndex(0)
-5 >Emitted(61, 22) Source(44, 21) + SourceIndex(0)
-6 >Emitted(61, 35) Source(44, 28) + SourceIndex(0)
-7 >Emitted(61, 40) Source(44, 21) + SourceIndex(0)
-8 >Emitted(61, 53) Source(44, 28) + SourceIndex(0)
-9 >Emitted(61, 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 >^^^^
@@ -1041,15 +1044,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-1 >Emitted(62, 5) Source(64, 1) + SourceIndex(0)
-2 >Emitted(62, 6) Source(64, 2) + SourceIndex(0)
-3 >Emitted(62, 8) Source(44, 15) + SourceIndex(0)
-4 >Emitted(62, 13) Source(44, 20) + SourceIndex(0)
-5 >Emitted(62, 16) Source(44, 15) + SourceIndex(0)
-6 >Emitted(62, 28) Source(44, 20) + SourceIndex(0)
-7 >Emitted(62, 33) Source(44, 15) + SourceIndex(0)
-8 >Emitted(62, 45) Source(44, 20) + SourceIndex(0)
-9 >Emitted(62, 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 >
@@ -1087,13 +1090,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-1 >Emitted(63, 1) Source(64, 1) + SourceIndex(0)
-2 >Emitted(63, 2) Source(64, 2) + SourceIndex(0)
-3 >Emitted(63, 4) Source(44, 8) + SourceIndex(0)
-4 >Emitted(63, 10) Source(44, 14) + SourceIndex(0)
-5 >Emitted(63, 15) Source(44, 8) + SourceIndex(0)
-6 >Emitted(63, 21) Source(44, 14) + SourceIndex(0)
-7 >Emitted(63, 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->
@@ -1102,13 +1105,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >interface IMode { getInitialState(): IState;} 
   >
-1->Emitted(64, 1) Source(67, 1) + SourceIndex(0)
+1->Emitted(67, 1) Source(67, 1) + SourceIndex(0)
 ---
 >>>    function AbstractMode() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(65, 5) Source(67, 1) + SourceIndex(0)
+1->Emitted(68, 5) Source(67, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -1116,8 +1119,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->class AbstractMode implements IMode { public getInitialState(): IState { return null;} 
 2 >    }
-1->Emitted(66, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(66, 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->^^^^
@@ -1138,23 +1141,23 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                      ;
 8 >                                                                       
 9 >                                                                        }
-1->Emitted(67, 5) Source(67, 46) + SourceIndex(0)
-2 >Emitted(67, 43) Source(67, 61) + SourceIndex(0)
-3 >Emitted(67, 46) Source(67, 39) + SourceIndex(0)
-4 >Emitted(67, 60) Source(67, 74) + SourceIndex(0)
-5 >Emitted(67, 67) Source(67, 81) + SourceIndex(0)
-6 >Emitted(67, 71) Source(67, 85) + SourceIndex(0)
-7 >Emitted(67, 72) Source(67, 86) + SourceIndex(0)
-8 >Emitted(67, 73) Source(67, 86) + SourceIndex(0)
-9 >Emitted(67, 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(68, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(68, 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 >
@@ -1166,10 +1169,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >}
 3 > 
 4 > class AbstractMode implements IMode { public getInitialState(): IState { return null;} }
-1 >Emitted(69, 1) Source(67, 88) + SourceIndex(0)
-2 >Emitted(69, 2) Source(67, 89) + SourceIndex(0)
-3 >Emitted(69, 2) Source(67, 1) + SourceIndex(0)
-4 >Emitted(69, 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->
@@ -1187,9 +1190,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-1->Emitted(70, 1) Source(76, 1) + SourceIndex(0)
-2 >Emitted(70, 12) Source(76, 8) + SourceIndex(0)
-3 >Emitted(70, 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 >^^^^
@@ -1225,10 +1228,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-1 >Emitted(71, 5) Source(76, 15) + SourceIndex(0)
-2 >Emitted(71, 9) Source(76, 15) + SourceIndex(0)
-3 >Emitted(71, 14) Source(76, 20) + SourceIndex(0)
-4 >Emitted(71, 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->^^^^
@@ -1238,9 +1241,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-1->Emitted(72, 5) Source(76, 15) + SourceIndex(0)
-2 >Emitted(72, 16) Source(76, 15) + SourceIndex(0)
-3 >Emitted(72, 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->^^^^^^^^
@@ -1276,10 +1279,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                     
   >                     	}
   >                     }
-1->Emitted(73, 9) Source(76, 21) + SourceIndex(0)
-2 >Emitted(73, 13) Source(76, 21) + SourceIndex(0)
-3 >Emitted(73, 22) Source(76, 30) + SourceIndex(0)
-4 >Emitted(73, 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->^^^^^^^^
@@ -1288,9 +1291,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Languages
-1->Emitted(74, 9) Source(76, 21) + SourceIndex(0)
-2 >Emitted(74, 20) Source(76, 21) + SourceIndex(0)
-3 >Emitted(74, 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 >^^^^^^^^^^^^
@@ -1326,10 +1329,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                         
   >                         	}
   >                         }
-1 >Emitted(75, 13) Source(76, 31) + SourceIndex(0)
-2 >Emitted(75, 17) Source(76, 31) + SourceIndex(0)
-3 >Emitted(75, 26) Source(76, 40) + SourceIndex(0)
-4 >Emitted(75, 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->^^^^^^^^^^^^
@@ -1339,9 +1342,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       PlainText
-1->Emitted(76, 13) Source(76, 31) + SourceIndex(0)
-2 >Emitted(76, 24) Source(76, 31) + SourceIndex(0)
-3 >Emitted(76, 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->^^^^^^^^^^^^^^^^
@@ -1349,7 +1352,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1-> {
   >	
   >	
-1->Emitted(77, 17) Source(78, 2) + SourceIndex(0)
+1->Emitted(80, 17) Source(78, 2) + SourceIndex(0)
 ---
 >>>                    function State(mode) {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1360,9 +1363,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >        
 2 >                    constructor(private 
 3 >                                   mode: IMode
-1->Emitted(78, 21) Source(79, 9) + SourceIndex(0)
-2 >Emitted(78, 36) Source(79, 29) + SourceIndex(0)
-3 >Emitted(78, 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->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1375,11 +1378,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 
 4 >                                    mode
 5 >                                        : IMode
-1->Emitted(79, 25) Source(79, 29) + SourceIndex(0)
-2 >Emitted(79, 34) Source(79, 33) + SourceIndex(0)
-3 >Emitted(79, 37) Source(79, 29) + SourceIndex(0)
-4 >Emitted(79, 41) Source(79, 33) + SourceIndex(0)
-5 >Emitted(79, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -1387,8 +1390,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >) { 
 2 >                    }
-1 >Emitted(80, 21) Source(79, 44) + SourceIndex(0)
-2 >Emitted(80, 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->^^^^^^^^^^^^^^^^^^^^
@@ -1398,9 +1401,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    clone
 3 >                                         
-1->Emitted(81, 21) Source(80, 10) + SourceIndex(0)
-2 >Emitted(81, 42) Source(80, 15) + SourceIndex(0)
-3 >Emitted(81, 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 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1412,10 +1415,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               this
 4 >                                   ;
-1 >Emitted(82, 25) Source(81, 4) + SourceIndex(0)
-2 >Emitted(82, 32) Source(81, 11) + SourceIndex(0)
-3 >Emitted(82, 36) Source(81, 15) + SourceIndex(0)
-4 >Emitted(82, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -1424,8 +1427,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(83, 21) Source(82, 3) + SourceIndex(0)
-2 >Emitted(83, 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->^^^^^^^^^^^^^^^^^^^^
@@ -1440,11 +1443,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                          
 4 >                                             public equals(
 5 >                                                       other:IState
-1->Emitted(84, 21) Source(84, 10) + SourceIndex(0)
-2 >Emitted(84, 43) Source(84, 16) + SourceIndex(0)
-3 >Emitted(84, 46) Source(84, 3) + SourceIndex(0)
-4 >Emitted(84, 56) Source(84, 17) + SourceIndex(0)
-5 >Emitted(84, 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 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1460,12 +1463,12 @@ sourceFile:recursiveClassReferenceTest.ts
 4 >                                    === 
 5 >                                        other
 6 >                                             ;
-1 >Emitted(85, 25) Source(85, 4) + SourceIndex(0)
-2 >Emitted(85, 32) Source(85, 11) + SourceIndex(0)
-3 >Emitted(85, 36) Source(85, 15) + SourceIndex(0)
-4 >Emitted(85, 41) Source(85, 20) + SourceIndex(0)
-5 >Emitted(85, 46) Source(85, 25) + SourceIndex(0)
-6 >Emitted(85, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -1474,8 +1477,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(86, 21) Source(86, 3) + SourceIndex(0)
-2 >Emitted(86, 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->^^^^^^^^^^^^^^^^^^^^
@@ -1498,15 +1501,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                       ;
 8 >                                                                         
 9 >                                                                         }
-1->Emitted(87, 21) Source(88, 10) + SourceIndex(0)
-2 >Emitted(87, 44) Source(88, 17) + SourceIndex(0)
-3 >Emitted(87, 47) Source(88, 3) + SourceIndex(0)
-4 >Emitted(87, 61) Source(88, 29) + SourceIndex(0)
-5 >Emitted(87, 68) Source(88, 36) + SourceIndex(0)
-6 >Emitted(87, 72) Source(88, 40) + SourceIndex(0)
-7 >Emitted(87, 73) Source(88, 41) + SourceIndex(0)
-8 >Emitted(87, 74) Source(88, 42) + SourceIndex(0)
-9 >Emitted(87, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -1514,8 +1517,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >	
 2 >                    }
-1 >Emitted(88, 21) Source(89, 2) + SourceIndex(0)
-2 >Emitted(88, 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 >^^^^^^^^^^^^^^^^
@@ -1538,10 +1541,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		
   >                 		public getMode(): IMode { return mode; }
   >                 	}
-1 >Emitted(89, 17) Source(89, 2) + SourceIndex(0)
-2 >Emitted(89, 18) Source(89, 3) + SourceIndex(0)
-3 >Emitted(89, 18) Source(78, 2) + SourceIndex(0)
-4 >Emitted(89, 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->^^^^^^^^^^^^^^^^
@@ -1564,10 +1567,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                               		public getMode(): IMode { return mode; }
   >                               	}
 4 >                                       
-1->Emitted(90, 17) Source(78, 15) + SourceIndex(0)
-2 >Emitted(90, 32) Source(78, 20) + SourceIndex(0)
-3 >Emitted(90, 40) Source(89, 3) + SourceIndex(0)
-4 >Emitted(90, 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->^^^^^^^^^^^^^^^^
@@ -1575,21 +1578,21 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
   >	
-1->Emitted(91, 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(92, 21) Source(91, 28) + SourceIndex(0)
-2 >Emitted(92, 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(93, 21) Source(91, 2) + SourceIndex(0)
+1 >Emitted(96, 21) Source(91, 2) + SourceIndex(0)
 ---
 >>>                        return _super !== null && _super.apply(this, arguments) || this;
 >>>                    }
@@ -1606,8 +1609,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(95, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(95, 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->^^^^^^^^^^^^^^^^^^^^
@@ -1615,8 +1618,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >                    // scenario 2
-1->Emitted(96, 21) Source(93, 3) + SourceIndex(0)
-2 >Emitted(96, 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->^^^^^^^^^^^^^^^^^^^^
@@ -1626,9 +1629,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    getInitialState
 3 >                                                  
-1->Emitted(97, 21) Source(94, 10) + SourceIndex(0)
-2 >Emitted(97, 51) Source(94, 25) + SourceIndex(0)
-3 >Emitted(97, 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 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1648,14 +1651,14 @@ sourceFile:recursiveClassReferenceTest.ts
 6 >                                         self
 7 >                                             )
 8 >                                              ;
-1 >Emitted(98, 25) Source(95, 4) + SourceIndex(0)
-2 >Emitted(98, 32) Source(95, 11) + SourceIndex(0)
-3 >Emitted(98, 36) Source(95, 15) + SourceIndex(0)
-4 >Emitted(98, 41) Source(95, 20) + SourceIndex(0)
-5 >Emitted(98, 42) Source(95, 21) + SourceIndex(0)
-6 >Emitted(98, 46) Source(95, 25) + SourceIndex(0)
-7 >Emitted(98, 47) Source(95, 26) + SourceIndex(0)
-8 >Emitted(98, 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 >^^^^^^^^^^^^^^^^^^^^
@@ -1664,8 +1667,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(99, 21) Source(96, 3) + SourceIndex(0)
-2 >Emitted(99, 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->^^^^^^^^^^^^^^^^^^^^
@@ -1676,8 +1679,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(100, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(100, 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->^^^^^^^^^^^^^^^^
@@ -1701,12 +1704,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              
   >                              	}
-1->Emitted(101, 17) Source(99, 2) + SourceIndex(0)
-2 >Emitted(101, 18) Source(99, 3) + SourceIndex(0)
-3 >Emitted(101, 18) Source(91, 2) + SourceIndex(0)
-4 >Emitted(101, 19) Source(91, 28) + SourceIndex(0)
-5 >Emitted(101, 31) Source(91, 40) + SourceIndex(0)
-6 >Emitted(101, 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->^^^^^^^^^^^^^^^^
@@ -1726,10 +1729,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                     
-1->Emitted(102, 17) Source(91, 15) + SourceIndex(0)
-2 >Emitted(102, 31) Source(91, 19) + SourceIndex(0)
-3 >Emitted(102, 38) Source(99, 3) + SourceIndex(0)
-4 >Emitted(102, 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->^^^^^^^^^^^^
@@ -1775,15 +1778,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                                      
   >                                                                      	}
   >                                                                      }
-1->Emitted(103, 13) Source(100, 1) + SourceIndex(0)
-2 >Emitted(103, 14) Source(100, 2) + SourceIndex(0)
-3 >Emitted(103, 16) Source(76, 31) + SourceIndex(0)
-4 >Emitted(103, 25) Source(76, 40) + SourceIndex(0)
-5 >Emitted(103, 28) Source(76, 31) + SourceIndex(0)
-6 >Emitted(103, 47) Source(76, 40) + SourceIndex(0)
-7 >Emitted(103, 52) Source(76, 31) + SourceIndex(0)
-8 >Emitted(103, 71) Source(76, 40) + SourceIndex(0)
-9 >Emitted(103, 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 >^^^^^^^^
@@ -1828,15 +1831,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                          
   >                                                          	}
   >                                                          }
-1 >Emitted(104, 9) Source(100, 1) + SourceIndex(0)
-2 >Emitted(104, 10) Source(100, 2) + SourceIndex(0)
-3 >Emitted(104, 12) Source(76, 21) + SourceIndex(0)
-4 >Emitted(104, 21) Source(76, 30) + SourceIndex(0)
-5 >Emitted(104, 24) Source(76, 21) + SourceIndex(0)
-6 >Emitted(104, 39) Source(76, 30) + SourceIndex(0)
-7 >Emitted(104, 44) Source(76, 21) + SourceIndex(0)
-8 >Emitted(104, 59) Source(76, 30) + SourceIndex(0)
-9 >Emitted(104, 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 >^^^^
@@ -1881,15 +1884,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-1 >Emitted(105, 5) Source(100, 1) + SourceIndex(0)
-2 >Emitted(105, 6) Source(100, 2) + SourceIndex(0)
-3 >Emitted(105, 8) Source(76, 15) + SourceIndex(0)
-4 >Emitted(105, 13) Source(76, 20) + SourceIndex(0)
-5 >Emitted(105, 16) Source(76, 15) + SourceIndex(0)
-6 >Emitted(105, 28) Source(76, 20) + SourceIndex(0)
-7 >Emitted(105, 33) Source(76, 15) + SourceIndex(0)
-8 >Emitted(105, 45) Source(76, 20) + SourceIndex(0)
-9 >Emitted(105, 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 >
@@ -1931,12 +1934,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-1 >Emitted(106, 1) Source(100, 1) + SourceIndex(0)
-2 >Emitted(106, 2) Source(100, 2) + SourceIndex(0)
-3 >Emitted(106, 4) Source(76, 8) + SourceIndex(0)
-4 >Emitted(106, 10) Source(76, 14) + SourceIndex(0)
-5 >Emitted(106, 15) Source(76, 8) + SourceIndex(0)
-6 >Emitted(106, 21) Source(76, 14) + SourceIndex(0)
-7 >Emitted(106, 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 aab96bfe740..40f1639a939 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.js
+++ b/tests/baselines/reference/recursiveComplicatedClasses.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bf5c0b583e3..dd14ea1a9d1 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
@@ -38,6 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2e879f06f72..8328751cd86 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f31897a88aa..7e5a2a8bf5b 100644
--- a/tests/baselines/reference/reexportDefaultIsCallable.js
+++ b/tests/baselines/reference/reexportDefaultIsCallable.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e15775ff33b..31cb28a6533 100644
--- a/tests/baselines/reference/reexportedMissingAlias.js
+++ b/tests/baselines/reference/reexportedMissingAlias.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 089ed60b9ed..b50b355ae09 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -1028,6 +1028,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 282d7d2efe5..9f877e88132 100644
--- a/tests/baselines/reference/returnInConstructor1.js
+++ b/tests/baselines/reference/returnInConstructor1.js
@@ -75,6 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cd129389843..c0631fd81ca 100644
--- a/tests/baselines/reference/returnStatements.js
+++ b/tests/baselines/reference/returnStatements.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8428f81bd05..6b81f995977 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d3d3f2a63e3..56737a58b50 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c0efe733fd8..3272f2911f0 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 df099bf46e8..77635c5db9f 100644
--- a/tests/baselines/reference/scopeTests.js
+++ b/tests/baselines/reference/scopeTests.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e358e6b22f6..0c70690dac3 100644
--- a/tests/baselines/reference/shadowPrivateMembers.js
+++ b/tests/baselines/reference/shadowPrivateMembers.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b013c753b1e..4e63f2b4b35 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3642320509e..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 e986b037f28..6d0938a5750 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
@@ -16,6 +16,9 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
+>>>        if (typeof b !== "function" && b !== null) {
+>>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -25,13 +28,13 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(14, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function AbstractGreeter() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(1, 1) + SourceIndex(0)
+1->Emitted(18, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -40,16 +43,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->class AbstractGreeter {
   >
 2 >    }
-1->Emitted(16, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(16, 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(17, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(17, 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 >
@@ -62,10 +65,10 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 > 
 4 > class AbstractGreeter {
   > }
-1 >Emitted(18, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(18, 2) Source(2, 2) + SourceIndex(0)
-3 >Emitted(18, 2) Source(1, 1) + SourceIndex(0)
-4 >Emitted(18, 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->
@@ -73,21 +76,21 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->
   >
   >
-1->Emitted(19, 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(20, 5) Source(4, 23) + SourceIndex(0)
-2 >Emitted(20, 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(21, 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->^^^^^^^^
@@ -97,8 +100,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >            public a = 10;
   >            public nameA = "Ten";
   >        }
-1->Emitted(22, 9) Source(4, 1) + SourceIndex(0)
-2 >Emitted(22, 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 >^^^^^^^^
@@ -112,11 +115,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                = 
 4 >                  10
 5 >                    ;
-1 >Emitted(23, 9) Source(5, 12) + SourceIndex(0)
-2 >Emitted(23, 16) Source(5, 13) + SourceIndex(0)
-3 >Emitted(23, 19) Source(5, 16) + SourceIndex(0)
-4 >Emitted(23, 21) Source(5, 18) + SourceIndex(0)
-5 >Emitted(23, 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->^^^^^^^^
@@ -130,11 +133,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                    = 
 4 >                      "Ten"
 5 >                           ;
-1->Emitted(24, 9) Source(6, 12) + SourceIndex(0)
-2 >Emitted(24, 20) Source(6, 17) + SourceIndex(0)
-3 >Emitted(24, 23) Source(6, 20) + SourceIndex(0)
-4 >Emitted(24, 28) Source(6, 25) + SourceIndex(0)
-5 >Emitted(24, 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;
 >>>    }
@@ -144,8 +147,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
   >
 2 >    }
-1 >Emitted(26, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(26, 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->^^^^
@@ -153,8 +156,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                  ^^^->
 1->
 2 >    }
-1->Emitted(27, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(27, 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->
@@ -173,11 +176,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >                     public a = 10;
   >                     public nameA = "Ten";
   >                 }
-1->Emitted(28, 1) Source(7, 1) + SourceIndex(0)
-2 >Emitted(28, 2) Source(7, 2) + SourceIndex(0)
-3 >Emitted(28, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(28, 3) Source(4, 23) + SourceIndex(0)
-5 >Emitted(28, 18) Source(4, 38) + SourceIndex(0)
-6 >Emitted(28, 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 f219fa5ad18..b355546aaf7 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.js
+++ b/tests/baselines/reference/specializedInheritedConstructors1.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d39993c9cb1..c9f6b85b560 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.js
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d63ea13df37..1b4234922c4 100644
--- a/tests/baselines/reference/staticFactory1.js
+++ b/tests/baselines/reference/staticFactory1.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1eb96f48cd6..90fb0252437 100644
--- a/tests/baselines/reference/staticInheritance.js
+++ b/tests/baselines/reference/staticInheritance.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a3dddaffb5d..d4990d38b64 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4bc7b248957..6dabb115729 100644
--- a/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
+++ b/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b6be7f641c6..31781a40d28 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d7e877eda2f..fa5b69de450 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -69,6 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 34c606891fb..baae2b5408e 100644
--- a/tests/baselines/reference/strictModeReservedWord.js
+++ b/tests/baselines/reference/strictModeReservedWord.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 45d08b13928..79f2fd4d226 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 900e31ab45b..9ccba0029bf 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 11201f069e5..7804c003c2d 100644
--- a/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
+++ b/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 49b041b639e..abfbab4b9d7 100644
--- a/tests/baselines/reference/subtypesOfTypeParameter.js
+++ b/tests/baselines/reference/subtypesOfTypeParameter.js
@@ -115,6 +115,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a2d3b35680f..f5bbcaa5b13 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
@@ -177,6 +177,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6038e2cb175..cb7c4ec7f0d 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
@@ -88,6 +88,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5589dccf77e..1845966cb67 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
@@ -167,6 +167,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e1a8fab95c3..cfc66d95a15 100644
--- a/tests/baselines/reference/subtypingTransitivity.js
+++ b/tests/baselines/reference/subtypingTransitivity.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 bd2d50d5b75..89a13ff13eb 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -182,6 +182,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 048bfb9dad3..ec15d8dc63c 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -129,6 +129,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 305c162088d..287908e373b 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.js
@@ -121,6 +121,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1deee7a0bfc..8af59214c18 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js
@@ -182,6 +182,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 257422621e9..765e2f2b388 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js
@@ -131,6 +131,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6489ece9b0a..aeb7f1bd193 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js
@@ -121,6 +121,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cbfa0fe360c..d81166ce7fc 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.js
@@ -59,6 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d8a9b66e75d..1e7b9752a88 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.js
@@ -62,6 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d26d4298ac5..92862f6b327 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 087436392d5..3842353a421 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js
@@ -53,6 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ec5190315f1..6273a0a6e6f 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3cc540a1113..5e7afcedee6 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers.js
@@ -76,6 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8a7a32957fe..752c9ea52c5 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4108a979bf4..93de82e6777 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 97eddfb5800..b8cc088d3d6 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
@@ -71,6 +71,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 64ccbd20430..c24d80f1470 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer.js
@@ -50,6 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ddcdd02b1bb..dea9dc21f27 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.js
@@ -53,6 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 37472f84466..32e6151eaf2 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 21431891f03..8ad74974054 100644
--- a/tests/baselines/reference/super.js
+++ b/tests/baselines/reference/super.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 90db9eac32d..f512611bf9d 100644
--- a/tests/baselines/reference/super1.js
+++ b/tests/baselines/reference/super1.js
@@ -75,6 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e2de1c65f69..c7e5082ba6c 100644
--- a/tests/baselines/reference/super2.js
+++ b/tests/baselines/reference/super2.js
@@ -59,6 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 beb9303aef7..2b2d1828aad 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 468f6594188..33e88304123 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f88b0c92a0f..3203e0e1d63 100644
--- a/tests/baselines/reference/superAccessCastedCall.js
+++ b/tests/baselines/reference/superAccessCastedCall.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c04de1b20e1..18cf1dfb7b2 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.js
+++ b/tests/baselines/reference/superAccessInFatArrow1.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9f4b848f31f..8f960589185 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.js
+++ b/tests/baselines/reference/superCallArgsMustMatch.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1e71a043449..da1e783e845 100644
--- a/tests/baselines/reference/superCallAssignResult.js
+++ b/tests/baselines/reference/superCallAssignResult.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d31f3a11bb9..cd4a3b01b10 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 597f53f47cb..46aef974712 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9a81390755e..aa8e5d18b89 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 703db9d917f..df968b2ec5e 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9a2ba0ff0f7..983d72ed404 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.js
@@ -16,6 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b86502f7a1d..6623d55985e 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d3f62d89012..5c76d43f480 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f2880d43913..7ff0ab7f429 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b123b279dd8..a1468ab1ff7 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f4fc6dc4286..7924c74a82b 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2457c4f01ee..dc6c9c34d35 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 016dc25a7af..91f258602e6 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6d4cd18013a..c19ba063c5d 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fd1bb59b59b..24fb622ccc4 100644
--- a/tests/baselines/reference/superCallInNonStaticMethod.js
+++ b/tests/baselines/reference/superCallInNonStaticMethod.js
@@ -59,6 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c43746ee34c..3f2f8ca1eff 100644
--- a/tests/baselines/reference/superCallInStaticMethod.js
+++ b/tests/baselines/reference/superCallInStaticMethod.js
@@ -55,6 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 87caacf123f..381a671ec82 100644
--- a/tests/baselines/reference/superCallInsideClassDeclaration.js
+++ b/tests/baselines/reference/superCallInsideClassDeclaration.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 52a96213326..84ffd8e9fb6 100644
--- a/tests/baselines/reference/superCallInsideClassExpression.js
+++ b/tests/baselines/reference/superCallInsideClassExpression.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 12da3b03199..085c3f84f56 100644
--- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
+++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ed780e5e522..12937ccfa81 100644
--- a/tests/baselines/reference/superCallOutsideConstructor.js
+++ b/tests/baselines/reference/superCallOutsideConstructor.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 78f37bc1000..addb0a9ba22 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6051c6398b3..4a9266de4c5 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping2.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping2.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 94518aec56f..1838072b627 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2cb12c0ecc2..a7c2020052a 100644
--- a/tests/baselines/reference/superCallWithCommentEmit01.js
+++ b/tests/baselines/reference/superCallWithCommentEmit01.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 07d6860e20c..61660eafd64 100644
--- a/tests/baselines/reference/superCallWithMissingBaseClass.js
+++ b/tests/baselines/reference/superCallWithMissingBaseClass.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3447e4de698..9730557a34b 100644
--- a/tests/baselines/reference/superCalls.js
+++ b/tests/baselines/reference/superCalls.js
@@ -39,6 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 46db033c66b..e963a9fafd3 100644
--- a/tests/baselines/reference/superCallsInConstructor.js
+++ b/tests/baselines/reference/superCallsInConstructor.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e8b9c86b844..39ec3d25582 100644
--- a/tests/baselines/reference/superElementAccess.js
+++ b/tests/baselines/reference/superElementAccess.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 35673eaa133..5781964bbe4 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -60,6 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5d90f38aed6..dbf9fd28844 100644
--- a/tests/baselines/reference/superHasMethodsFromMergedInterface.js
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 85395af19df..6e631780236 100644
--- a/tests/baselines/reference/superInCatchBlock1.js
+++ b/tests/baselines/reference/superInCatchBlock1.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cba46b1f92a..eac4af99e83 100644
--- a/tests/baselines/reference/superInConstructorParam1.js
+++ b/tests/baselines/reference/superInConstructorParam1.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 36ac400184f..50e7039768f 100644
--- a/tests/baselines/reference/superInLambdas.js
+++ b/tests/baselines/reference/superInLambdas.js
@@ -76,6 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 05c6ec1225a..257bc39a239 100644
--- a/tests/baselines/reference/superInObjectLiterals_ES5.js
+++ b/tests/baselines/reference/superInObjectLiterals_ES5.js
@@ -68,6 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6842c574142..1f015132cac 100644
--- a/tests/baselines/reference/superNewCall1.js
+++ b/tests/baselines/reference/superNewCall1.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b00bd719280..021b897532a 100644
--- a/tests/baselines/reference/superNoModifiersCrash.js
+++ b/tests/baselines/reference/superNoModifiersCrash.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3410f4d49f9..66803cb3adf 100644
--- a/tests/baselines/reference/superPropertyAccess.js
+++ b/tests/baselines/reference/superPropertyAccess.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 950b0471de3..e13521eb93a 100644
--- a/tests/baselines/reference/superPropertyAccess1.js
+++ b/tests/baselines/reference/superPropertyAccess1.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a04769c9d0f..0456a88661c 100644
--- a/tests/baselines/reference/superPropertyAccess2.js
+++ b/tests/baselines/reference/superPropertyAccess2.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0d20e9d9beb..745eb47e29e 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 86d3fc872bf..5b71c34d3a5 100644
--- a/tests/baselines/reference/superPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/superPropertyAccessInSuperCall01.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 b3473eb1fc7..79574a2c229 100644
--- a/tests/baselines/reference/superPropertyAccessNoError.js
+++ b/tests/baselines/reference/superPropertyAccessNoError.js
@@ -85,6 +85,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 be1bbf89e0d..b06e38e4b18 100644
--- a/tests/baselines/reference/superPropertyAccess_ES5.js
+++ b/tests/baselines/reference/superPropertyAccess_ES5.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 061c03d4308..d284bb54f66 100644
--- a/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
+++ b/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
@@ -26,6 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4e9445cea40..dfd7cb74acd 100644
--- a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2a932b4e69e..3c4712dd9da 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess5.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess5.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f26d4e75b5c..43d6c7ce9bc 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess6.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess6.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1e92d132eaa..43c277106f5 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.js
+++ b/tests/baselines/reference/superWithGenericSpecialization.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1a5827122eb..73136ccbfb5 100644
--- a/tests/baselines/reference/superWithGenerics.js
+++ b/tests/baselines/reference/superWithGenerics.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 aa2e41751e0..1201db208d8 100644
--- a/tests/baselines/reference/superWithTypeArgument.js
+++ b/tests/baselines/reference/superWithTypeArgument.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 33d6ef13532..179b13adacf 100644
--- a/tests/baselines/reference/superWithTypeArgument2.js
+++ b/tests/baselines/reference/superWithTypeArgument2.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 940dda49cb7..75757d76828 100644
--- a/tests/baselines/reference/superWithTypeArgument3.js
+++ b/tests/baselines/reference/superWithTypeArgument3.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e45de8de606..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,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0491ea02c9c..94d18716d8b 100644
--- a/tests/baselines/reference/switchStatements.js
+++ b/tests/baselines/reference/switchStatements.js
@@ -64,6 +64,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 59be406cc2f..e2640811bac 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -39,6 +39,9 @@ System.register(["./foo"], function (exports_1, context_1) {
             return extendStatics(d, b);
         };
         return function (d, b) {
+            if (typeof b !== "function" && b !== null) {
+                throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            }
             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 d52c59ecc1c..d33fcdcfe72 100644
--- a/tests/baselines/reference/targetTypeBaseCalls.js
+++ b/tests/baselines/reference/targetTypeBaseCalls.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c903864eb67..0f89e8b29e6 100644
--- a/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
+++ b/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 71c0a408c45..206df67849c 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -57,6 +57,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e295c49074b..9be13e16c2b 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -58,6 +58,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cd289bb7ea9..9e50377314e 100644
--- a/tests/baselines/reference/thisInSuperCall.js
+++ b/tests/baselines/reference/thisInSuperCall.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 63d111224d8..0ab5af1e762 100644
--- a/tests/baselines/reference/thisInSuperCall1.js
+++ b/tests/baselines/reference/thisInSuperCall1.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 095a6c647f9..45599a5b231 100644
--- a/tests/baselines/reference/thisInSuperCall2.js
+++ b/tests/baselines/reference/thisInSuperCall2.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7fd85c47daa..d86def33846 100644
--- a/tests/baselines/reference/thisInSuperCall3.js
+++ b/tests/baselines/reference/thisInSuperCall3.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4789d0c8022..c575bb64bf3 100644
--- a/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
+++ b/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
@@ -32,6 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3c1dea3fd51..11f14828e7a 100644
--- a/tests/baselines/reference/thisTypeInFunctions.js
+++ b/tests/baselines/reference/thisTypeInFunctions.js
@@ -203,6 +203,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2f6ff07abcd..3f42f227213 100644
--- a/tests/baselines/reference/thisTypeInFunctions3.js
+++ b/tests/baselines/reference/thisTypeInFunctions3.js
@@ -19,6 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5a3e1ff4d3f..5e1d98219a2 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.js
+++ b/tests/baselines/reference/tsxAttributeResolution15.js
@@ -25,6 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 17aa001e936..312a8df0796 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.js
+++ b/tests/baselines/reference/tsxAttributeResolution16.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 09cbe9e96d4..c4b84a51adb 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 617b475f713..94002953889 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5d74321695f..08934728467 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5a9996e2704..723689e049d 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 14aef6ce1b8..269e8442b06 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 05e2b52a7cd..a41c9967084 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 82dfede8e4f..5e0b8f5558d 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 f72c50c1b9c..ededc625796 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d42e5d5b555..208a11a9eef 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -40,6 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -69,6 +72,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a9f57766f70..86ce6221986 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fb46fe983dc..c0d8b29ff47 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.js
+++ b/tests/baselines/reference/tsxGenericAttributesType3.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0b2353e67d9..e0a271f106d 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.js
+++ b/tests/baselines/reference/tsxGenericAttributesType4.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ffc320bb4eb..92afb996e7a 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.js
+++ b/tests/baselines/reference/tsxGenericAttributesType5.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7fc020a2683..002a63f1080 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.js
+++ b/tests/baselines/reference/tsxGenericAttributesType6.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 942dfb9ec7e..b1329b31a23 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.js
+++ b/tests/baselines/reference/tsxGenericAttributesType9.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c5157ea6a89..2a41c1a8894 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.js
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.js
@@ -135,6 +135,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0c15cd0d07c..c5dc176c031 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9742d8348bc..c9485b956bb 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
@@ -24,6 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8f8e21a62a6..eca3e2db18f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6db169e348e..e943531e7d6 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 394f524a960..5153086903a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
@@ -42,6 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2534c483cde..cffc7e69f3f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution17.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution17.js
@@ -29,6 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8d75bae4a19..8e27eb15d12 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0d094d4aef8..6529fa98909 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
@@ -31,6 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5ccfd8d5f90..fa25dc1e36f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
@@ -44,6 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2f826f2e59d..556df2263b4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
@@ -43,6 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8c78efeedd0..bf0e8118661 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6248df6f042..bff8d86000a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1b22bb0e17c..203665f8505 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d92e3cfa16c..3958b722d3e 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
@@ -34,6 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 ea9ac663998..f077b435cdd 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 50eadb9774d..456fb843e4c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -47,6 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e72b47e3aab..e2dcee2eefe 100644
--- a/tests/baselines/reference/tsxUnionElementType3.js
+++ b/tests/baselines/reference/tsxUnionElementType3.js
@@ -46,6 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 5619f8c6d48..4cee2d6d536 100644
--- a/tests/baselines/reference/tsxUnionElementType4.js
+++ b/tests/baselines/reference/tsxUnionElementType4.js
@@ -45,6 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 9e004413575..aa0cf6cc14a 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1eedb2413ea..4b55d1cbae0 100644
--- a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
+++ b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
@@ -23,6 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8f37011a273..d525eda14f0 100644
--- a/tests/baselines/reference/typeAssertions.js
+++ b/tests/baselines/reference/typeAssertions.js
@@ -60,6 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7d762946e30..465af917351 100644
--- a/tests/baselines/reference/typeGuardFunction.js
+++ b/tests/baselines/reference/typeGuardFunction.js
@@ -91,6 +91,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7e640fea6d7..7d66b4902ed 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -176,6 +176,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 13d14fa6bb6..e148a983921 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.js
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 1d52025c9f7..1e0544332b9 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js
@@ -150,6 +150,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6db9d7f6885..a7a8f7053c5 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
@@ -68,6 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 554e3c0d572..04e19d27ec9 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
@@ -81,6 +81,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 57c0da2f4e5..a0223809175 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.js
+++ b/tests/baselines/reference/typeGuardOfFormIsType.js
@@ -45,6 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 037a0fe2385..6eaf11f1e8f 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.js
@@ -91,6 +91,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 87864e50e3b..8adef023d1b 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 cc5073f4563..d64296f744b 100644
--- a/tests/baselines/reference/typeMatch2.js
+++ b/tests/baselines/reference/typeMatch2.js
@@ -53,6 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 88be3876544..b4c42b6daf5 100644
--- a/tests/baselines/reference/typeOfSuperCall.js
+++ b/tests/baselines/reference/typeOfSuperCall.js
@@ -17,6 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 8a963309eab..a54e4724ca9 100644
--- a/tests/baselines/reference/typeParameterAsBaseClass.js
+++ b/tests/baselines/reference/typeParameterAsBaseClass.js
@@ -11,6 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a6eddf38a38..9cd4e8eb439 100644
--- a/tests/baselines/reference/typeParameterAsBaseType.js
+++ b/tests/baselines/reference/typeParameterAsBaseType.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 78bcc9f650c..72c7e1ed2b5 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0a55d8fd0d4..a2086aedc39 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.js
@@ -21,6 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 27ba221a281..a97f59ccc0d 100644
--- a/tests/baselines/reference/typeRelationships.js
+++ b/tests/baselines/reference/typeRelationships.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 074e73ea014..080781e1238 100644
--- a/tests/baselines/reference/typeValueConflict1.js
+++ b/tests/baselines/reference/typeValueConflict1.js
@@ -20,6 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 534dfa1cdff..d88b9582313 100644
--- a/tests/baselines/reference/typeValueConflict2.js
+++ b/tests/baselines/reference/typeValueConflict2.js
@@ -27,6 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 385c8bd55c4..9847668e5c5 100644
--- a/tests/baselines/reference/typeVariableTypeGuards.js
+++ b/tests/baselines/reference/typeVariableTypeGuards.js
@@ -93,6 +93,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 e145a5d9b45..f458981edd0 100644
--- a/tests/baselines/reference/typeofClass2.js
+++ b/tests/baselines/reference/typeofClass2.js
@@ -30,6 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 6cb2fbaff54..e3e0d37bbae 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
@@ -51,6 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 7bbe983955d..3f898dee089 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
@@ -49,6 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 efbd2b49b41..82f259b7bb2 100644
--- a/tests/baselines/reference/undeclaredBase.js
+++ b/tests/baselines/reference/undeclaredBase.js
@@ -12,6 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 40378779e0c..276c0bce1aa 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
@@ -131,6 +131,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4fc0d0bf3ce..c69f16c9741 100644
--- a/tests/baselines/reference/underscoreMapFirst.js
+++ b/tests/baselines/reference/underscoreMapFirst.js
@@ -57,6 +57,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 c42767ef3bf..a47f2661ae6 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass01.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass01.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 313b6663d54..b21d1fdc3ea 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass02.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass02.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 90ebc0ff152..9b8688bd774 100644
--- a/tests/baselines/reference/unionTypeEquivalence.js
+++ b/tests/baselines/reference/unionTypeEquivalence.js
@@ -28,6 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 3c8e461ef18..f8f3c224655 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.js
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js
@@ -36,6 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 fc7b0c5020f..a7352b2545b 100644
--- a/tests/baselines/reference/unionTypesAssignability.js
+++ b/tests/baselines/reference/unionTypesAssignability.js
@@ -82,6 +82,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 64057fe8c71..c80ec6cfdd2 100644
--- a/tests/baselines/reference/unknownSymbols1.js
+++ b/tests/baselines/reference/unknownSymbols1.js
@@ -41,6 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 4f1a9196156..d27fd958a7b 100644
--- a/tests/baselines/reference/unspecializedConstraints.js
+++ b/tests/baselines/reference/unspecializedConstraints.js
@@ -162,6 +162,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d685742804f..9d0f9f88f6c 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
@@ -52,6 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 57517346ea3..cc932a000ae 100644
--- a/tests/baselines/reference/unusedClassesinNamespace4.js
+++ b/tests/baselines/reference/unusedClassesinNamespace4.js
@@ -22,6 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 a26090bb617..580e7a40a8c 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.js
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.js
@@ -110,6 +110,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 36ee10aad0f..68177b5c614 100644
--- a/tests/baselines/reference/unusedInvalidTypeArguments.js
+++ b/tests/baselines/reference/unusedInvalidTypeArguments.js
@@ -61,6 +61,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -108,6 +111,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 01492e31d89..f6f15c1d12f 100644
--- a/tests/baselines/reference/useBeforeDeclaration_superClass.js
+++ b/tests/baselines/reference/useBeforeDeclaration_superClass.js
@@ -37,6 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 d35b84f3df1..4903aba5a72 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.js
+++ b/tests/baselines/reference/validUseOfThisInSuper.js
@@ -18,6 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 2f328d6a43c..6106f7fb687 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -33,6 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 91fdb7d3e1a..8bc8f89703b 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
@@ -76,6 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         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 0b39a6176ef..e6059cddb6b 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
@@ -76,6 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null) {
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

From 26c7615f58e6807b818215f0b0bdc60328d1420f Mon Sep 17 00:00:00 2001
From: Josh Goldberg <me@joshuakgoldberg.com>
Date: Fri, 13 Mar 2020 20:32:42 -0400
Subject: [PATCH 2/6] On second thought, removed the {}s

---
 src/compiler/transformers/es2015.ts           | 129 ++-
 ...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, 1514 insertions(+), 2336 deletions(-)

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 548e8d68277..88484396008 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)
-                            ]),
-                            node.expression
-                        ),
-                        EmitFlags.NoHoisting
-                    ),
-                    /*condition*/ setTextRange(
-                        createLessThan(
-                            counter,
-                            createPropertyAccess(rhsReference, "length")
-                        ),
+                    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
+                ),
                     /*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
-                            ),
-                            EmitFlags.NoHoisting
+                        setTextRange(
+                            createVariableDeclarationList([
+                                setTextRange(createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
+                                createVariableDeclaration(result, /*type*/ undefined, next)
+                            ]),
+                            node.expression
                         ),
+                        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(
+                        setEmitFlags(
+                            createIf(
+                                createLogicalAnd(
                                     createLogicalAnd(
-                                        createLogicalAnd(
-                                            result,
-                                            createLogicalNot(
-                                                createPropertyAccess(result, "done")
-                                            )
-                                        ),
-                                        createAssignment(
-                                            returnMethod,
-                                            createPropertyAccess(iterator, "return")
+                                        result,
+                                        createLogicalNot(
+                                            createPropertyAccess(result, "done")
                                         )
                                     ),
-                                    createExpressionStatement(
-                                        createFunctionCall(returnMethod, iterator, [])
+                                    createAssignment(
+                                        returnMethod,
+                                        createPropertyAccess(iterator, "return")
+                                    )
+                                ),
+                                createExpressionStatement(
+                                    createFunctionCall(returnMethod, iterator, [])
+                                )
+                            ),
+                            EmitFlags.SingleLine
+                        ),
+                    ]),
+                        /*catchClause*/ undefined,
+                        /*finallyBlock*/ setEmitFlags(
+                        createBlock([
+                            setEmitFlags(
+                                createIf(
+                                    errorRecord,
+                                    createThrow(
+                                        createPropertyAccess(errorRecord, "error")
                                     )
                                 ),
                                 EmitFlags.SingleLine
-                            ),
+                            )
                         ]),
-                        /*catchClause*/ undefined,
-                        /*finallyBlock*/ setEmitFlags(
-                            createBlock([
-                                setEmitFlags(
-                                    createIf(
-                                        errorRecord,
-                                        createThrow(
-                                            createPropertyAccess(errorRecord, "error")
-                                        )
-                                    ),
-                                    EmitFlags.SingleLine
-                                )
-                            ]),
-                            EmitFlags.SingleLine
-                        )
+                        EmitFlags.SingleLine
+                    )
                     )
                 ])
             );
@@ -4321,9 +4321,8 @@ namespace ts {
                 };
 
                 return function (d, b) {
-                    if (typeof b !== "function" && b !== null) {
+                    if (typeof b !== "function" && b !== null)
                         throw new TypeError("Class extends value " + b + " is not a constructor or null");
-                    }
                     extendStatics(d, b);
                     function __() { this.constructor = d; }
                     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
index 9557601efee..02f6ce4874d 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d4cf1fe69ae..143d8ef2604 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f71c72da59..54346dc0076 100644
--- a/tests/baselines/reference/abstractClassInLocalScope.js
+++ b/tests/baselines/reference/abstractClassInLocalScope.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fe0304dc8bd..2f9b2b1de8d 100644
--- a/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
+++ b/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 149339bc265..a1f2000224d 100644
--- a/tests/baselines/reference/abstractProperty.js
+++ b/tests/baselines/reference/abstractProperty.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5c67c4c920a..4476763061b 100644
--- a/tests/baselines/reference/abstractPropertyInConstructor.js
+++ b/tests/baselines/reference/abstractPropertyInConstructor.js
@@ -80,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ac5c77c59a8..5994aeb891e 100644
--- a/tests/baselines/reference/abstractPropertyNegative.js
+++ b/tests/baselines/reference/abstractPropertyNegative.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2005724d03..ca405834ab4 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.js
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ecfe5fc34fd..0a866b482cd 100644
--- a/tests/baselines/reference/accessorsOverrideProperty7.js
+++ b/tests/baselines/reference/accessorsOverrideProperty7.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b18895a48ea..43f06a465e2 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_inference.js
+++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 da5b2725fe9..2bf2b18eb66 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68833218d2c..2219db0782f 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d010bdf1072..6899fb5cee8 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 177b1a5cea7..e567cb76be7 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ae171ff395d..d970fd1878a 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e06ab07a16..affaf4df789 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bca20359e01..e6e55b76ccc 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d387ff62cb..b47774b8624 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " 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,9 +72,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c569781f1ff..3cbd24ddc6d 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 11669a4b006..b521ac03ce2 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.js
+++ b/tests/baselines/reference/ambiguousOverloadResolution.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 886f7ae5280..61afb71509c 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 36cbcaa0275..e13e6a8548a 100644
--- a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
+++ b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -87,9 +86,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 58a2cfc4623..e9930fd2b1d 100644
--- a/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
+++ b/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6d54f798fb2..550dd61e945 100644
--- a/tests/baselines/reference/apparentTypeSubtyping.js
+++ b/tests/baselines/reference/apparentTypeSubtyping.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 09c6abe3491..a4121dd3f6d 100644
--- a/tests/baselines/reference/apparentTypeSupertype.js
+++ b/tests/baselines/reference/apparentTypeSupertype.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c3f3338c811..812b95759f6 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.js
+++ b/tests/baselines/reference/arrayAssignmentTest1.js
@@ -94,9 +94,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fcb5ff5df68..2337e318ca9 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.js
+++ b/tests/baselines/reference/arrayAssignmentTest2.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e74206c132..13cabfa4913 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.js
+++ b/tests/baselines/reference/arrayBestCommonTypes.js
@@ -116,9 +116,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8c9d99dc46e..634859b47ea 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.js
+++ b/tests/baselines/reference/arrayLiteralTypeInference.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1cf819168e5..78bdc9fc129 100644
--- a/tests/baselines/reference/arrayLiterals.js
+++ b/tests/baselines/reference/arrayLiterals.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ef77fb3ea15..43cadb77e14 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c22456b5eac..a8a05b720dc 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84ec5e76414..6c4d7091ded 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -104,9 +104,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa95311ea24..2cd17ce27dd 100644
--- a/tests/baselines/reference/assertionTypePredicates1.js
+++ b/tests/baselines/reference/assertionTypePredicates1.js
@@ -174,9 +174,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 136312daaae..9cb41738ec3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
@@ -109,9 +109,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5d172b9b5a3..185ec0de3be 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
@@ -108,9 +108,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f754e20256..0592e54fec9 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 40d925b99f4..259519e9cba 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6b9ea414bba..718c1e180b4 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
@@ -109,9 +109,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9a14d501a7c..ae03f422545 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
@@ -108,9 +108,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9b6b6f2983f..3d23df97b61 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3fd0675a214..9e92e8850c0 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 81289abd59e..a00da29ed0d 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ca864f24df8..e28ba286533 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 56e0ca2b037..28fe1755600 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
@@ -101,9 +101,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2af39acd2aa..62413e44a77 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
@@ -98,9 +98,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a8f0991cf64..8924ffb70a0 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -101,9 +101,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08e335b55a9..68425cd2c8c 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
@@ -63,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 644f66e5abf..92809166bb3 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.js
+++ b/tests/baselines/reference/assignmentLHSIsValue.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3cdf95df073..5d1cd4a385f 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f96ad8fc6ab..7775094c62b 100644
--- a/tests/baselines/reference/autolift4.js
+++ b/tests/baselines/reference/autolift4.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 516adec8694..644210dc6c7 100644
--- a/tests/baselines/reference/baseCheck.js
+++ b/tests/baselines/reference/baseCheck.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4d64e8af1d2..be4dcf52df7 100644
--- a/tests/baselines/reference/baseClassImprovedMismatchErrors.js
+++ b/tests/baselines/reference/baseClassImprovedMismatchErrors.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 396adade09b..607749f624d 100644
--- a/tests/baselines/reference/baseConstraintOfDecorator.js
+++ b/tests/baselines/reference/baseConstraintOfDecorator.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 38f60f7fd97..833c1eeae88 100644
--- a/tests/baselines/reference/baseExpressionTypeParameters.js
+++ b/tests/baselines/reference/baseExpressionTypeParameters.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b947fd1216c..fca80d0fa67 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.js
+++ b/tests/baselines/reference/baseIndexSignatureResolution.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9b3417dc995..fe70a8d231a 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.js
+++ b/tests/baselines/reference/baseTypeOrderChecking.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6ee6efc8933..d58dd744c3d 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9f6b20a71eb..c59e70e0795 100644
--- a/tests/baselines/reference/bases.js
+++ b/tests/baselines/reference/bases.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 26fb7952d44..07af48dd14e 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d357dd5363d..00080afbeb2 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df3bd9deec0..6c838590c21 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.js
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 325dc56370b..b93d8a55cdf 100644
--- a/tests/baselines/reference/callChainWithSuper(target=es5).js
+++ b/tests/baselines/reference/callChainWithSuper(target=es5).js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3a4ed31761..dd48ba034ae 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b10f0e3851..e977f374b95 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
@@ -124,9 +124,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b98cd8a885b..14b65f84ed0 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 830901db1ca..fdf5bfb9f4e 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cfbd3f9a181..5f0f3ac2704 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c1977dc9981..d0e765c048e 100644
--- a/tests/baselines/reference/callWithSpread.js
+++ b/tests/baselines/reference/callWithSpread.js
@@ -67,9 +67,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42899e76c33..aa2797758a8 100644
--- a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5032900df2a..8ac9de71e98 100644
--- a/tests/baselines/reference/captureThisInSuperCall.js
+++ b/tests/baselines/reference/captureThisInSuperCall.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5a2f89298ce..3b69863c1aa 100644
--- a/tests/baselines/reference/castingTuple.js
+++ b/tests/baselines/reference/castingTuple.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 81c9e0d4159..5a6a80b496c 100644
--- a/tests/baselines/reference/chainedAssignment3.js
+++ b/tests/baselines/reference/chainedAssignment3.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfb8d8a455c..28612036cd1 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 87995535308..1cb44048734 100644
--- a/tests/baselines/reference/checkForObjectTooStrict.js
+++ b/tests/baselines/reference/checkForObjectTooStrict.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 63f811a67c7..58abfe024a2 100644
--- a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
+++ b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 af28d3eb339..8eee35d0809 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 480c7baabaa..28bb2fb6ed0 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e213c7c05e6..87fedcf4da1 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bae227dd449..fa69c0b51d8 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ddd75f2d3ce..584aa086a12 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.js
@@ -54,9 +54,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d3c34622b84..3b9e0839fb4 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b4f77ae0ff6..7513d8a0760 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f96a0585b0a..11ba94cd593 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d6e371fd197..98655f7fc76 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 af389ce3fce..f265559c9fa 100644
--- a/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
+++ b/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed629829b97..31b587d9da8 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d99574f3051..9022b7c65ca 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 30de6e92a83..3739b7cad0b 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6452059dd39..505f01a1dd2 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bdc6e55bc32..3712d0ff12a 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fbddda517ec..ad45f40a980 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9cfaf4afec4..fb0b44e1de5 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4c82d7b2b29..b5f9f0858b2 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a8301289def..ce089fc463b 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1bd6fb4e401..7ed62aad949 100644
--- a/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
+++ b/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3b3181bacb3..90b42cc6469 100644
--- a/tests/baselines/reference/circularImportAlias.js
+++ b/tests/baselines/reference/circularImportAlias.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d83696bfc50..696c3371959 100644
--- a/tests/baselines/reference/circularTypeofWithFunctionModule.js
+++ b/tests/baselines/reference/circularTypeofWithFunctionModule.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ea86d2bf083..9e0fcf0e5d5 100644
--- a/tests/baselines/reference/classAbstractConstructorAssignability.js
+++ b/tests/baselines/reference/classAbstractConstructorAssignability.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ea2db89e9cf..7f2129d5d00 100644
--- a/tests/baselines/reference/classAbstractCrashedOnce.js
+++ b/tests/baselines/reference/classAbstractCrashedOnce.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7dd4b30bcb0..32094a830b3 100644
--- a/tests/baselines/reference/classAbstractExtends.js
+++ b/tests/baselines/reference/classAbstractExtends.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ca0b425cc8..c1550c37766 100644
--- a/tests/baselines/reference/classAbstractFactoryFunction.js
+++ b/tests/baselines/reference/classAbstractFactoryFunction.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 510f492b522..3eeb4bb0866 100644
--- a/tests/baselines/reference/classAbstractGeneric.js
+++ b/tests/baselines/reference/classAbstractGeneric.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 288b452c88c..37b005ed6e2 100644
--- a/tests/baselines/reference/classAbstractInAModule.js
+++ b/tests/baselines/reference/classAbstractInAModule.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ce76c42f190..8f7705ceac4 100644
--- a/tests/baselines/reference/classAbstractInheritance.js
+++ b/tests/baselines/reference/classAbstractInheritance.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fd2222a5377..fbab311025a 100644
--- a/tests/baselines/reference/classAbstractInstantiations1.js
+++ b/tests/baselines/reference/classAbstractInstantiations1.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d43568f3dbb..921453695e0 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.js
+++ b/tests/baselines/reference/classAbstractInstantiations2.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8502b5aa21e..9cb73f83cba 100644
--- a/tests/baselines/reference/classAbstractOverrideWithAbstract.js
+++ b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cff0842ff9b..33853b46f93 100644
--- a/tests/baselines/reference/classAbstractSuperCalls.js
+++ b/tests/baselines/reference/classAbstractSuperCalls.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5099fe11971..e8906510a45 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4e5b2ade0c8..fe59028c08e 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4c66edf5103..983a8e1f556 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.js
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -54,9 +54,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 888e9c5316b..4b1f4f31fc3 100644
--- a/tests/baselines/reference/classConstructorAccessibility4.js
+++ b/tests/baselines/reference/classConstructorAccessibility4.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94dd91637aa..1c1b02ac0b1 100644
--- a/tests/baselines/reference/classConstructorAccessibility5.js
+++ b/tests/baselines/reference/classConstructorAccessibility5.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 453900bf32d..1e802bc23ab 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6b497780ad..4f6dbe4b262 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 13cd7db5e4a..4fb60b4043b 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2c9c7ae1642..7f86dce2fbc 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3664491f83..3d7f1adae46 100644
--- a/tests/baselines/reference/classDeclaredBeforeClassFactory.js
+++ b/tests/baselines/reference/classDeclaredBeforeClassFactory.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2369bda834d..da9194cf488 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0dd173f34e8..8dd5771c29f 100644
--- a/tests/baselines/reference/classExpression2.js
+++ b/tests/baselines/reference/classExpression2.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 16ea2823a2f..5dcee4b5193 100644
--- a/tests/baselines/reference/classExpression3.js
+++ b/tests/baselines/reference/classExpression3.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bef91534fe1..a9a89ac9a96 100644
--- a/tests/baselines/reference/classExpressionExtendingAbstractClass.js
+++ b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1c8fa8aa34e..9c4e258b70d 100644
--- a/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
+++ b/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 83cd9b04bfa..f857b4209a7 100644
--- a/tests/baselines/reference/classExtendingBuiltinType.js
+++ b/tests/baselines/reference/classExtendingBuiltinType.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b6b7f9a76a..5e404484a6d 100644
--- a/tests/baselines/reference/classExtendingClass.js
+++ b/tests/baselines/reference/classExtendingClass.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 61af83d198d..1ae632084ae 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.js
+++ b/tests/baselines/reference/classExtendingClassLikeType.js
@@ -67,9 +67,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a1698b831d3..e9d5c1b85a9 100644
--- a/tests/baselines/reference/classExtendingNonConstructor.js
+++ b/tests/baselines/reference/classExtendingNonConstructor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 65c4fff4373..bfa7e0360fd 100644
--- a/tests/baselines/reference/classExtendingNull.js
+++ b/tests/baselines/reference/classExtendingNull.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5d9ee3c76bd..f1986f3ad34 100644
--- a/tests/baselines/reference/classExtendingPrimitive.js
+++ b/tests/baselines/reference/classExtendingPrimitive.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9cca267f309..1ebe2be1836 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.js
+++ b/tests/baselines/reference/classExtendingPrimitive2.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42d82f6ea0f..a4493fd86f4 100644
--- a/tests/baselines/reference/classExtendingQualifiedName.js
+++ b/tests/baselines/reference/classExtendingQualifiedName.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f0454c72f27..34a333619b9 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.js
+++ b/tests/baselines/reference/classExtendingQualifiedName2.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 953f7bd630b..b4ec841a30e 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -67,9 +66,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7613c23ae8d..fdf721d6ac5 100644
--- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8ad72c59b1e..51cb37a7834 100644
--- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6624104b8ba..3977e4e1d32 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e11d58af787..acdd2b75be8 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84aea7bdf8b..c04a32bef7c 100644
--- a/tests/baselines/reference/classExtendsInterface.js
+++ b/tests/baselines/reference/classExtendsInterface.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 261777267c7..7e18f045760 100644
--- a/tests/baselines/reference/classExtendsInterfaceInExpression.js
+++ b/tests/baselines/reference/classExtendsInterfaceInExpression.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 22a852a58bd..ba13cef76c6 100644
--- a/tests/baselines/reference/classExtendsInterfaceInModule.js
+++ b/tests/baselines/reference/classExtendsInterfaceInModule.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 407e55690cc..b71c8abed82 100644
--- a/tests/baselines/reference/classExtendsInterface_not.js
+++ b/tests/baselines/reference/classExtendsInterface_not.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b9eac2a341..4013c036cc8 100644
--- a/tests/baselines/reference/classExtendsItself.js
+++ b/tests/baselines/reference/classExtendsItself.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa2026179d3..a064acd93c3 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bd1d4afddce..14a1516ebc1 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4546e39b74c..7d800450388 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly3.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly3.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -51,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -75,9 +73,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -99,9 +96,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -123,9 +119,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -147,9 +142,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 27427f54141..199cd885c7b 100644
--- a/tests/baselines/reference/classExtendsMultipleBaseClasses.js
+++ b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 82fedc750a2..a2d8b670c19 100644
--- a/tests/baselines/reference/classExtendsNull.js
+++ b/tests/baselines/reference/classExtendsNull.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 23305ebdfce..ededf2a25d3 100644
--- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb8781c1562..30b98303d19 100644
--- a/tests/baselines/reference/classExtendsValidConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5bcc85966ae..f7f1a5d2440 100644
--- a/tests/baselines/reference/classExtensionNameOutput.js
+++ b/tests/baselines/reference/classExtensionNameOutput.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 13537655316..6f42a9bd9a2 100644
--- a/tests/baselines/reference/classHeritageWithTrailingSeparator.js
+++ b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 80f8863586f..97258c5c159 100644
--- a/tests/baselines/reference/classImplementsClass2.js
+++ b/tests/baselines/reference/classImplementsClass2.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 afa01e4c613..1d48b64b809 100644
--- a/tests/baselines/reference/classImplementsClass3.js
+++ b/tests/baselines/reference/classImplementsClass3.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5ad639f311a..babe28a722a 100644
--- a/tests/baselines/reference/classImplementsClass4.js
+++ b/tests/baselines/reference/classImplementsClass4.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8555a3f262c..655355d1375 100644
--- a/tests/baselines/reference/classImplementsClass5.js
+++ b/tests/baselines/reference/classImplementsClass5.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c373354722f..9ea92525d96 100644
--- a/tests/baselines/reference/classImplementsClass6.js
+++ b/tests/baselines/reference/classImplementsClass6.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a63e1777a67..83ead7522ae 100644
--- a/tests/baselines/reference/classIndexer3.js
+++ b/tests/baselines/reference/classIndexer3.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed3e55e2726..266aad9f966 100644
--- a/tests/baselines/reference/classInheritence.js
+++ b/tests/baselines/reference/classInheritence.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 98da3b47181..0f1c14c44f1 100644
--- a/tests/baselines/reference/classIsSubtypeOfBaseType.js
+++ b/tests/baselines/reference/classIsSubtypeOfBaseType.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8615a47ee4f..55e1239844c 100644
--- a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
+++ b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 437fe85c776..bd56a6c95b4 100644
--- a/tests/baselines/reference/classOrder2.js
+++ b/tests/baselines/reference/classOrder2.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eb0aed3c132..9a664e83bff 100644
--- a/tests/baselines/reference/classOrderBug.js
+++ b/tests/baselines/reference/classOrderBug.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 48b65706657..5795e5c4589 100644
--- a/tests/baselines/reference/classSideInheritance1.js
+++ b/tests/baselines/reference/classSideInheritance1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67b2022c460..0888735d373 100644
--- a/tests/baselines/reference/classSideInheritance2.js
+++ b/tests/baselines/reference/classSideInheritance2.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8d36c5915c6..b38b2eda85c 100644
--- a/tests/baselines/reference/classSideInheritance3.js
+++ b/tests/baselines/reference/classSideInheritance3.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ee6920b472..cb08b51e9f2 100644
--- a/tests/baselines/reference/classUpdateTests.js
+++ b/tests/baselines/reference/classUpdateTests.js
@@ -122,9 +122,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1dab28c11d7..226abd152d8 100644
--- a/tests/baselines/reference/classUsedBeforeInitializedVariables.js
+++ b/tests/baselines/reference/classUsedBeforeInitializedVariables.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6721e1db675..f4348a315e6 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 57be5658324..18cb61863e1 100644
--- a/tests/baselines/reference/classWithConstructors.js
+++ b/tests/baselines/reference/classWithConstructors.js
@@ -58,9 +58,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 826be5fa6f1..6028c76dfbc 100644
--- a/tests/baselines/reference/classWithProtectedProperty.js
+++ b/tests/baselines/reference/classWithProtectedProperty.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 094cd7a31ac..178d9900d85 100644
--- a/tests/baselines/reference/classWithStaticMembers.js
+++ b/tests/baselines/reference/classWithStaticMembers.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6f42a59592..66d32d477cd 100644
--- a/tests/baselines/reference/classdecl.js
+++ b/tests/baselines/reference/classdecl.js
@@ -102,9 +102,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfe890598cc..cb5b85e1be2 100644
--- a/tests/baselines/reference/cloduleGenericOnSelfMember.js
+++ b/tests/baselines/reference/cloduleGenericOnSelfMember.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 75d2ffeafbf..5a61e7c209b 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.js
+++ b/tests/baselines/reference/clodulesDerivedClasses.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e9aee055c3..d9faf83173b 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6fa8bfc0592..2bd949cbae6 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 54be5b45431..1e461178716 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c5632e0d8a2..b1501d33582 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8abe8522273..3e3278db6b9 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2398903bc89..669306e8ccc 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 058ed5f399e..463ba27cb2b 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d541d6e0ad1..ddcd656a833 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3e7ebcd6c48..ecc2b0239d6 100644
--- a/tests/baselines/reference/collisionSuperAndNameResolution.js
+++ b/tests/baselines/reference/collisionSuperAndNameResolution.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 49b31b9baf7..95576841cbb 100644
--- a/tests/baselines/reference/collisionSuperAndParameter.js
+++ b/tests/baselines/reference/collisionSuperAndParameter.js
@@ -71,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6713c8e3dc7..504fd6202f5 100644
--- a/tests/baselines/reference/collisionSuperAndParameter1.js
+++ b/tests/baselines/reference/collisionSuperAndParameter1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed4af66689a..f54793f152e 100644
--- a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
+++ b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 63b0c9ca0b0..7e6ae05a727 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 48c5f9875be..d98c1ef0622 100644
--- a/tests/baselines/reference/commentsInheritance.js
+++ b/tests/baselines/reference/commentsInheritance.js
@@ -159,9 +159,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1f34a4ba2da..b842ec25ed7 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
@@ -203,9 +203,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c5820aac9ab..c090c4f6eaf 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
@@ -177,9 +177,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 95fb1535ef3..c175ecaf712 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
@@ -177,9 +177,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bc5d5fffcdd..b535c4b4976 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
@@ -120,9 +120,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 654ec54a782..425c76f36f3 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
@@ -158,9 +158,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a0267f10229..74fef3246a6 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
@@ -158,9 +158,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 36a8fc96d84..a04612c8250 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
@@ -268,9 +268,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a51047a2904..1aa1f9c2ca4 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
@@ -230,9 +230,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7facdf34b27..f533db30b72 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
@@ -116,9 +116,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6326646f02d..12443bc7fd0 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
@@ -173,9 +173,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3a0d730ae6..4ee3c8b58ca 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
@@ -173,9 +173,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cec08c5ac47..f5510544422 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
@@ -87,9 +87,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b95142e2c1b..83513475dce 100644
--- a/tests/baselines/reference/complexClassRelationships.js
+++ b/tests/baselines/reference/complexClassRelationships.js
@@ -56,9 +56,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fff7d089798..b10228647f0 100644
--- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
+++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92dbd05ee78..3758f1c6605 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
@@ -131,9 +131,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d9fa2ce9a30..d32ed669fd6 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
@@ -94,9 +94,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e2f3a414716..cf19bbcc892 100644
--- a/tests/baselines/reference/computedPropertyNames24_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames24_ES5.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa02344de45..c85aeb8354b 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 048f85fa1de..307c8bd1f9f 100644
--- a/tests/baselines/reference/computedPropertyNames26_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames26_ES5.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f21ed47c6dc..2a9e3e0c5e1 100644
--- a/tests/baselines/reference/computedPropertyNames27_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames27_ES5.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 28fa01c7293..d0117dd6cd9 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 698c0483498..b0c5d636059 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c3f81fd59f5..e08f130ae19 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 217b6ee5898..8482c49c368 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f4556e594c..fa4ade01dd0 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2d362a321bb..afe310df031 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 564a5fc9ccc..e43369a86cf 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
@@ -56,9 +56,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7f919df1dd..45e4782c1c8 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90d6d34c545..d89d1a9d8a4 100644
--- a/tests/baselines/reference/constantOverloadFunction.js
+++ b/tests/baselines/reference/constantOverloadFunction.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fff4f8402c8..e43b9a11c1b 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3331c5009b..9a8b227934c 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 51057da5d50..4fa6ed30d6f 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ea051f36b58..11a9ababd25 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
@@ -122,9 +122,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ceb28ef993e..ddbd0819229 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b6f817c795b..ac6dca30ac5 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 becb659f7c0..15ec6643826 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7d23d6d79ee..f88735b52df 100644
--- a/tests/baselines/reference/constructorArgs.js
+++ b/tests/baselines/reference/constructorArgs.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 27b6d3c28f8..92d8570ab0c 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fec56a77170..210aec197a1 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9951397b09e..27d65afe6cd 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.js
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 05a842a2c23..bdf63756cd1 100644
--- a/tests/baselines/reference/constructorOverloads2.js
+++ b/tests/baselines/reference/constructorOverloads2.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c41d9b2f4ce..c460c94441b 100644
--- a/tests/baselines/reference/constructorOverloads3.js
+++ b/tests/baselines/reference/constructorOverloads3.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4a744035945..be8397ca335 100644
--- a/tests/baselines/reference/constructorWithCapturedSuper.js
+++ b/tests/baselines/reference/constructorWithCapturedSuper.js
@@ -61,9 +61,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c58d19843e2..b31a5475d06 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -288,9 +288,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fbe58ad0e51..ea5d8935047 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e74122b9210..453546633af 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3246f8abf3..24cdda6244d 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 30b2175316b..81450e940b7 100644
--- a/tests/baselines/reference/controlFlowSuperPropertyAccess.js
+++ b/tests/baselines/reference/controlFlowSuperPropertyAccess.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d8e8abe81c9..a6f2c3ac965 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d27b6643840..bbb05a73617 100644
--- a/tests/baselines/reference/declFileClassExtendsNull.js
+++ b/tests/baselines/reference/declFileClassExtendsNull.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bc6ee7e27c0..d753b63edaf 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 672c5f64d32..4e8414cb0fa 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6b3a7d626a..7b5fcee16f3 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e533c31005d..e1382305498 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 43c47781845..2b8dd1c9fa2 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 424e2dcfe7d..88ae8010ff5 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ad5d0f9d4a..4b44b4c0233 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 91121fdcaa8..c00eb2ce84a 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends2.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 037ad6cf347..b156e9bd3d6 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0db8521a858..2ee00dd0033 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends4.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends4.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f89052b5112..21201fb108c 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends5.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7fd1e0c0848..63de3e68739 100644
--- a/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
+++ b/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 328209def1e..18f1017225c 100644
--- a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
+++ b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e8f97f7bd15..c90c8aa43c7 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts3.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts3.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 818b35bda85..067bac4cb8e 100644
--- a/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
+++ b/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a378890ec38..6fd8766bf1d 100644
--- a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
+++ b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84b9bbbc239..52d35b3474b 100644
--- a/tests/baselines/reference/declarationEmitProtectedMembers.js
+++ b/tests/baselines/reference/declarationEmitProtectedMembers.js
@@ -58,9 +58,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 170ff04db29..59199d8c0f0 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad78d445e7c..a155ffdb818 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8de69c43c16..a946b5983dd 100644
--- a/tests/baselines/reference/declarationNoDanglingGenerics.js
+++ b/tests/baselines/reference/declarationNoDanglingGenerics.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ae8a0c17d78..f75108175ba 100644
--- a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
+++ b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 35ee4e49b38..4af59a8e7e7 100644
--- a/tests/baselines/reference/declareDottedExtend.js
+++ b/tests/baselines/reference/declareDottedExtend.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 033d3d2aad3..8763c3605d1 100644
--- a/tests/baselines/reference/decoratorOnClass9.js
+++ b/tests/baselines/reference/decoratorOnClass9.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4dcb1eb9f6a..5770ba52608 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1247ed58709..10ca7fc146e 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 150b15ee0e7..485d0b90147 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor4.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad42c9e2d3e..145fa37064c 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8b6874afe31..e2fa8cbe80f 100644
--- a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
+++ b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -64,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f1ddf5b6786..c0fd3589312 100644
--- a/tests/baselines/reference/defineProperty(target=es5).js
+++ b/tests/baselines/reference/defineProperty(target=es5).js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90ee8409287..e02ce21e2a2 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b4a27645c4d..1d716082b78 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 a0834cd6035..c3ea5a23298 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -28,7 +27,7 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function C(value) {
 1->^^^^
@@ -43,9 +42,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               value: number
-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)
+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)
 ---
 >>>        this.cProp = 10;
 1->^^^^^^^^
@@ -58,11 +57,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 3 >                   = 
 4 >                     10
 5 >                       ;
-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)
+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)
 ---
 >>>        return {
 1 >^^^^^^^^
@@ -75,8 +74,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    constructor(value: number) {
   >        
 2 >        return 
-1 >Emitted(20, 9) Source(7, 9) + SourceIndex(0)
-2 >Emitted(20, 16) Source(7, 16) + SourceIndex(0)
+1 >Emitted(19, 9) Source(7, 9) + SourceIndex(0)
+2 >Emitted(19, 16) Source(7, 16) + SourceIndex(0)
 ---
 >>>            cProp: value,
 1->^^^^^^^^^^^^
@@ -89,10 +88,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            cProp
 3 >                 : 
 4 >                   value
-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)
+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)
 ---
 >>>            foo: function () {
 1->^^^^^^^^^^^^
@@ -101,8 +100,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->,
   >            
 2 >            foo
-1->Emitted(22, 13) Source(9, 13) + SourceIndex(0)
-2 >Emitted(22, 16) Source(9, 16) + SourceIndex(0)
+1->Emitted(21, 13) Source(9, 13) + SourceIndex(0)
+2 >Emitted(21, 16) Source(9, 16) + SourceIndex(0)
 ---
 >>>                return "well this looks kinda C-ish.";
 1->^^^^^^^^^^^^^^^^
@@ -114,10 +113,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                return 
 3 >                       "well this looks kinda C-ish."
 4 >                                                     ;
-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->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 >^^^^^^^^^^^^
@@ -125,8 +124,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            }
-1 >Emitted(24, 13) Source(11, 13) + SourceIndex(0)
-2 >Emitted(24, 14) Source(11, 14) + SourceIndex(0)
+1 >Emitted(23, 13) Source(11, 13) + SourceIndex(0)
+2 >Emitted(23, 14) Source(11, 14) + SourceIndex(0)
 ---
 >>>        };
 1 >^^^^^^^^^
@@ -134,8 +133,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >        }
 2 >         
-1 >Emitted(25, 10) Source(12, 10) + SourceIndex(0)
-2 >Emitted(25, 11) Source(12, 10) + SourceIndex(0)
+1 >Emitted(24, 10) Source(12, 10) + SourceIndex(0)
+2 >Emitted(24, 11) Source(12, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -144,8 +143,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(26, 5) Source(13, 5) + SourceIndex(0)
-2 >Emitted(26, 6) Source(13, 6) + SourceIndex(0)
+1 >Emitted(25, 5) Source(13, 5) + SourceIndex(0)
+2 >Emitted(25, 6) Source(13, 6) + SourceIndex(0)
 ---
 >>>    C.prototype.foo = function () { return "this never gets used."; };
 1->^^^^
@@ -166,15 +165,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                                  ;
 8 >                                                                    
 9 >                                                                    }
-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)
+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)
 ---
 >>>    return C;
 1 >^^^^
@@ -191,8 +190,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    }
   >
 2 >    }
-1 >Emitted(28, 5) Source(14, 1) + SourceIndex(0)
-2 >Emitted(28, 13) Source(14, 2) + SourceIndex(0)
+1 >Emitted(27, 5) Source(14, 1) + SourceIndex(0)
+2 >Emitted(27, 13) Source(14, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -217,10 +216,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >         }
   >     }
   > }
-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)
+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)
 ---
 >>>var D = /** @class */ (function (_super) {
 1->
@@ -228,15 +227,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
   >
-1->Emitted(30, 1) Source(16, 1) + SourceIndex(0)
+1->Emitted(29, 1) Source(16, 1) + SourceIndex(0)
 ---
 >>>    __extends(D, _super);
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^
 1->class D extends 
 2 >    C
-1->Emitted(31, 5) Source(16, 17) + SourceIndex(0)
-2 >Emitted(31, 26) Source(16, 18) + SourceIndex(0)
+1->Emitted(30, 5) Source(16, 17) + SourceIndex(0)
+2 >Emitted(30, 26) Source(16, 18) + SourceIndex(0)
 ---
 >>>    function D(a) {
 1 >^^^^
@@ -249,9 +248,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               a = 100
-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)
+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)
 ---
 >>>        if (a === void 0) { a = 100; }
 1->^^^^^^^^
@@ -263,10 +262,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >        
 3 >                          
 4 >                            a = 100
-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)
+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)
 ---
 >>>        var _this = _super.call(this, a) || this;
 1->^^^^^^^^
@@ -295,12 +294,12 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >                                                else
   >                                                    return null;
   >                                            }
-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)
+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)
 ---
 >>>        _this.dProp = function () { return _this; };
 1->^^^^^^^^
@@ -321,15 +320,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                
 8 >                                                  this
 9 >                                                   ;
-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)
+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)
 ---
 >>>        if (Math.random() < 0.5) {
 1 >^^^^^^^^
@@ -355,15 +354,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                          < 
 8 >                            0.5
 9 >                               ) 
-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)
+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)
 ---
 >>>            "You win!";
 1 >^^^^^^^^^^^^
@@ -373,9 +372,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >            
 2 >            "You win!"
 3 >                      
-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)
+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)
 ---
 >>>            return {
 1 >^^^^^^^^^^^^
@@ -384,8 +383,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            return 
-1 >Emitted(38, 13) Source(24, 13) + SourceIndex(0)
-2 >Emitted(38, 20) Source(24, 20) + SourceIndex(0)
+1 >Emitted(37, 13) Source(24, 13) + SourceIndex(0)
+2 >Emitted(37, 20) Source(24, 20) + SourceIndex(0)
 ---
 >>>                cProp: 1,
 1->^^^^^^^^^^^^^^^^
@@ -398,10 +397,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                cProp
 3 >                     : 
 4 >                       1
-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)
+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)
 ---
 >>>                dProp: function () { return _this; },
 1->^^^^^^^^^^^^^^^^
@@ -422,14 +421,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                            this
 7 >                                                 
 8 >                                                   this
-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)
+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)
 ---
 >>>                foo: function () { return "You win!!!!!"; }
 1->^^^^^^^^^^^^^^^^
@@ -449,14 +448,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                                        
 7 >                                                          
 8 >                                                          }
-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->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 >^^^^^^^^^^^^^
@@ -464,15 +463,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            }
 2 >             ;
-1 >Emitted(42, 14) Source(28, 14) + SourceIndex(0)
-2 >Emitted(42, 15) Source(28, 15) + SourceIndex(0)
+1 >Emitted(41, 14) Source(28, 14) + SourceIndex(0)
+2 >Emitted(41, 15) Source(28, 15) + SourceIndex(0)
 ---
 >>>        }
 1 >^^^^^^^^^
 2 >         ^^^^->
 1 >
   >        }
-1 >Emitted(43, 10) Source(29, 10) + SourceIndex(0)
+1 >Emitted(42, 10) Source(29, 10) + SourceIndex(0)
 ---
 >>>        else
 >>>            return null;
@@ -486,10 +485,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            return 
 3 >                   null
 4 >                       ;
-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->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 >^^^^
@@ -498,8 +497,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(46, 5) Source(32, 5) + SourceIndex(0)
-2 >Emitted(46, 6) Source(32, 6) + SourceIndex(0)
+1 >Emitted(45, 5) Source(32, 5) + SourceIndex(0)
+2 >Emitted(45, 6) Source(32, 6) + SourceIndex(0)
 ---
 >>>    return D;
 1->^^^^
@@ -507,8 +506,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
 2 >    }
-1->Emitted(47, 5) Source(33, 1) + SourceIndex(0)
-2 >Emitted(47, 13) Source(33, 2) + SourceIndex(0)
+1->Emitted(46, 5) Source(33, 1) + SourceIndex(0)
+2 >Emitted(46, 13) Source(33, 2) + SourceIndex(0)
 ---
 >>>}(C));
 1 >
@@ -541,11 +540,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >               return null;
   >       }
   >   }
-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)
+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)
 ---
 >>>//# 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 0442aaf8911..a2e5ea9af03 100644
--- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
+++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8394b689589..bf7d6631025 100644
--- a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
+++ b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79922c29bbb..76efe551df5 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2dc09fab050..35107d1da2c 100644
--- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
+++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d098bbdb490..5378e342fd4 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bfdd788f4de..a080cbacce2 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivates.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivates.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9db50fe9ac..62b14797332 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8874eb394d0..a2b271f82ff 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
@@ -72,9 +72,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aee578cbc60..fed9b4cf03d 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f7f18d97f4d..9562bd9edc2 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1595028eab3..02a2be56a5d 100644
--- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
@@ -71,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b65ee3a90e6..2964dfd637b 100644
--- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
+++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 46aecf42832..7be320920c2 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.js
+++ b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -104,9 +104,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 38a49bdb3fe..df42d2c22b4 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 34c814e023a..b2758596e01 100644
--- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
+++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b706a3a395..cb585761429 100644
--- a/tests/baselines/reference/derivedClassTransitivity.js
+++ b/tests/baselines/reference/derivedClassTransitivity.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f2da0b4b077..84c0bd24ee0 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.js
+++ b/tests/baselines/reference/derivedClassTransitivity2.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e7eee5b13d..24512be746e 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.js
+++ b/tests/baselines/reference/derivedClassTransitivity3.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 504db3a6197..9ce924abfa4 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.js
+++ b/tests/baselines/reference/derivedClassTransitivity4.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08bbf88c1cd..eee9fc871c1 100644
--- a/tests/baselines/reference/derivedClassWithAny.js
+++ b/tests/baselines/reference/derivedClassWithAny.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 28fa8c1ac35..03cf53e5ee5 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d17bed39ec0..6b70dd68b00 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 255623d51c4..59434074d67 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fd0a171d499..1609efab14f 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c014ac9eb73..53750feade6 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 26c593bd39b..ca329e46504 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e037862cbb4..88d6856e214 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
@@ -56,9 +56,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dd683cb066b..b416a4f4980 100644
--- a/tests/baselines/reference/derivedClasses.js
+++ b/tests/baselines/reference/derivedClasses.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c8d57a9f13a..c0cc36e4ad5 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.js
+++ b/tests/baselines/reference/derivedGenericClassWithAny.js
@@ -51,9 +51,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad17cf35af8..f59f10f4612 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8fc7af93c9c..a8347b040f6 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3967c88377..384abc71306 100644
--- a/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
+++ b/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
@@ -92,9 +92,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6fa2fb6666e..80243d163c5 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cf7aa47ef55..ee9655f3709 100644
--- a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
+++ b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d44fe6c6c6f..a6d020138d9 100644
--- a/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 444833aa7ab..36060ceb523 100644
--- a/tests/baselines/reference/emitBundleWithShebang1.js
+++ b/tests/baselines/reference/emitBundleWithShebang1.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c2808ec4217..11403472ef9 100644
--- a/tests/baselines/reference/emitBundleWithShebang2.js
+++ b/tests/baselines/reference/emitBundleWithShebang2.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d423664c32c..0811d4f1bf2 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f092a6bc426..53d1ee88480 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0b4df59fb1f..0f6b043b2c2 100644
--- a/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
+++ b/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 61c823d57fc..b40dce9e199 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 12e5b71a113..89dddd7bfec 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3d3d5431c05..03149434bd2 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 47581e1937d..da2daf8dcb2 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f31339e38af..54ebb7d8580 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e91b339e6d3..bb2fa76fc0c 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 05ac3119e17..790cd930e6b 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -579,9 +579,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9823bfaa55..e74d04a633e 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9edd01767fb..031a88dbb87 100644
--- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
+++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8610f95e0a8..2b8177adb6a 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -83,9 +83,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a33ff30d328..e609f86ca7c 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.js
+++ b/tests/baselines/reference/errorSuperPropertyAccess.js
@@ -137,9 +137,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 002bb48ded6..ea1ec3d125e 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.js
+++ b/tests/baselines/reference/errorsInGenericTypeReference.js
@@ -80,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f5a6bfc1d4d..f4d31aa1391 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.js
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2114d5b6f66..e14a73e6926 100644
--- a/tests/baselines/reference/es6ClassTest.js
+++ b/tests/baselines/reference/es6ClassTest.js
@@ -93,9 +93,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 82bdeec82ae..6e90fcbfedd 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -167,9 +167,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa9d38908a0..1932f6f2de6 100644
--- a/tests/baselines/reference/es6ClassTest7.js
+++ b/tests/baselines/reference/es6ClassTest7.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c93f9f6bcba..0256aa3baae 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a610a625d3d..8b795bc1ea6 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.js
+++ b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -85,9 +84,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b35a297f9ae..6cb95e2795b 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 de04b0eee54..b01d17c97df 100644
--- a/tests/baselines/reference/exportDefaultAbstractClass.js
+++ b/tests/baselines/reference/exportDefaultAbstractClass.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -55,9 +54,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2a131e2ac04..f80d7f4deaa 100644
--- a/tests/baselines/reference/extBaseClass1.js
+++ b/tests/baselines/reference/extBaseClass1.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 87ce7bc8778..7dc1ca88ab5 100644
--- a/tests/baselines/reference/extBaseClass2.js
+++ b/tests/baselines/reference/extBaseClass2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67c63726580..7676baef571 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c0bba1d8980..63f4aea8fe7 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 14f79f4a0f7..94d61954405 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 99d8156784b..e8bd0ecaffa 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2881f233649..4d3cc5053be 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.js
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 96559b8bf23..e2ee1bca709 100644
--- a/tests/baselines/reference/extendFromAny.js
+++ b/tests/baselines/reference/extendFromAny.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 80118ec8d08..b310e48685d 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.js
+++ b/tests/baselines/reference/extendNonClassSymbol1.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 de1f20636a9..82bfe35d586 100644
--- a/tests/baselines/reference/extendNonClassSymbol2.js
+++ b/tests/baselines/reference/extendNonClassSymbol2.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 86126a9c3e2..678e85d270a 100644
--- a/tests/baselines/reference/extendPrivateConstructorClass.js
+++ b/tests/baselines/reference/extendPrivateConstructorClass.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3126b860342..d431051fe6d 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -81,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5a3ff7e44f2..d7da659f1b2 100644
--- a/tests/baselines/reference/extendsClause.js
+++ b/tests/baselines/reference/extendsClause.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3a0fe12fe6a..e7bc3cf0930 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 da112e48983..260bb6d4bd5 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen2.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5284a2e9a74..ea378ae1298 100644
--- a/tests/baselines/reference/extendsUntypedModule.js
+++ b/tests/baselines/reference/extendsUntypedModule.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 859ad1a3975..2e36ae9dace 100644
--- a/tests/baselines/reference/fluentClasses.js
+++ b/tests/baselines/reference/fluentClasses.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 093eaad8b40..55c87503639 100644
--- a/tests/baselines/reference/for-inStatements.js
+++ b/tests/baselines/reference/for-inStatements.js
@@ -89,9 +89,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bdde889ee8c..0a863286b59 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.js
+++ b/tests/baselines/reference/for-inStatementsInvalid.js
@@ -72,9 +72,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 71b35c8cced..8c492ad4b73 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f516cbd55b..5be7467c7b5 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -82,9 +82,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b116bc2fa6..dba72fff13a 100644
--- a/tests/baselines/reference/functionImplementations.js
+++ b/tests/baselines/reference/functionImplementations.js
@@ -165,9 +165,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 decf4f4eaa9..1e7b5d0a79b 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 920cae18c83..53b66ff6a84 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 acb1b0f320f..28c292c318d 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -363,9 +363,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fce1e33177e..f198c9c7f00 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a66374608a5..3f62dde8cce 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 23f2f4b0410..b4433d63bfb 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
@@ -117,9 +117,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d5a36344ea6..4bb0e685a43 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d0e74ec1bff..3d23afda8ae 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3b0256a25c8..95c6011e5cf 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fab42865555..9cde80d5ee3 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 54861fd3fbf..0b9514867c2 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.js
+++ b/tests/baselines/reference/genericClassExpressionInFunction.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90a0c0098b9..abe892cda53 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 247e88490a0..bc5e1371ee8 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
@@ -84,9 +84,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 65c7603d5f8..47707cd8b94 100644
--- a/tests/baselines/reference/genericClassStaticMethod.js
+++ b/tests/baselines/reference/genericClassStaticMethod.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e70b7d84721..d97630ae1b9 100644
--- a/tests/baselines/reference/genericClasses3.js
+++ b/tests/baselines/reference/genericClasses3.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8412efa8091..6d504ce0fe0 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 96af28b411e..7506bbc2d1f 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 59fb2d8ccc0..5fccd8e717b 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42c00f9f8bb..7408a8ff174 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f643bd1524f..a3449eee10b 100644
--- a/tests/baselines/reference/genericInheritedDefaultConstructors.js
+++ b/tests/baselines/reference/genericInheritedDefaultConstructors.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3b61fe8299d..284d6e2b97e 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.js
+++ b/tests/baselines/reference/genericPrototypeProperty2.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 998459333fc..282d4c372d8 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.js
+++ b/tests/baselines/reference/genericPrototypeProperty3.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bba2d444601..a71a3c8093c 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b5a2e0a6588..7e9a8352241 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f29478f932a..85fd402a02d 100644
--- a/tests/baselines/reference/genericTypeAssertions2.js
+++ b/tests/baselines/reference/genericTypeAssertions2.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e1f0dcea28..2c7a0726c3b 100644
--- a/tests/baselines/reference/genericTypeAssertions4.js
+++ b/tests/baselines/reference/genericTypeAssertions4.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9b25616295..fb4b3afd4cd 100644
--- a/tests/baselines/reference/genericTypeAssertions6.js
+++ b/tests/baselines/reference/genericTypeAssertions6.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 926506cb276..4b1d266a25d 100644
--- a/tests/baselines/reference/genericTypeConstraints.js
+++ b/tests/baselines/reference/genericTypeConstraints.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8b7d96f7406..baa7793c96d 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 05ce07def37..ef29c54d9d6 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 09a8b085be6..33645d6bca7 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a9a265b1668..f63bc5e06a2 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.js
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.js
@@ -141,9 +141,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e024b6ae5f..9ad9ab10729 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -171,9 +171,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8fb94fe80e8..5663a2e0100 100644
--- a/tests/baselines/reference/illegalSuperCallsInConstructor.js
+++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3e92f279c5..5ed50f28165 100644
--- a/tests/baselines/reference/implementClausePrecedingExtends.js
+++ b/tests/baselines/reference/implementClausePrecedingExtends.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b51171c9276..34272a0a6b1 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
@@ -94,9 +94,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c2da946bc0a..7fb2a31ff55 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3986c4477c5..67aedaf329c 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f2cabab68f..d37bd230082 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -95,9 +95,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eda722c3b39..e2713dd725a 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -89,9 +89,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 29fe586b316..3fb4dabb286 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c6e650d3245..7bf6c1b10b6 100644
--- a/tests/baselines/reference/importNotElidedWhenNotFound.js
+++ b/tests/baselines/reference/importNotElidedWhenNotFound.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 39fdf2fb183..3e333a8fbc7 100644
--- a/tests/baselines/reference/importShadowsGlobalName.js
+++ b/tests/baselines/reference/importShadowsGlobalName.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3ed00c7b1f..1bcc14be47d 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 24dde4f12e7..1c857e3c376 100644
--- a/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
+++ b/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5224aa9da28..3cb1680c255 100644
--- a/tests/baselines/reference/indexedAccessRelation.js
+++ b/tests/baselines/reference/indexedAccessRelation.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cfa47c66a60..f15c3a68f4c 100644
--- a/tests/baselines/reference/indexedAccessTypeConstraints.js
+++ b/tests/baselines/reference/indexedAccessTypeConstraints.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a3553eb1f1d..d27bb46ad9a 100644
--- a/tests/baselines/reference/indexerConstraints2.js
+++ b/tests/baselines/reference/indexerConstraints2.js
@@ -90,9 +90,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e559acbfe2..6c8f2ea35a2 100644
--- a/tests/baselines/reference/indirectSelfReference.js
+++ b/tests/baselines/reference/indirectSelfReference.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4e1d7a3247c..641febf9b10 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.js
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79b052f3ab9..3aaa275514d 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d3e2fab9ef..a787b81d89c 100644
--- a/tests/baselines/reference/inheritFromGenericTypeParameter.js
+++ b/tests/baselines/reference/inheritFromGenericTypeParameter.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4167db52554..32612069ea1 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 12069905f8b..a800eef15d6 100644
--- a/tests/baselines/reference/inheritance.js
+++ b/tests/baselines/reference/inheritance.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb8593451bf..79a9fefda90 100644
--- a/tests/baselines/reference/inheritance1.js
+++ b/tests/baselines/reference/inheritance1.js
@@ -70,9 +70,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a3b4c4f4bee..0bcd4b06d5b 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6e3aeeda6b..b8dba0bbc24 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aceab2377b5..3bc790a261c 100644
--- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 570e6811867..1f2ae5b2719 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0b5df5bcea0..257ee1b008d 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 21cef954352..2143a8327ee 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 731011b3374..e1742022d15 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 25f523fc639..5a7694ab8a1 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42aad59f3b3..2ccac56d603 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f762a338b5d..987b4561a20 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfda6dbc0f9..098ec8d5f59 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5b15a34c41c..c5d84fd6a60 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ef745a281aa..3e0b748005b 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2a5694f0f9..970556f0662 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f35d95365a7..308e05dde03 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 015f571e4a6..70fbb6ff8f3 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed4f33fcdb5..4d0f4f4c747 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7e57d9fd510..298fe5a9bf8 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cf7102ddbc6..5a96756a7fe 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6ac475f5f06..4fdd17b5905 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 21303e8e5a0..c8f912ac9b9 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8016a044a05..58830a5885b 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6f287a65ea3..9cbc37464f5 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d21d81f3efb..c86db6899c7 100644
--- a/tests/baselines/reference/inheritanceStaticMembersCompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ca14c995ae1..bed2bdd984f 100644
--- a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 54ba35af2e4..a5e65c9ccc6 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68d2b9334e0..2c58bbf1567 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f4c16b35e70..6d577ed7dfa 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 928e1845a2c..393c2059c5c 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1560f85c825..5c1ee2dfb46 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e06d1c67f1..3cda816969d 100644
--- a/tests/baselines/reference/inheritedModuleMembersForClodule.js
+++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a5a33e22457..ab9565f2c39 100644
--- a/tests/baselines/reference/instanceOfAssignability.js
+++ b/tests/baselines/reference/instanceOfAssignability.js
@@ -98,9 +98,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bfa315e0059..109ccf8f8b8 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
@@ -51,9 +51,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b19479a46b3..99304e5ef27 100644
--- a/tests/baselines/reference/instanceSubtypeCheck2.js
+++ b/tests/baselines/reference/instanceSubtypeCheck2.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 66875077615..3ecda3001f9 100644
--- a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
@@ -80,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 71664cfe99e..5a3a88c181a 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.js
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 37fdaecaf88..bac4b82fc60 100644
--- a/tests/baselines/reference/interfaceClassMerging.js
+++ b/tests/baselines/reference/interfaceClassMerging.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c8f2791736c..738c2410347 100644
--- a/tests/baselines/reference/interfaceClassMerging2.js
+++ b/tests/baselines/reference/interfaceClassMerging2.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 284f98f966a..7dd969426aa 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.js
+++ b/tests/baselines/reference/interfaceExtendsClass1.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 01b312cdee9..15e09b94edd 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 924ba1d609d..15d63ab80e4 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92f5f6a24a0..3be49fbf1ec 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersection.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersection.js
@@ -63,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8b0ed42431d..bbed54436c6 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
@@ -57,9 +57,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 39685c25879..979526b4e13 100644
--- a/tests/baselines/reference/interfaceImplementation8.js
+++ b/tests/baselines/reference/interfaceImplementation8.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1309e467e92..ff1e8d44224 100644
--- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
@@ -88,9 +88,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 23b4f19d74c..a06b6c362b7 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 236612cc444..b1dcfaebf9f 100644
--- a/tests/baselines/reference/invalidReturnStatements.js
+++ b/tests/baselines/reference/invalidReturnStatements.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dcd0494edba..23169b3e784 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8ed5331e2e2..2a071228568 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfb3551fe0c..941cada6a10 100644
--- a/tests/baselines/reference/jsDeclarationsClasses.js
+++ b/tests/baselines/reference/jsDeclarationsClasses.js
@@ -204,9 +204,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9fa59e40433..b9174f3a708 100644
--- a/tests/baselines/reference/jsDeclarationsClassesErr.js
+++ b/tests/baselines/reference/jsDeclarationsClassesErr.js
@@ -82,9 +82,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a29d40099cc..d150cbe494f 100644
--- a/tests/baselines/reference/jsDeclarationsDefault.js
+++ b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -77,9 +77,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 14769f07fc3..2e76c79d4c5 100644
--- a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
+++ b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94269ff3774..25493c7dd5c 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.js
+++ b/tests/baselines/reference/jsdocTypeTagCast.js
@@ -87,9 +87,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 11fd8c72359..147df84c5a6 100644
--- a/tests/baselines/reference/jsxCallbackWithDestructuring.js
+++ b/tests/baselines/reference/jsxCallbackWithDestructuring.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e602b8e949e..0a0201b8f65 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d921994e725..48369668d83 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a2ef9bf3796..6527faf3efb 100644
--- a/tests/baselines/reference/jsxInExtendsClause.js
+++ b/tests/baselines/reference/jsxInExtendsClause.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 233d8b8d1fc..a731d60ec21 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 56204c64e9b..46511fed379 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 166f21a9979..4d367e0ab5c 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -667,9 +667,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e6ce8d50c11..bdce4736f1d 100644
--- a/tests/baselines/reference/lambdaArgCrash.js
+++ b/tests/baselines/reference/lambdaArgCrash.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5db64b3e5e3..ab7051e4eda 100644
--- a/tests/baselines/reference/lift.js
+++ b/tests/baselines/reference/lift.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 18eaf3f1b37..11d1a103c5a 100644
--- a/tests/baselines/reference/localTypes1.js
+++ b/tests/baselines/reference/localTypes1.js
@@ -149,9 +149,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c832bf0bb45..fd782b78685 100644
--- a/tests/baselines/reference/m7Bugs.js
+++ b/tests/baselines/reference/m7Bugs.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f1070604bbd..969aba75845 100644
--- a/tests/baselines/reference/mappedTypePartialConstraints.js
+++ b/tests/baselines/reference/mappedTypePartialConstraints.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 71e0ab2df52..8f9eb7f0e73 100644
--- a/tests/baselines/reference/mergedDeclarations5.js
+++ b/tests/baselines/reference/mergedDeclarations5.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e097a6868a..95d282c2747 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1e5964c78e9..40b99342a4c 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.js
+++ b/tests/baselines/reference/mergedInheritedClassInterface.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1f9f1aac057..e24d6580c97 100644
--- a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e44c6441f8..f2b7dd8c601 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 149e0ca3437..e11cfef736c 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6977750e44e..6aa9dc86f9d 100644
--- a/tests/baselines/reference/missingPropertiesOfClassExpression.js
+++ b/tests/baselines/reference/missingPropertiesOfClassExpression.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 40bf6cb94c1..fdc8d53f033 100644
--- a/tests/baselines/reference/mixinAccessModifiers.js
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -141,9 +141,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3c16804410..9c261a62609 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.js
+++ b/tests/baselines/reference/mixinClassesAnnotated.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 426ee329a73..857aaabdaee 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.js
+++ b/tests/baselines/reference/mixinClassesAnonymous.js
@@ -74,9 +74,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 59e94b72b08..71ac2995974 100644
--- a/tests/baselines/reference/mixinClassesMembers.js
+++ b/tests/baselines/reference/mixinClassesMembers.js
@@ -107,9 +107,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e1caf9bf307..cf90daa2032 100644
--- a/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
+++ b/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b1b2804d2e..4b92804a6b0 100644
--- a/tests/baselines/reference/mixinPrivateAndProtected.js
+++ b/tests/baselines/reference/mixinPrivateAndProtected.js
@@ -99,9 +99,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2be97b8e1be..8de21e81ef8 100644
--- a/tests/baselines/reference/mixingApparentTypeOverrides.js
+++ b/tests/baselines/reference/mixingApparentTypeOverrides.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 800feed7f02..2be75e871c4 100644
--- a/tests/baselines/reference/moduleAsBaseType.js
+++ b/tests/baselines/reference/moduleAsBaseType.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 948febd9a17..7be97e8aaf8 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0dd2426f2d6..b60b12c1935 100644
--- a/tests/baselines/reference/moduleNoneOutFile.js
+++ b/tests/baselines/reference/moduleNoneOutFile.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d9a300e4814..941dacde74c 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
@@ -67,9 +67,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 50a22cd1d0d..62252ccce3e 100644
--- a/tests/baselines/reference/multipleInheritance.js
+++ b/tests/baselines/reference/multipleInheritance.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2fc06167b66..de39da0095f 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 073f0346887..e6a5aa12c34 100644
--- a/tests/baselines/reference/mutuallyRecursiveInference.js
+++ b/tests/baselines/reference/mutuallyRecursiveInference.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 77a0e12869b..d2bf3095ff0 100644
--- a/tests/baselines/reference/narrowingOfDottedNames.js
+++ b/tests/baselines/reference/narrowingOfDottedNames.js
@@ -102,9 +102,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c7f34b2afe0..24d0894fbb7 100644
--- a/tests/baselines/reference/neverReturningFunctions1.js
+++ b/tests/baselines/reference/neverReturningFunctions1.js
@@ -259,9 +259,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 98e99c275e3..ac8acff7160 100644
--- a/tests/baselines/reference/newTarget.es5.js
+++ b/tests/baselines/reference/newTarget.es5.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b09a5fff4ea..a2f88424ac1 100644
--- a/tests/baselines/reference/noCrashOnMixin.js
+++ b/tests/baselines/reference/noCrashOnMixin.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 31fe2ba0746..627ac477399 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 04f290c4dc3..0b38f44d2f9 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f58f22d8cab..f7b4231c21b 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bddf70e93c2..a88f4d95d07 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cf6a801e0ca..afa676fa4f5 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.js
+++ b/tests/baselines/reference/numericIndexerConstraint3.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1327d749ed2..f9a8c67592e 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.js
+++ b/tests/baselines/reference/numericIndexerConstraint4.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d53219bee57..1cdcb546780 100644
--- a/tests/baselines/reference/numericIndexerTyping2.js
+++ b/tests/baselines/reference/numericIndexerTyping2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ae688652efd..d6eb469b401 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.js
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
@@ -64,9 +64,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ec9743c369b..f53155c2fda 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
@@ -63,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ada58bded67..1d2029f7608 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
@@ -132,9 +132,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6462cc88cd4..bf650038c10 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
@@ -135,9 +135,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 75e272e63a5..fba7be17950 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
@@ -132,9 +132,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9bf759ee3bf..a458eeb39c4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
@@ -130,9 +130,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3ea79327af2..479b825a96d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f36622caf79..25873414546 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d900e81e504..5c04d4cfdb2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
@@ -132,9 +132,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 268eed44ce2..25633839757 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
@@ -135,9 +135,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c88f02effb7..805d37f27c7 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.js
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e8e12f1b6e..be011e9d370 100644
--- a/tests/baselines/reference/optionalMethods.js
+++ b/tests/baselines/reference/optionalMethods.js
@@ -65,9 +65,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4778adaf18f..6ee8826b1f6 100644
--- a/tests/baselines/reference/optionalParamArgsTest.js
+++ b/tests/baselines/reference/optionalParamArgsTest.js
@@ -133,9 +133,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df56d1fc907..0dd95dacd6d 100644
--- a/tests/baselines/reference/optionalParamInOverride.js
+++ b/tests/baselines/reference/optionalParamInOverride.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad83510bc04..22b0c8f03d4 100644
--- a/tests/baselines/reference/optionalParameterProperty.js
+++ b/tests/baselines/reference/optionalParameterProperty.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0eebf4ec01a..3b360884eed 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1cd86072193..88329b5db3b 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 6861c54ac13..a4beef4d9fc 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -32,13 +31,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(21, 5) Source(1, 1) + SourceIndex(0)
+1 >Emitted(20, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(22, 9) Source(1, 1) + SourceIndex(0)
+1->Emitted(21, 9) Source(1, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -46,16 +45,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >         ^^^^^^^^^->
 1->export class A { 
 2 >        }
-1->Emitted(23, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(23, 10) Source(1, 19) + SourceIndex(0)
+1->Emitted(22, 9) Source(1, 18) + SourceIndex(0)
+2 >Emitted(22, 10) Source(1, 19) + SourceIndex(0)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(24, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(24, 17) Source(1, 19) + SourceIndex(0)
+1->Emitted(23, 9) Source(1, 18) + SourceIndex(0)
+2 >Emitted(23, 17) Source(1, 19) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
@@ -67,18 +66,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >    }
 3 >     
 4 >     export class A { }
-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)
+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)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(26, 5) Source(1, 14) + SourceIndex(0)
-2 >Emitted(26, 19) Source(1, 15) + SourceIndex(0)
+1->Emitted(25, 5) Source(1, 14) + SourceIndex(0)
+2 >Emitted(25, 19) Source(1, 15) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -94,21 +93,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(32, 5) Source(2, 1) + SourceIndex(1)
+1 >Emitted(31, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(33, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(33, 30) Source(2, 25) + SourceIndex(1)
+1->Emitted(32, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(32, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(34, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(33, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -117,16 +116,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(36, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(36, 10) Source(2, 29) + SourceIndex(1)
+1->Emitted(35, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(35, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(37, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(37, 17) Source(2, 29) + SourceIndex(1)
+1->Emitted(36, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(36, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -142,20 +141,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-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)
+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)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(39, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(39, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(38, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(38, 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 daf40adfdb5..1f721e4359a 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eeed28a88a3..a7a906b7a25 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 d77bf0e86a0..050b60fa6aa 100644
--- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -35,13 +34,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(24, 13) Source(1, 1) + SourceIndex(0)
+1 >Emitted(23, 13) Source(1, 1) + SourceIndex(0)
 ---
 >>>                function A() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(25, 17) Source(1, 1) + SourceIndex(0)
+1->Emitted(24, 17) Source(1, 1) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -49,16 +48,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                 ^^^^^^^^^->
 1->export class A { 
 2 >                }
-1->Emitted(26, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(26, 18) Source(1, 19) + SourceIndex(0)
+1->Emitted(25, 17) Source(1, 18) + SourceIndex(0)
+2 >Emitted(25, 18) Source(1, 19) + SourceIndex(0)
 ---
 >>>                return A;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(27, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(27, 25) Source(1, 19) + SourceIndex(0)
+1->Emitted(26, 17) Source(1, 18) + SourceIndex(0)
+2 >Emitted(26, 25) Source(1, 19) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -70,10 +69,10 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >            }
 3 >             
 4 >             export class A { }
-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)
+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)
 ---
 >>>            exports_1("A", A);
 >>>        }
@@ -82,8 +81,8 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->
   >
 2 >        
-1->Emitted(30, 9) Source(2, 1) + SourceIndex(0)
-2 >Emitted(30, 10) Source(2, 2) + SourceIndex(0)
+1->Emitted(29, 9) Source(2, 1) + SourceIndex(0)
+2 >Emitted(29, 10) Source(2, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -107,21 +106,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(44, 13) Source(2, 1) + SourceIndex(1)
+1 >Emitted(43, 13) Source(2, 1) + SourceIndex(1)
 ---
 >>>                __extends(B, _super);
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >                A
-1->Emitted(45, 17) Source(2, 24) + SourceIndex(1)
-2 >Emitted(45, 38) Source(2, 25) + SourceIndex(1)
+1->Emitted(44, 17) Source(2, 24) + SourceIndex(1)
+2 >Emitted(44, 38) Source(2, 25) + SourceIndex(1)
 ---
 >>>                function B() {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(46, 17) Source(2, 1) + SourceIndex(1)
+1 >Emitted(45, 17) Source(2, 1) + SourceIndex(1)
 ---
 >>>                    return _super !== null && _super.apply(this, arguments) || this;
 >>>                }
@@ -130,16 +129,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >                 ^^^^^^^^^->
 1->export class B extends A { 
 2 >                }
-1->Emitted(48, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(48, 18) Source(2, 29) + SourceIndex(1)
+1->Emitted(47, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(47, 18) Source(2, 29) + SourceIndex(1)
 ---
 >>>                return B;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(49, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(49, 25) Source(2, 29) + SourceIndex(1)
+1->Emitted(48, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(48, 25) Source(2, 29) + SourceIndex(1)
 ---
 >>>            }(a_1.A));
 1 >^^^^^^^^^^^^
@@ -155,12 +154,12 @@ sourceFile:tests/cases/compiler/b.ts
 4 >             export class B extends 
 5 >              A
 6 >                    { }
-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)
+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)
 ---
 >>>            exports_2("B", B);
 >>>        }
@@ -168,8 +167,8 @@ sourceFile:tests/cases/compiler/b.ts
 2 >        ^
 1->
 2 >        
-1->Emitted(52, 9) Source(2, 29) + SourceIndex(1)
-2 >Emitted(52, 10) Source(2, 30) + SourceIndex(1)
+1->Emitted(51, 9) Source(2, 29) + SourceIndex(1)
+2 >Emitted(51, 10) Source(2, 30) + SourceIndex(1)
 ---
 >>>    };
 >>>});
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
index 0da2aab44c2..5d0cbd0f5b2 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b81e3221f79..664558132f4 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 f89bac38001..0475ba6eb3d 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -30,21 +29,21 @@ sourceFile:tests/cases/compiler/ref/b.ts
 3 >                                 ^^^^^^->
 1 >
 2 >/// <reference path="./c.d.ts" />
-1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(17, 34) Source(1, 34) + SourceIndex(0)
+1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(16, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var Foo = /** @class */ (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(18, 1) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 1) Source(2, 1) + SourceIndex(0)
 ---
 >>>    function Foo() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(18, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -54,16 +53,16 @@ sourceFile:tests/cases/compiler/ref/b.ts
   >	member: Bar;
   >
 2 >    }
-1->Emitted(20, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(20, 6) Source(4, 2) + SourceIndex(0)
+1->Emitted(19, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(19, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return Foo;
 1->^^^^
 2 >    ^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(21, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(21, 15) Source(4, 2) + SourceIndex(0)
+1->Emitted(20, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(20, 15) Source(4, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -77,10 +76,10 @@ sourceFile:tests/cases/compiler/ref/b.ts
 4 > class Foo {
   > 	member: Bar;
   > }
-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)
+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)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -96,21 +95,21 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                                   ^^^^^^->
 1->
 2 >    /// <reference path="./b.ts" />
-1->Emitted(27, 5) Source(1, 1) + SourceIndex(1)
-2 >Emitted(27, 36) Source(1, 32) + SourceIndex(1)
+1->Emitted(26, 5) Source(1, 1) + SourceIndex(1)
+2 >Emitted(26, 36) Source(1, 32) + SourceIndex(1)
 ---
 >>>    var A = /** @class */ (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(28, 5) Source(2, 1) + SourceIndex(1)
+1->Emitted(27, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(29, 9) Source(2, 1) + SourceIndex(1)
+1->Emitted(28, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -120,16 +119,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
   >	member: typeof GlobalFoo;
   >
 2 >        }
-1->Emitted(30, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(30, 10) Source(4, 2) + SourceIndex(1)
+1->Emitted(29, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(29, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(31, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(31, 17) Source(4, 2) + SourceIndex(1)
+1->Emitted(30, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(30, 17) Source(4, 2) + SourceIndex(1)
 ---
 >>>    }());
 1 >^^^^
@@ -143,18 +142,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >     export class A {
   >     	member: typeof GlobalFoo;
   >     }
-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)
+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)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(33, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(33, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(32, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(32, 19) Source(2, 15) + SourceIndex(1)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -170,21 +169,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(39, 5) Source(2, 1) + SourceIndex(2)
+1 >Emitted(38, 5) Source(2, 1) + SourceIndex(2)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(40, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(40, 30) Source(2, 25) + SourceIndex(2)
+1->Emitted(39, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(39, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(41, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(40, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -193,16 +192,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(43, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(43, 10) Source(2, 29) + SourceIndex(2)
+1->Emitted(42, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(42, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(44, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(44, 17) Source(2, 29) + SourceIndex(2)
+1->Emitted(43, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(43, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -218,20 +217,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-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)
+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)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(46, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(46, 19) Source(2, 15) + SourceIndex(2)
+1->Emitted(45, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(45, 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 4405bf7c8df..69f8c063453 100644
--- a/tests/baselines/reference/overload1.js
+++ b/tests/baselines/reference/overload1.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7cb2efd947c..db5019c35c9 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e12ff81fd12..34961cd5c7c 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7f413ff3e5..9e94af61b6f 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eeeb0717ff8..8e4558e0bfa 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ee2d71cf0a9..fe23d72dc21 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b8f69215ce9..3e7ec7be445 100644
--- a/tests/baselines/reference/overloadResolution.js
+++ b/tests/baselines/reference/overloadResolution.js
@@ -103,9 +103,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2193425996..f0878fbaa93 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.js
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.js
@@ -110,9 +110,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f5ad8ac1839..2d0bce82f56 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.js
+++ b/tests/baselines/reference/overloadResolutionConstructors.js
@@ -111,9 +111,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 baaeb86eb6d..a290f00402b 100644
--- a/tests/baselines/reference/overloadingOnConstants1.js
+++ b/tests/baselines/reference/overloadingOnConstants1.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5d21dd547ed..bbe734f79cd 100644
--- a/tests/baselines/reference/overloadingOnConstants2.js
+++ b/tests/baselines/reference/overloadingOnConstants2.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 697131ab8ed..fa626a6886d 100644
--- a/tests/baselines/reference/overrideBaseIntersectionMethod.js
+++ b/tests/baselines/reference/overrideBaseIntersectionMethod.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 114aa968d45..45a3e297d6f 100644
--- a/tests/baselines/reference/overridingPrivateStaticMembers.js
+++ b/tests/baselines/reference/overridingPrivateStaticMembers.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 951de322d75..709ba3cb1a5 100644
--- a/tests/baselines/reference/parseErrorInHeritageClause1.js
+++ b/tests/baselines/reference/parseErrorInHeritageClause1.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 061489933ac..52958aeb8b1 100644
--- a/tests/baselines/reference/parser509630.js
+++ b/tests/baselines/reference/parser509630.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2f0649ae9c..7fcaba5f2af 100644
--- a/tests/baselines/reference/parserAstSpans1.js
+++ b/tests/baselines/reference/parserAstSpans1.js
@@ -228,9 +228,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 adb0aa59cc4..b1bbca204aa 100644
--- a/tests/baselines/reference/parserClassDeclaration1.js
+++ b/tests/baselines/reference/parserClassDeclaration1.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8f32ccd4b1a..4c59bce599a 100644
--- a/tests/baselines/reference/parserClassDeclaration3.js
+++ b/tests/baselines/reference/parserClassDeclaration3.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad3de685e4e..5a8c897b3b5 100644
--- a/tests/baselines/reference/parserClassDeclaration4.js
+++ b/tests/baselines/reference/parserClassDeclaration4.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 060a81492f4..7516593953b 100644
--- a/tests/baselines/reference/parserClassDeclaration5.js
+++ b/tests/baselines/reference/parserClassDeclaration5.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b74c78df764..5e9515a6bd6 100644
--- a/tests/baselines/reference/parserClassDeclaration6.js
+++ b/tests/baselines/reference/parserClassDeclaration6.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f47cd7cae02..fd84e40f29c 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 93e5e579360..7a7a4560fd4 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4069a34360c..17937b4db6b 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 16ca6a0704f..7c81cf05d50 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb967d32950..82bf0a715ba 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b55289f9efc..9f16800d3a3 100644
--- a/tests/baselines/reference/parserRealSource10.js
+++ b/tests/baselines/reference/parserRealSource10.js
@@ -466,9 +466,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 384b89cd525..182f2c8cf30 100644
--- a/tests/baselines/reference/parserRealSource11.js
+++ b/tests/baselines/reference/parserRealSource11.js
@@ -2375,9 +2375,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b96a879fa03..b49f85e7e42 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2104,9 +2104,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 005af817d22..a959fb8efd7 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e54c78e7cec..e4a55c74969 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e4e889ca71d..d8bfb663ae7 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e90891e3f1a..dd5a08e9b51 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -137,9 +137,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0db9898a07b..0c5b48ca4a2 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -106,9 +106,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -305,9 +304,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c20a6d17a30..577263c8ad8 100644
--- a/tests/baselines/reference/privacyGloClass.js
+++ b/tests/baselines/reference/privacyGloClass.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f43d4d3039f..4f6b4586b15 100644
--- a/tests/baselines/reference/privateAccessInSubclass1.js
+++ b/tests/baselines/reference/privateAccessInSubclass1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 85b6eb408b5..92fcfb0648c 100644
--- a/tests/baselines/reference/privateInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/privateInstanceMemberAccessibility.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7695f95f952..46618b80e2f 100644
--- a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
+++ b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b058e6e4ed..d508a3e4a80 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.js
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d1192072623..93d6de686a3 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67edbb32c76..0d5d8a620cd 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67edbb32c76..0d5d8a620cd 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1a64f288ebb..5fa132a8f28 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/out.js
+++ b/tests/baselines/reference/project/prologueEmit/amd/out.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1a64f288ebb..5fa132a8f28 100644
--- a/tests/baselines/reference/project/prologueEmit/node/out.js
+++ b/tests/baselines/reference/project/prologueEmit/node/out.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0a0b0ec9d43..c8adc86478b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
@@ -7,9 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0a0b0ec9d43..c8adc86478b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
@@ -7,9 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2caa4f9aff4..c2e73029b7c 100644
--- a/tests/baselines/reference/propertiesAndIndexers.js
+++ b/tests/baselines/reference/propertiesAndIndexers.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5fe7cc85599..093b780a62f 100644
--- a/tests/baselines/reference/propertyAccess.js
+++ b/tests/baselines/reference/propertyAccess.js
@@ -159,9 +159,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cc40b669491..c494c4dc8d6 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
@@ -91,9 +91,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ee4a4553559..27929ebf3ad 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
@@ -66,9 +66,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dab1983f8a7..1a4f0a27f2e 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d6f89d3d44a..014a5013ec9 100644
--- a/tests/baselines/reference/propertyOverridesAccessors4.js
+++ b/tests/baselines/reference/propertyOverridesAccessors4.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f701af5227d..6c0588fd1cd 100644
--- a/tests/baselines/reference/propertyOverridingPrototype.js
+++ b/tests/baselines/reference/propertyOverridingPrototype.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0718ddf1a2e..d6fdf461e6a 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 58adf2a7e32..f2de756499e 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
@@ -123,9 +123,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 657cbbc62f2..1485e5102cf 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c784adc5070..1f9c6c354f4 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
@@ -103,9 +103,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d60de9a2278..939ae7bab7a 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f2a7b479da..e621bd73dfb 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b5ef7a42d14..2c57eefd5d6 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -124,9 +124,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 092e0d760bc..dd395868cbc 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4d5dff9bfbe..e050ca7f282 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08941e71f91..356fe07017c 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,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 085a4df0905..12005b16c32 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aa2b6137d93..08d074a09b1 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.js
+++ b/tests/baselines/reference/reactHOCSpreadprops.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8989621f076..1a659a73636 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d823384e47e..92bb9126a13 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -157,9 +157,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 13f10b8d70f..21c9b2ee2d0 100644
--- a/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
+++ b/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d83fe78e86..9f19d092270 100644
--- a/tests/baselines/reference/readonlyConstructorAssignment.js
+++ b/tests/baselines/reference/readonlyConstructorAssignment.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fef99a0e1c1..18df2b2d54d 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.js
+++ b/tests/baselines/reference/recursiveBaseCheck3.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2c483b0a0ee..5eb66b604fb 100644
--- a/tests/baselines/reference/recursiveBaseCheck4.js
+++ b/tests/baselines/reference/recursiveBaseCheck4.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df5d3b06b73..b4ba9660754 100644
--- a/tests/baselines/reference/recursiveBaseCheck6.js
+++ b/tests/baselines/reference/recursiveBaseCheck6.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68b7bf6319e..cc503899c22 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0b869b23b20..175d78620b4 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c4c68166bf8..7aea03bd667 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js
@@ -113,9 +113,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b87b394c3d6..84f26cd4967 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 2540891baa0..9e6e801affa 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -34,9 +34,8 @@ 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 __());
@@ -92,10 +91,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >          		}
   >          	}
   >          }
-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)
+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)
 ---
 >>>(function (Sample) {
 1->
@@ -104,9 +103,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >module 
 3 >           Sample
-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)
+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)
 ---
 >>>    var Actions;
 1 >^^^^
@@ -128,10 +127,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >               		}
   >               	}
   >               }
-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)
+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)
 ---
 >>>    (function (Actions) {
 1->^^^^
@@ -140,9 +139,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Actions
-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)
+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)
 ---
 >>>        var Thing;
 1 >^^^^^^^^
@@ -164,10 +163,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		}
   >                 	}
   >                 }
-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)
+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)
 ---
 >>>        (function (Thing_1) {
 1->^^^^^^^^
@@ -176,9 +175,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Thing
-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)
+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)
 ---
 >>>            var Find;
 1 >^^^^^^^^^^^^
@@ -200,10 +199,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>            (function (Find) {
 1->^^^^^^^^^^^^
@@ -213,22 +212,22 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       Find
-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)
+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)
 ---
 >>>                var StartFindAction = /** @class */ (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >	
-1->Emitted(27, 17) Source(33, 2) + SourceIndex(0)
+1->Emitted(26, 17) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    function StartFindAction() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(28, 21) Source(33, 2) + SourceIndex(0)
+1->Emitted(27, 21) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -244,8 +243,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		}
   >	
 2 >                    }
-1->Emitted(29, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(29, 22) Source(41, 3) + SourceIndex(0)
+1->Emitted(28, 21) Source(41, 2) + SourceIndex(0)
+2 >Emitted(28, 22) Source(41, 3) + SourceIndex(0)
 ---
 >>>                    StartFindAction.prototype.getId = function () { return "yo"; };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -266,15 +265,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                               ;
 8 >                                                                                 
 9 >                                                                                 }
-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)
+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)
 ---
 >>>                    StartFindAction.prototype.run = function (Thing) {
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -289,11 +288,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                                 
 4 >                                                    public run(
 5 >                                                              Thing:Sample.Thing.ICodeThing
-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)
+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)
 ---
 >>>                        return true;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -306,10 +305,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               true
 4 >                                   ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -318,8 +317,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(33, 21) Source(40, 3) + SourceIndex(0)
-2 >Emitted(33, 22) Source(40, 4) + SourceIndex(0)
+1 >Emitted(32, 21) Source(40, 3) + SourceIndex(0)
+2 >Emitted(32, 22) Source(40, 4) + SourceIndex(0)
 ---
 >>>                    return StartFindAction;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -327,8 +326,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
 2 >                    }
-1->Emitted(34, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(34, 43) Source(41, 3) + SourceIndex(0)
+1->Emitted(33, 21) Source(41, 2) + SourceIndex(0)
+2 >Emitted(33, 43) Source(41, 3) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -348,10 +347,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 			return true;
   >                 		}
   >                 	}
-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)
+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)
 ---
 >>>                Find.StartFindAction = StartFindAction;
 1->^^^^^^^^^^^^^^^^
@@ -371,10 +370,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                    		}
   >                                    	}
 4 >                                                      
-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)
+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)
 ---
 >>>            })(Find = Thing_1.Find || (Thing_1.Find = {}));
 1->^^^^^^^^^^^^
@@ -406,15 +405,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                   		}
   >                                                   	}
   >                                                   }
-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)
+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)
 ---
 >>>        })(Thing = Actions.Thing || (Actions.Thing = {}));
 1 >^^^^^^^^
@@ -446,15 +445,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-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)
+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)
 ---
 >>>    })(Actions = Sample.Actions || (Sample.Actions = {}));
 1->^^^^
@@ -485,15 +484,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-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)
+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)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -520,13 +519,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>(function (Sample) {
 1 >
@@ -537,9 +536,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-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)
+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)
 ---
 >>>    var Thing;
 1 >^^^^
@@ -571,10 +570,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-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)
+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)
 ---
 >>>    (function (Thing) {
 1->^^^^
@@ -584,9 +583,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-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)
+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)
 ---
 >>>        var Widgets;
 1->^^^^^^^^
@@ -618,10 +617,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                   
   >                   	}
   >                   }
-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)
+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)
 ---
 >>>        (function (Widgets) {
 1->^^^^^^^^
@@ -631,16 +630,16 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Widgets
-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)
+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)
 ---
 >>>            var FindWidget = /** @class */ (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >	
-1->Emitted(46, 13) Source(45, 2) + SourceIndex(0)
+1->Emitted(45, 13) Source(45, 2) + SourceIndex(0)
 ---
 >>>                function FindWidget(codeThing) {
 1->^^^^^^^^^^^^^^^^
@@ -655,9 +654,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		
 2 >                constructor(private 
 3 >                                    codeThing: Sample.Thing.ICodeThing
-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)
+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)
 ---
 >>>                    this.codeThing = codeThing;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -670,11 +669,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                  
 4 >                                     codeThing
 5 >                                              : Sample.Thing.ICodeThing
-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)
+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)
 ---
 >>>                    this.domNode = null;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -687,11 +686,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                :any = 
 4 >                                   null
 5 >                                       ;
-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)
+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)
 ---
 >>>                    // scenario 1
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -701,8 +700,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		constructor(private codeThing: Sample.Thing.ICodeThing) {
   >		    
 2 >                    // scenario 1
-1 >Emitted(50, 21) Source(51, 7) + SourceIndex(0)
-2 >Emitted(50, 34) Source(51, 20) + SourceIndex(0)
+1 >Emitted(49, 21) Source(51, 7) + SourceIndex(0)
+2 >Emitted(49, 34) Source(51, 20) + SourceIndex(0)
 ---
 >>>                    codeThing.addWidget("addWidget", this);
 1->^^^^^^^^^^^^^^^^^^^^
@@ -726,16 +725,16 @@ sourceFile:recursiveClassReferenceTest.ts
 8 >                                                     this
 9 >                                                         )
 10>                                                          ;
-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->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 >^^^^^^^^^^^^^^^^
@@ -744,8 +743,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(52, 17) Source(53, 3) + SourceIndex(0)
-2 >Emitted(52, 18) Source(53, 4) + SourceIndex(0)
+1 >Emitted(51, 17) Source(53, 3) + SourceIndex(0)
+2 >Emitted(51, 18) Source(53, 4) + SourceIndex(0)
 ---
 >>>                FindWidget.prototype.gar = function (runner) { if (true) {
 1->^^^^^^^^^^^^^^^^
@@ -766,15 +765,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                               if (
 8 >                                                                   true
 9 >                                                                       ) 
-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)
+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)
 ---
 >>>                    return runner(this);
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -791,13 +790,13 @@ sourceFile:recursiveClassReferenceTest.ts
 5 >                                  this
 6 >                                      )
 7 >                                       ;
-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 >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 >^^^^^^^^^^^^^^^^^
@@ -807,9 +806,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >}
 2 >                 
 3 >                  }
-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)
+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)
 ---
 >>>                FindWidget.prototype.getDomNode = function () {
 1->^^^^^^^^^^^^^^^^
@@ -826,9 +825,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                getDomNode
 3 >                                               
-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)
+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)
 ---
 >>>                    return domNode;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -840,10 +839,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                    return 
 3 >                           domNode
 4 >                                  ;
-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 >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 >^^^^^^^^^^^^^^^^
@@ -852,8 +851,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(58, 17) Source(57, 3) + SourceIndex(0)
-2 >Emitted(58, 18) Source(57, 4) + SourceIndex(0)
+1 >Emitted(57, 17) Source(57, 3) + SourceIndex(0)
+2 >Emitted(57, 18) Source(57, 4) + SourceIndex(0)
 ---
 >>>                FindWidget.prototype.destroy = function () {
 1->^^^^^^^^^^^^^^^^
@@ -864,9 +863,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                destroy
 3 >                                            
-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->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 >^^^^^^^^^^^^^^^^
@@ -876,8 +875,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >		
 2 >                }
-1 >Emitted(60, 17) Source(61, 3) + SourceIndex(0)
-2 >Emitted(60, 18) Source(61, 4) + SourceIndex(0)
+1 >Emitted(59, 17) Source(61, 3) + SourceIndex(0)
+2 >Emitted(59, 18) Source(61, 4) + SourceIndex(0)
 ---
 >>>                return FindWidget;
 1->^^^^^^^^^^^^^^^^
@@ -886,8 +885,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                }
-1->Emitted(61, 17) Source(63, 2) + SourceIndex(0)
-2 >Emitted(61, 34) Source(63, 3) + SourceIndex(0)
+1->Emitted(60, 17) Source(63, 2) + SourceIndex(0)
+2 >Emitted(60, 34) Source(63, 3) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -917,10 +916,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             		}
   >             
   >             	}
-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)
+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)
 ---
 >>>            Widgets.FindWidget = FindWidget;
 1->^^^^^^^^^^^^
@@ -950,10 +949,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                           
-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)
+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)
 ---
 >>>        })(Widgets = Thing.Widgets || (Thing.Widgets = {}));
 1->^^^^^^^^
@@ -995,15 +994,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                    
   >                                                    	}
   >                                                    }
-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)
+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)
 ---
 >>>    })(Thing = Sample.Thing || (Sample.Thing = {}));
 1 >^^^^
@@ -1044,15 +1043,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-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)
+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)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -1090,13 +1089,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>var AbstractMode = /** @class */ (function () {
 1->
@@ -1105,13 +1104,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >interface IMode { getInitialState(): IState;} 
   >
-1->Emitted(67, 1) Source(67, 1) + SourceIndex(0)
+1->Emitted(66, 1) Source(67, 1) + SourceIndex(0)
 ---
 >>>    function AbstractMode() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(68, 5) Source(67, 1) + SourceIndex(0)
+1->Emitted(67, 5) Source(67, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -1119,8 +1118,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->class AbstractMode implements IMode { public getInitialState(): IState { return null;} 
 2 >    }
-1->Emitted(69, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(69, 6) Source(67, 89) + SourceIndex(0)
+1->Emitted(68, 5) Source(67, 88) + SourceIndex(0)
+2 >Emitted(68, 6) Source(67, 89) + SourceIndex(0)
 ---
 >>>    AbstractMode.prototype.getInitialState = function () { return null; };
 1->^^^^
@@ -1141,23 +1140,23 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                      ;
 8 >                                                                       
 9 >                                                                        }
-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)
+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)
 ---
 >>>    return AbstractMode;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^
 1 > 
 2 >    }
-1 >Emitted(71, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(71, 24) Source(67, 89) + SourceIndex(0)
+1 >Emitted(70, 5) Source(67, 88) + SourceIndex(0)
+2 >Emitted(70, 24) Source(67, 89) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -1169,10 +1168,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >}
 3 > 
 4 > class AbstractMode implements IMode { public getInitialState(): IState { return null;} }
-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)
+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)
 ---
 >>>(function (Sample) {
 1->
@@ -1190,9 +1189,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-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)
+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)
 ---
 >>>    var Thing;
 1 >^^^^
@@ -1228,10 +1227,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-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)
+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)
 ---
 >>>    (function (Thing) {
 1->^^^^
@@ -1241,9 +1240,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-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)
+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)
 ---
 >>>        var Languages;
 1->^^^^^^^^
@@ -1279,10 +1278,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                     
   >                     	}
   >                     }
-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)
+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)
 ---
 >>>        (function (Languages) {
 1->^^^^^^^^
@@ -1291,9 +1290,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Languages
-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)
+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)
 ---
 >>>            var PlainText;
 1 >^^^^^^^^^^^^
@@ -1329,10 +1328,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                         
   >                         	}
   >                         }
-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)
+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)
 ---
 >>>            (function (PlainText) {
 1->^^^^^^^^^^^^
@@ -1342,9 +1341,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       PlainText
-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)
+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)
 ---
 >>>                var State = /** @class */ (function () {
 1->^^^^^^^^^^^^^^^^
@@ -1352,7 +1351,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1-> {
   >	
   >	
-1->Emitted(80, 17) Source(78, 2) + SourceIndex(0)
+1->Emitted(79, 17) Source(78, 2) + SourceIndex(0)
 ---
 >>>                    function State(mode) {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1363,9 +1362,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >        
 2 >                    constructor(private 
 3 >                                   mode: IMode
-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)
+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)
 ---
 >>>                        this.mode = mode;
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1378,11 +1377,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 
 4 >                                    mode
 5 >                                        : IMode
-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->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 >^^^^^^^^^^^^^^^^^^^^
@@ -1390,8 +1389,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >) { 
 2 >                    }
-1 >Emitted(83, 21) Source(79, 44) + SourceIndex(0)
-2 >Emitted(83, 22) Source(79, 45) + SourceIndex(0)
+1 >Emitted(82, 21) Source(79, 44) + SourceIndex(0)
+2 >Emitted(82, 22) Source(79, 45) + SourceIndex(0)
 ---
 >>>                    State.prototype.clone = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1401,9 +1400,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    clone
 3 >                                         
-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)
+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)
 ---
 >>>                        return this;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1415,10 +1414,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               this
 4 >                                   ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -1427,8 +1426,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(86, 21) Source(82, 3) + SourceIndex(0)
-2 >Emitted(86, 22) Source(82, 4) + SourceIndex(0)
+1 >Emitted(85, 21) Source(82, 3) + SourceIndex(0)
+2 >Emitted(85, 22) Source(82, 4) + SourceIndex(0)
 ---
 >>>                    State.prototype.equals = function (other) {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1443,11 +1442,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                          
 4 >                                             public equals(
 5 >                                                       other:IState
-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)
+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)
 ---
 >>>                        return this === other;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1463,12 +1462,12 @@ sourceFile:recursiveClassReferenceTest.ts
 4 >                                    === 
 5 >                                        other
 6 >                                             ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -1477,8 +1476,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(89, 21) Source(86, 3) + SourceIndex(0)
-2 >Emitted(89, 22) Source(86, 4) + SourceIndex(0)
+1 >Emitted(88, 21) Source(86, 3) + SourceIndex(0)
+2 >Emitted(88, 22) Source(86, 4) + SourceIndex(0)
 ---
 >>>                    State.prototype.getMode = function () { return mode; };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1501,15 +1500,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                       ;
 8 >                                                                         
 9 >                                                                         }
-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)
+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)
 ---
 >>>                    return State;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1517,8 +1516,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >	
 2 >                    }
-1 >Emitted(91, 21) Source(89, 2) + SourceIndex(0)
-2 >Emitted(91, 33) Source(89, 3) + SourceIndex(0)
+1 >Emitted(90, 21) Source(89, 2) + SourceIndex(0)
+2 >Emitted(90, 33) Source(89, 3) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -1541,10 +1540,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		
   >                 		public getMode(): IMode { return mode; }
   >                 	}
-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)
+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)
 ---
 >>>                PlainText.State = State;
 1->^^^^^^^^^^^^^^^^
@@ -1567,10 +1566,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                               		public getMode(): IMode { return mode; }
   >                               	}
 4 >                                       
-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)
+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)
 ---
 >>>                var Mode = /** @class */ (function (_super) {
 1->^^^^^^^^^^^^^^^^
@@ -1578,21 +1577,21 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
   >	
-1->Emitted(94, 17) Source(91, 2) + SourceIndex(0)
+1->Emitted(93, 17) Source(91, 2) + SourceIndex(0)
 ---
 >>>                    __extends(Mode, _super);
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^
 1->export class Mode extends 
 2 >                    AbstractMode
-1->Emitted(95, 21) Source(91, 28) + SourceIndex(0)
-2 >Emitted(95, 45) Source(91, 40) + SourceIndex(0)
+1->Emitted(94, 21) Source(91, 28) + SourceIndex(0)
+2 >Emitted(94, 45) Source(91, 40) + SourceIndex(0)
 ---
 >>>                    function Mode() {
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(96, 21) Source(91, 2) + SourceIndex(0)
+1 >Emitted(95, 21) Source(91, 2) + SourceIndex(0)
 ---
 >>>                        return _super !== null && _super.apply(this, arguments) || this;
 >>>                    }
@@ -1609,8 +1608,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(98, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(98, 22) Source(99, 3) + SourceIndex(0)
+1->Emitted(97, 21) Source(99, 2) + SourceIndex(0)
+2 >Emitted(97, 22) Source(99, 3) + SourceIndex(0)
 ---
 >>>                    // scenario 2
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1618,8 +1617,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >                    // scenario 2
-1->Emitted(99, 21) Source(93, 3) + SourceIndex(0)
-2 >Emitted(99, 34) Source(93, 16) + SourceIndex(0)
+1->Emitted(98, 21) Source(93, 3) + SourceIndex(0)
+2 >Emitted(98, 34) Source(93, 16) + SourceIndex(0)
 ---
 >>>                    Mode.prototype.getInitialState = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1629,9 +1628,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    getInitialState
 3 >                                                  
-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)
+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)
 ---
 >>>                        return new State(self);
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1651,14 +1650,14 @@ sourceFile:recursiveClassReferenceTest.ts
 6 >                                         self
 7 >                                             )
 8 >                                              ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -1667,8 +1666,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(102, 21) Source(96, 3) + SourceIndex(0)
-2 >Emitted(102, 22) Source(96, 4) + SourceIndex(0)
+1 >Emitted(101, 21) Source(96, 3) + SourceIndex(0)
+2 >Emitted(101, 22) Source(96, 4) + SourceIndex(0)
 ---
 >>>                    return Mode;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1679,8 +1678,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(103, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(103, 32) Source(99, 3) + SourceIndex(0)
+1->Emitted(102, 21) Source(99, 2) + SourceIndex(0)
+2 >Emitted(102, 32) Source(99, 3) + SourceIndex(0)
 ---
 >>>                }(AbstractMode));
 1->^^^^^^^^^^^^^^^^
@@ -1704,12 +1703,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              
   >                              	}
-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)
+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)
 ---
 >>>                PlainText.Mode = Mode;
 1->^^^^^^^^^^^^^^^^
@@ -1729,10 +1728,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                     
-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)
+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)
 ---
 >>>            })(PlainText = Languages.PlainText || (Languages.PlainText = {}));
 1->^^^^^^^^^^^^
@@ -1778,15 +1777,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                                      
   >                                                                      	}
   >                                                                      }
-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)
+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)
 ---
 >>>        })(Languages = Thing.Languages || (Thing.Languages = {}));
 1 >^^^^^^^^
@@ -1831,15 +1830,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                          
   >                                                          	}
   >                                                          }
-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)
+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)
 ---
 >>>    })(Thing = Sample.Thing || (Sample.Thing = {}));
 1 >^^^^
@@ -1884,15 +1883,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-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)
+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)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -1934,12 +1933,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>//# 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 40f1639a939..2522ca4b0d2 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.js
+++ b/tests/baselines/reference/recursiveComplicatedClasses.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dd14ea1a9d1..c6b2ea0035d 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8328751cd86..a85b9ffab0c 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7e5a2a8bf5b..5cc4b488403 100644
--- a/tests/baselines/reference/reexportDefaultIsCallable.js
+++ b/tests/baselines/reference/reexportDefaultIsCallable.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 31cb28a6533..208319f09c3 100644
--- a/tests/baselines/reference/reexportedMissingAlias.js
+++ b/tests/baselines/reference/reexportedMissingAlias.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b50b355ae09..597a579bd24 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -1028,9 +1028,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9f877e88132..463699011fc 100644
--- a/tests/baselines/reference/returnInConstructor1.js
+++ b/tests/baselines/reference/returnInConstructor1.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c0631fd81ca..a680fafa9a2 100644
--- a/tests/baselines/reference/returnStatements.js
+++ b/tests/baselines/reference/returnStatements.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6b81f995977..e5571e7464c 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 56737a58b50..f78000a85a2 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3272f2911f0..cd34e4f0fab 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 77635c5db9f..c9b87d76832 100644
--- a/tests/baselines/reference/scopeTests.js
+++ b/tests/baselines/reference/scopeTests.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0c70690dac3..0d217106264 100644
--- a/tests/baselines/reference/shadowPrivateMembers.js
+++ b/tests/baselines/reference/shadowPrivateMembers.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4e63f2b4b35..d93cac3514f 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d4bd460dbb..02fcbdc9341 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 6d0938a5750..338b47d1d21 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -28,13 +27,13 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function AbstractGreeter() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(18, 5) Source(1, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -43,16 +42,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->class AbstractGreeter {
   >
 2 >    }
-1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(19, 6) Source(2, 2) + SourceIndex(0)
+1->Emitted(18, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(18, 6) Source(2, 2) + SourceIndex(0)
 ---
 >>>    return AbstractGreeter;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(20, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(20, 27) Source(2, 2) + SourceIndex(0)
+1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(19, 27) Source(2, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -65,10 +64,10 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 > 
 4 > class AbstractGreeter {
   > }
-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)
+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)
 ---
 >>>var Greeter = /** @class */ (function (_super) {
 1->
@@ -76,21 +75,21 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->
   >
   >
-1->Emitted(22, 1) Source(4, 1) + SourceIndex(0)
+1->Emitted(21, 1) Source(4, 1) + SourceIndex(0)
 ---
 >>>    __extends(Greeter, _super);
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->class Greeter extends 
 2 >    AbstractGreeter
-1->Emitted(23, 5) Source(4, 23) + SourceIndex(0)
-2 >Emitted(23, 32) Source(4, 38) + SourceIndex(0)
+1->Emitted(22, 5) Source(4, 23) + SourceIndex(0)
+2 >Emitted(22, 32) Source(4, 38) + SourceIndex(0)
 ---
 >>>    function Greeter() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(24, 5) Source(4, 1) + SourceIndex(0)
+1 >Emitted(23, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>        var _this = _super !== null && _super.apply(this, arguments) || this;
 1->^^^^^^^^
@@ -100,8 +99,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >            public a = 10;
   >            public nameA = "Ten";
   >        }
-1->Emitted(25, 9) Source(4, 1) + SourceIndex(0)
-2 >Emitted(25, 78) Source(7, 2) + SourceIndex(0)
+1->Emitted(24, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(24, 78) Source(7, 2) + SourceIndex(0)
 ---
 >>>        _this.a = 10;
 1 >^^^^^^^^
@@ -115,11 +114,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                = 
 4 >                  10
 5 >                    ;
-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)
+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)
 ---
 >>>        _this.nameA = "Ten";
 1->^^^^^^^^
@@ -133,11 +132,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                    = 
 4 >                      "Ten"
 5 >                           ;
-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)
+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)
 ---
 >>>        return _this;
 >>>    }
@@ -147,8 +146,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
   >
 2 >    }
-1 >Emitted(29, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(29, 6) Source(7, 2) + SourceIndex(0)
+1 >Emitted(28, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(28, 6) Source(7, 2) + SourceIndex(0)
 ---
 >>>    return Greeter;
 1->^^^^
@@ -156,8 +155,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                  ^^^->
 1->
 2 >    }
-1->Emitted(30, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(30, 19) Source(7, 2) + SourceIndex(0)
+1->Emitted(29, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(29, 19) Source(7, 2) + SourceIndex(0)
 ---
 >>>}(AbstractGreeter));
 1->
@@ -176,11 +175,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >                     public a = 10;
   >                     public nameA = "Ten";
   >                 }
-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)
+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)
 ---
 >>>//# 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 b355546aaf7..5fe0e4c1d72 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.js
+++ b/tests/baselines/reference/specializedInheritedConstructors1.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9f6b85b560..20bdea5d383 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.js
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b4234922c4..5a3cf95ecb4 100644
--- a/tests/baselines/reference/staticFactory1.js
+++ b/tests/baselines/reference/staticFactory1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90fb0252437..64c8620281d 100644
--- a/tests/baselines/reference/staticInheritance.js
+++ b/tests/baselines/reference/staticInheritance.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d4990d38b64..f214d36d6cc 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6dabb115729..b2882f9678d 100644
--- a/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
+++ b/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 31781a40d28..b071e6dba8d 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa5b69de450..75ffa4ec2ce 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 baae2b5408e..d762aff68f8 100644
--- a/tests/baselines/reference/strictModeReservedWord.js
+++ b/tests/baselines/reference/strictModeReservedWord.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79f2fd4d226..9818d4c3cce 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9ccba0029bf..5a959a81e57 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7804c003c2d..80819867c0e 100644
--- a/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
+++ b/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 abfbab4b9d7..186b6c60809 100644
--- a/tests/baselines/reference/subtypesOfTypeParameter.js
+++ b/tests/baselines/reference/subtypesOfTypeParameter.js
@@ -115,9 +115,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f5bbcaa5b13..267ebc5aa2a 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
@@ -177,9 +177,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb7c4ec7f0d..7fc78fef16a 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
@@ -88,9 +88,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1845966cb67..56869ee2ad0 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
@@ -167,9 +167,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cfc66d95a15..e951bbaba58 100644
--- a/tests/baselines/reference/subtypingTransitivity.js
+++ b/tests/baselines/reference/subtypingTransitivity.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 89a13ff13eb..d70673825a4 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -182,9 +182,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ec15d8dc63c..d2b9399eee8 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -129,9 +129,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 287908e373b..270ea29a4c8 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.js
@@ -121,9 +121,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8af59214c18..03a17252477 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js
@@ -182,9 +182,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 765e2f2b388..a16f4677525 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js
@@ -131,9 +131,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aeb7f1bd193..2a13d91c225 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js
@@ -121,9 +121,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d81166ce7fc..c3459967680 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1e7b9752a88..b0e07126be0 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92862f6b327..61d1243a056 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3842353a421..1e125e56b5b 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6273a0a6e6f..32e083ab8bd 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5e7afcedee6..8393fdb0fca 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 752c9ea52c5..1fc3784fefe 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 93de82e6777..5420c3c3399 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b8cc088d3d6..e95ae5f90d7 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
@@ -71,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c24d80f1470..602d8952842 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dea9dc21f27..85e617304cf 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 32e6151eaf2..f086a80dc3f 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8ad74974054..58b2d058a42 100644
--- a/tests/baselines/reference/super.js
+++ b/tests/baselines/reference/super.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f512611bf9d..6a57c71030a 100644
--- a/tests/baselines/reference/super1.js
+++ b/tests/baselines/reference/super1.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c7e5082ba6c..bfe5160184d 100644
--- a/tests/baselines/reference/super2.js
+++ b/tests/baselines/reference/super2.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b2d1828aad..65c71d5551f 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 33e88304123..1cd4e446dac 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3203e0e1d63..0df0acc27aa 100644
--- a/tests/baselines/reference/superAccessCastedCall.js
+++ b/tests/baselines/reference/superAccessCastedCall.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 18cf1dfb7b2..e689e55aea4 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.js
+++ b/tests/baselines/reference/superAccessInFatArrow1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8f960589185..fe683a2eb06 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.js
+++ b/tests/baselines/reference/superCallArgsMustMatch.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 da1e783e845..ded81aa902c 100644
--- a/tests/baselines/reference/superCallAssignResult.js
+++ b/tests/baselines/reference/superCallAssignResult.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cd4a3b01b10..b9041fe2ea1 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 46aef974712..69c3e36c5cd 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aa8e5d18b89..c5d69413454 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df968b2ec5e..192615a8386 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 983d72ed404..5a0e1b4b532 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6623d55985e..df6111c2968 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5c76d43f480..3e54ea4919e 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ff0ab7f429..846b10236b2 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a1468ab1ff7..dd53198d5f5 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7924c74a82b..0519c6979e7 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dc6c9c34d35..e0617a91ad0 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 91f258602e6..4f6ba1f6ceb 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c19ba063c5d..b4ecbb6d0b6 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 24fb622ccc4..40422e84749 100644
--- a/tests/baselines/reference/superCallInNonStaticMethod.js
+++ b/tests/baselines/reference/superCallInNonStaticMethod.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f2f8ca1eff..5d0209eedd2 100644
--- a/tests/baselines/reference/superCallInStaticMethod.js
+++ b/tests/baselines/reference/superCallInStaticMethod.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 381a671ec82..7f76fd0be68 100644
--- a/tests/baselines/reference/superCallInsideClassDeclaration.js
+++ b/tests/baselines/reference/superCallInsideClassDeclaration.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84ffd8e9fb6..520fa39fd73 100644
--- a/tests/baselines/reference/superCallInsideClassExpression.js
+++ b/tests/baselines/reference/superCallInsideClassExpression.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 085c3f84f56..b5476c9b2bc 100644
--- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
+++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 12937ccfa81..77f76e1282e 100644
--- a/tests/baselines/reference/superCallOutsideConstructor.js
+++ b/tests/baselines/reference/superCallOutsideConstructor.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 addb0a9ba22..8dc37241f29 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4a9266de4c5..c5f6a1ab400 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping2.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1838072b627..67cd1695fa7 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7c2020052a..acad3d95783 100644
--- a/tests/baselines/reference/superCallWithCommentEmit01.js
+++ b/tests/baselines/reference/superCallWithCommentEmit01.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 61660eafd64..9837544119f 100644
--- a/tests/baselines/reference/superCallWithMissingBaseClass.js
+++ b/tests/baselines/reference/superCallWithMissingBaseClass.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9730557a34b..9dca6526d95 100644
--- a/tests/baselines/reference/superCalls.js
+++ b/tests/baselines/reference/superCalls.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e963a9fafd3..450a7d06321 100644
--- a/tests/baselines/reference/superCallsInConstructor.js
+++ b/tests/baselines/reference/superCallsInConstructor.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 39ec3d25582..5cd7b5a74f0 100644
--- a/tests/baselines/reference/superElementAccess.js
+++ b/tests/baselines/reference/superElementAccess.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5781964bbe4..51ff643f084 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dbf9fd28844..61880906988 100644
--- a/tests/baselines/reference/superHasMethodsFromMergedInterface.js
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6e631780236..5090b8e7071 100644
--- a/tests/baselines/reference/superInCatchBlock1.js
+++ b/tests/baselines/reference/superInCatchBlock1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eac4af99e83..2586346f83b 100644
--- a/tests/baselines/reference/superInConstructorParam1.js
+++ b/tests/baselines/reference/superInConstructorParam1.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 50e7039768f..fbb718d3f1a 100644
--- a/tests/baselines/reference/superInLambdas.js
+++ b/tests/baselines/reference/superInLambdas.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 257bc39a239..569a897134c 100644
--- a/tests/baselines/reference/superInObjectLiterals_ES5.js
+++ b/tests/baselines/reference/superInObjectLiterals_ES5.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1f015132cac..ea6607aee5b 100644
--- a/tests/baselines/reference/superNewCall1.js
+++ b/tests/baselines/reference/superNewCall1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 021b897532a..4f068792450 100644
--- a/tests/baselines/reference/superNoModifiersCrash.js
+++ b/tests/baselines/reference/superNoModifiersCrash.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 66803cb3adf..89b7df11aba 100644
--- a/tests/baselines/reference/superPropertyAccess.js
+++ b/tests/baselines/reference/superPropertyAccess.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e13521eb93a..afe50f577cf 100644
--- a/tests/baselines/reference/superPropertyAccess1.js
+++ b/tests/baselines/reference/superPropertyAccess1.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0456a88661c..fee00146b49 100644
--- a/tests/baselines/reference/superPropertyAccess2.js
+++ b/tests/baselines/reference/superPropertyAccess2.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 745eb47e29e..25d4bddf332 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5b71c34d3a5..7f93cd13332 100644
--- a/tests/baselines/reference/superPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/superPropertyAccessInSuperCall01.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79574a2c229..e5bd5f14969 100644
--- a/tests/baselines/reference/superPropertyAccessNoError.js
+++ b/tests/baselines/reference/superPropertyAccessNoError.js
@@ -85,9 +85,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b06e38e4b18..5994b0a0aae 100644
--- a/tests/baselines/reference/superPropertyAccess_ES5.js
+++ b/tests/baselines/reference/superPropertyAccess_ES5.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d284bb54f66..a97c7a45a2c 100644
--- a/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
+++ b/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfd7cb74acd..05ac08b689c 100644
--- a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3c4712dd9da..4256ed6c9fc 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess5.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess5.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 43d6c7ce9bc..b5b68ae9e71 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess6.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess6.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 43c277106f5..ab1d306ccbc 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.js
+++ b/tests/baselines/reference/superWithGenericSpecialization.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 73136ccbfb5..1c0f8eb85cc 100644
--- a/tests/baselines/reference/superWithGenerics.js
+++ b/tests/baselines/reference/superWithGenerics.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1201db208d8..0d677d2a6b0 100644
--- a/tests/baselines/reference/superWithTypeArgument.js
+++ b/tests/baselines/reference/superWithTypeArgument.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 179b13adacf..8c2ba03e299 100644
--- a/tests/baselines/reference/superWithTypeArgument2.js
+++ b/tests/baselines/reference/superWithTypeArgument2.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 75757d76828..8bbd1f1c65e 100644
--- a/tests/baselines/reference/superWithTypeArgument3.js
+++ b/tests/baselines/reference/superWithTypeArgument3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fd364d4e9be..e14a69ca330 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,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94d18716d8b..27409f14eb0 100644
--- a/tests/baselines/reference/switchStatements.js
+++ b/tests/baselines/reference/switchStatements.js
@@ -64,9 +64,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e2640811bac..c03bb3f0872 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -39,9 +39,8 @@ 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 d33fcdcfe72..e186e1b6618 100644
--- a/tests/baselines/reference/targetTypeBaseCalls.js
+++ b/tests/baselines/reference/targetTypeBaseCalls.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0f89e8b29e6..60b67b9d1b3 100644
--- a/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
+++ b/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 206df67849c..1557b9d1572 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -57,9 +57,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9be13e16c2b..b310cbfa26f 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -58,9 +58,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e50377314e..24ff1be045a 100644
--- a/tests/baselines/reference/thisInSuperCall.js
+++ b/tests/baselines/reference/thisInSuperCall.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0ab5af1e762..272299f6ec3 100644
--- a/tests/baselines/reference/thisInSuperCall1.js
+++ b/tests/baselines/reference/thisInSuperCall1.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 45599a5b231..09b3336d98b 100644
--- a/tests/baselines/reference/thisInSuperCall2.js
+++ b/tests/baselines/reference/thisInSuperCall2.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d86def33846..69d5892b702 100644
--- a/tests/baselines/reference/thisInSuperCall3.js
+++ b/tests/baselines/reference/thisInSuperCall3.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c575bb64bf3..76ef6df943d 100644
--- a/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
+++ b/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 11f14828e7a..9dcee70745d 100644
--- a/tests/baselines/reference/thisTypeInFunctions.js
+++ b/tests/baselines/reference/thisTypeInFunctions.js
@@ -203,9 +203,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f42f227213..6252d088f44 100644
--- a/tests/baselines/reference/thisTypeInFunctions3.js
+++ b/tests/baselines/reference/thisTypeInFunctions3.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5e1d98219a2..f8e280838ad 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.js
+++ b/tests/baselines/reference/tsxAttributeResolution15.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 312a8df0796..c9cb2806d40 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.js
+++ b/tests/baselines/reference/tsxAttributeResolution16.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c4b84a51adb..20970c59e77 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94002953889..60a8c1bb38d 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08934728467..fe55e8b372d 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 723689e049d..a6e87979fde 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 269e8442b06..f97c7e5fc1f 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a41c9967084..fb84fea6657 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5e0b8f5558d..d719dde6809 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ededc625796..e965cd4f855 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 208a11a9eef..20bcc100d22 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " 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,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 86ce6221986..353b2e2a731 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c0d8b29ff47..f4646f5ac3c 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.js
+++ b/tests/baselines/reference/tsxGenericAttributesType3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e0a271f106d..4f475cca953 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.js
+++ b/tests/baselines/reference/tsxGenericAttributesType4.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92afb996e7a..ff65a82766e 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.js
+++ b/tests/baselines/reference/tsxGenericAttributesType5.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 002a63f1080..544fd73b34e 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.js
+++ b/tests/baselines/reference/tsxGenericAttributesType6.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b1329b31a23..aedcec369a1 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.js
+++ b/tests/baselines/reference/tsxGenericAttributesType9.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2a41c1a8894..92fd3d2a39a 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.js
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.js
@@ -135,9 +135,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c5dc176c031..504fb3d6fd5 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9485b956bb..9698a478748 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eca3e2db18f..453e1bb86b4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e943531e7d6..02a30309695 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5153086903a..b774f3259a8 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cffc7e69f3f..cf3e8a3a0da 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution17.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution17.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8e27eb15d12..c4fb822a4ef 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6529fa98909..562d6da842a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa25dc1e36f..5859238eff1 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 556df2263b4..d605b16ccf0 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bf0e8118661..57b22fb1e20 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bff8d86000a..7a7214ca7f6 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 203665f8505..07c36cfc5a5 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3958b722d3e..04e77f960d4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f077b435cdd..2929d413384 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 456fb843e4c..6869bce4982 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e2dcee2eefe..1cb1fa61d05 100644
--- a/tests/baselines/reference/tsxUnionElementType3.js
+++ b/tests/baselines/reference/tsxUnionElementType3.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4cee2d6d536..28e0a03be76 100644
--- a/tests/baselines/reference/tsxUnionElementType4.js
+++ b/tests/baselines/reference/tsxUnionElementType4.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aa0cf6cc14a..642ee60382f 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4b55d1cbae0..0963813244b 100644
--- a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
+++ b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d525eda14f0..e546b21f1b3 100644
--- a/tests/baselines/reference/typeAssertions.js
+++ b/tests/baselines/reference/typeAssertions.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 465af917351..fe93923a0aa 100644
--- a/tests/baselines/reference/typeGuardFunction.js
+++ b/tests/baselines/reference/typeGuardFunction.js
@@ -91,9 +91,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7d66b4902ed..023fd8130f9 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -176,9 +176,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e148a983921..7870c9d3109 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.js
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1e0544332b9..7e7ea2701fa 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js
@@ -150,9 +150,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7a8f7053c5..784b4cc7b89 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 04e19d27ec9..d482544c64e 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
@@ -81,9 +81,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a0223809175..9fcf125002e 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.js
+++ b/tests/baselines/reference/typeGuardOfFormIsType.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6eaf11f1e8f..c5e3bfacce5 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.js
@@ -91,9 +91,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8adef023d1b..8a7cc63221f 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d64296f744b..5174540119b 100644
--- a/tests/baselines/reference/typeMatch2.js
+++ b/tests/baselines/reference/typeMatch2.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b4c42b6daf5..ff8b8ad73d2 100644
--- a/tests/baselines/reference/typeOfSuperCall.js
+++ b/tests/baselines/reference/typeOfSuperCall.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a54e4724ca9..d7e7d11fede 100644
--- a/tests/baselines/reference/typeParameterAsBaseClass.js
+++ b/tests/baselines/reference/typeParameterAsBaseClass.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9cd4e8eb439..8329275e562 100644
--- a/tests/baselines/reference/typeParameterAsBaseType.js
+++ b/tests/baselines/reference/typeParameterAsBaseType.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 72c7e1ed2b5..efed8435d94 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a2086aedc39..d813e887290 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a97f59ccc0d..f0853faef55 100644
--- a/tests/baselines/reference/typeRelationships.js
+++ b/tests/baselines/reference/typeRelationships.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 080781e1238..889911f1472 100644
--- a/tests/baselines/reference/typeValueConflict1.js
+++ b/tests/baselines/reference/typeValueConflict1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d88b9582313..76e772a6bef 100644
--- a/tests/baselines/reference/typeValueConflict2.js
+++ b/tests/baselines/reference/typeValueConflict2.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9847668e5c5..c404b6f983e 100644
--- a/tests/baselines/reference/typeVariableTypeGuards.js
+++ b/tests/baselines/reference/typeVariableTypeGuards.js
@@ -93,9 +93,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f458981edd0..06b9662e062 100644
--- a/tests/baselines/reference/typeofClass2.js
+++ b/tests/baselines/reference/typeofClass2.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e3e0d37bbae..613d1b5bd34 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
@@ -51,9 +51,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f898dee089..d69e2eda2b9 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 82f259b7bb2..91fe71e2678 100644
--- a/tests/baselines/reference/undeclaredBase.js
+++ b/tests/baselines/reference/undeclaredBase.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 276c0bce1aa..eae10ca7ade 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
@@ -131,9 +131,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c69f16c9741..c8a8d4e4099 100644
--- a/tests/baselines/reference/underscoreMapFirst.js
+++ b/tests/baselines/reference/underscoreMapFirst.js
@@ -57,9 +57,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a47f2661ae6..4fc222c0b8c 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass01.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass01.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b21d1fdc3ea..b2616fdda83 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass02.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass02.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9b8688bd774..489c5c59074 100644
--- a/tests/baselines/reference/unionTypeEquivalence.js
+++ b/tests/baselines/reference/unionTypeEquivalence.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f8f3c224655..f1ce62a13bf 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.js
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7352b2545b..386efe6f6a1 100644
--- a/tests/baselines/reference/unionTypesAssignability.js
+++ b/tests/baselines/reference/unionTypesAssignability.js
@@ -82,9 +82,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c80ec6cfdd2..0e30d1e0fdf 100644
--- a/tests/baselines/reference/unknownSymbols1.js
+++ b/tests/baselines/reference/unknownSymbols1.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d27fd958a7b..e771ecf58ab 100644
--- a/tests/baselines/reference/unspecializedConstraints.js
+++ b/tests/baselines/reference/unspecializedConstraints.js
@@ -162,9 +162,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d0f9f88f6c..0893a139463 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cc932a000ae..b9e3b55a514 100644
--- a/tests/baselines/reference/unusedClassesinNamespace4.js
+++ b/tests/baselines/reference/unusedClassesinNamespace4.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 580e7a40a8c..72ea1ff5081 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.js
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.js
@@ -110,9 +110,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68177b5c614..b5fdcc911c7 100644
--- a/tests/baselines/reference/unusedInvalidTypeArguments.js
+++ b/tests/baselines/reference/unusedInvalidTypeArguments.js
@@ -61,9 +61,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -111,9 +110,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f6f15c1d12f..6b33a55f346 100644
--- a/tests/baselines/reference/useBeforeDeclaration_superClass.js
+++ b/tests/baselines/reference/useBeforeDeclaration_superClass.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4903aba5a72..71bff4214c9 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.js
+++ b/tests/baselines/reference/validUseOfThisInSuper.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6106f7fb687..632d1c9e398 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8bc8f89703b..87b79c1882b 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e6059cddb6b..e6bb30de431 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

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 3/6] 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 __());

From 9adf2f84e27fe0ac71f0125af9e3c9a64e866b03 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <me@joshuakgoldberg.com>
Date: Tue, 17 Mar 2020 18:28:15 -0400
Subject: [PATCH 4/6] Merge branch 'master'

---
 ...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 +-
 .../typeGuardConstructorDerivedClass.js       |   2 +
 .../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, 1452 insertions(+), 2271 deletions(-)

diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
index 9557601efee..02f6ce4874d 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d4cf1fe69ae..143d8ef2604 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f71c72da59..54346dc0076 100644
--- a/tests/baselines/reference/abstractClassInLocalScope.js
+++ b/tests/baselines/reference/abstractClassInLocalScope.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fe0304dc8bd..2f9b2b1de8d 100644
--- a/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
+++ b/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 149339bc265..a1f2000224d 100644
--- a/tests/baselines/reference/abstractProperty.js
+++ b/tests/baselines/reference/abstractProperty.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5c67c4c920a..4476763061b 100644
--- a/tests/baselines/reference/abstractPropertyInConstructor.js
+++ b/tests/baselines/reference/abstractPropertyInConstructor.js
@@ -80,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ac5c77c59a8..5994aeb891e 100644
--- a/tests/baselines/reference/abstractPropertyNegative.js
+++ b/tests/baselines/reference/abstractPropertyNegative.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2005724d03..ca405834ab4 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.js
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ecfe5fc34fd..0a866b482cd 100644
--- a/tests/baselines/reference/accessorsOverrideProperty7.js
+++ b/tests/baselines/reference/accessorsOverrideProperty7.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b18895a48ea..43f06a465e2 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_inference.js
+++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 da5b2725fe9..2bf2b18eb66 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68833218d2c..2219db0782f 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d010bdf1072..6899fb5cee8 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 177b1a5cea7..e567cb76be7 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ae171ff395d..d970fd1878a 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e06ab07a16..affaf4df789 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bca20359e01..e6e55b76ccc 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d387ff62cb..b47774b8624 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " 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,9 +72,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c569781f1ff..3cbd24ddc6d 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 11669a4b006..b521ac03ce2 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.js
+++ b/tests/baselines/reference/ambiguousOverloadResolution.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 886f7ae5280..61afb71509c 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 36cbcaa0275..e13e6a8548a 100644
--- a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
+++ b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -87,9 +86,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 58a2cfc4623..e9930fd2b1d 100644
--- a/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
+++ b/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6d54f798fb2..550dd61e945 100644
--- a/tests/baselines/reference/apparentTypeSubtyping.js
+++ b/tests/baselines/reference/apparentTypeSubtyping.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 09c6abe3491..a4121dd3f6d 100644
--- a/tests/baselines/reference/apparentTypeSupertype.js
+++ b/tests/baselines/reference/apparentTypeSupertype.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c3f3338c811..812b95759f6 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.js
+++ b/tests/baselines/reference/arrayAssignmentTest1.js
@@ -94,9 +94,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fcb5ff5df68..2337e318ca9 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.js
+++ b/tests/baselines/reference/arrayAssignmentTest2.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e74206c132..13cabfa4913 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.js
+++ b/tests/baselines/reference/arrayBestCommonTypes.js
@@ -116,9 +116,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8c9d99dc46e..634859b47ea 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.js
+++ b/tests/baselines/reference/arrayLiteralTypeInference.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1cf819168e5..78bdc9fc129 100644
--- a/tests/baselines/reference/arrayLiterals.js
+++ b/tests/baselines/reference/arrayLiterals.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ef77fb3ea15..43cadb77e14 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c22456b5eac..a8a05b720dc 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84ec5e76414..6c4d7091ded 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -104,9 +104,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa95311ea24..2cd17ce27dd 100644
--- a/tests/baselines/reference/assertionTypePredicates1.js
+++ b/tests/baselines/reference/assertionTypePredicates1.js
@@ -174,9 +174,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 136312daaae..9cb41738ec3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
@@ -109,9 +109,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5d172b9b5a3..185ec0de3be 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
@@ -108,9 +108,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f754e20256..0592e54fec9 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 40d925b99f4..259519e9cba 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6b9ea414bba..718c1e180b4 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
@@ -109,9 +109,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9a14d501a7c..ae03f422545 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
@@ -108,9 +108,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9b6b6f2983f..3d23df97b61 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3fd0675a214..9e92e8850c0 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 81289abd59e..a00da29ed0d 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ca864f24df8..e28ba286533 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 56e0ca2b037..28fe1755600 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
@@ -101,9 +101,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2af39acd2aa..62413e44a77 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
@@ -98,9 +98,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a8f0991cf64..8924ffb70a0 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -101,9 +101,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08e335b55a9..68425cd2c8c 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
@@ -63,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 644f66e5abf..92809166bb3 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.js
+++ b/tests/baselines/reference/assignmentLHSIsValue.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3cdf95df073..5d1cd4a385f 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f96ad8fc6ab..7775094c62b 100644
--- a/tests/baselines/reference/autolift4.js
+++ b/tests/baselines/reference/autolift4.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 516adec8694..644210dc6c7 100644
--- a/tests/baselines/reference/baseCheck.js
+++ b/tests/baselines/reference/baseCheck.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4d64e8af1d2..be4dcf52df7 100644
--- a/tests/baselines/reference/baseClassImprovedMismatchErrors.js
+++ b/tests/baselines/reference/baseClassImprovedMismatchErrors.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 396adade09b..607749f624d 100644
--- a/tests/baselines/reference/baseConstraintOfDecorator.js
+++ b/tests/baselines/reference/baseConstraintOfDecorator.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 38f60f7fd97..833c1eeae88 100644
--- a/tests/baselines/reference/baseExpressionTypeParameters.js
+++ b/tests/baselines/reference/baseExpressionTypeParameters.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b947fd1216c..fca80d0fa67 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.js
+++ b/tests/baselines/reference/baseIndexSignatureResolution.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9b3417dc995..fe70a8d231a 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.js
+++ b/tests/baselines/reference/baseTypeOrderChecking.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6ee6efc8933..d58dd744c3d 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9f6b20a71eb..c59e70e0795 100644
--- a/tests/baselines/reference/bases.js
+++ b/tests/baselines/reference/bases.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 26fb7952d44..07af48dd14e 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d357dd5363d..00080afbeb2 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df3bd9deec0..6c838590c21 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.js
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 325dc56370b..b93d8a55cdf 100644
--- a/tests/baselines/reference/callChainWithSuper(target=es5).js
+++ b/tests/baselines/reference/callChainWithSuper(target=es5).js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3a4ed31761..dd48ba034ae 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b10f0e3851..e977f374b95 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
@@ -124,9 +124,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b98cd8a885b..14b65f84ed0 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 830901db1ca..fdf5bfb9f4e 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cfbd3f9a181..5f0f3ac2704 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c1977dc9981..d0e765c048e 100644
--- a/tests/baselines/reference/callWithSpread.js
+++ b/tests/baselines/reference/callWithSpread.js
@@ -67,9 +67,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42899e76c33..aa2797758a8 100644
--- a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5032900df2a..8ac9de71e98 100644
--- a/tests/baselines/reference/captureThisInSuperCall.js
+++ b/tests/baselines/reference/captureThisInSuperCall.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5a2f89298ce..3b69863c1aa 100644
--- a/tests/baselines/reference/castingTuple.js
+++ b/tests/baselines/reference/castingTuple.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 81c9e0d4159..5a6a80b496c 100644
--- a/tests/baselines/reference/chainedAssignment3.js
+++ b/tests/baselines/reference/chainedAssignment3.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfb8d8a455c..28612036cd1 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 87995535308..1cb44048734 100644
--- a/tests/baselines/reference/checkForObjectTooStrict.js
+++ b/tests/baselines/reference/checkForObjectTooStrict.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 63f811a67c7..58abfe024a2 100644
--- a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
+++ b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 af28d3eb339..8eee35d0809 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 480c7baabaa..28bb2fb6ed0 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e213c7c05e6..87fedcf4da1 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bae227dd449..fa69c0b51d8 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ddd75f2d3ce..584aa086a12 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.js
@@ -54,9 +54,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d3c34622b84..3b9e0839fb4 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b4f77ae0ff6..7513d8a0760 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f96a0585b0a..11ba94cd593 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d6e371fd197..98655f7fc76 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 af389ce3fce..f265559c9fa 100644
--- a/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
+++ b/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed629829b97..31b587d9da8 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d99574f3051..9022b7c65ca 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 30de6e92a83..3739b7cad0b 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6452059dd39..505f01a1dd2 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bdc6e55bc32..3712d0ff12a 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fbddda517ec..ad45f40a980 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9cfaf4afec4..fb0b44e1de5 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4c82d7b2b29..b5f9f0858b2 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a8301289def..ce089fc463b 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1bd6fb4e401..7ed62aad949 100644
--- a/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
+++ b/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3b3181bacb3..90b42cc6469 100644
--- a/tests/baselines/reference/circularImportAlias.js
+++ b/tests/baselines/reference/circularImportAlias.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d83696bfc50..696c3371959 100644
--- a/tests/baselines/reference/circularTypeofWithFunctionModule.js
+++ b/tests/baselines/reference/circularTypeofWithFunctionModule.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ea86d2bf083..9e0fcf0e5d5 100644
--- a/tests/baselines/reference/classAbstractConstructorAssignability.js
+++ b/tests/baselines/reference/classAbstractConstructorAssignability.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ea2db89e9cf..7f2129d5d00 100644
--- a/tests/baselines/reference/classAbstractCrashedOnce.js
+++ b/tests/baselines/reference/classAbstractCrashedOnce.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7dd4b30bcb0..32094a830b3 100644
--- a/tests/baselines/reference/classAbstractExtends.js
+++ b/tests/baselines/reference/classAbstractExtends.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ca0b425cc8..c1550c37766 100644
--- a/tests/baselines/reference/classAbstractFactoryFunction.js
+++ b/tests/baselines/reference/classAbstractFactoryFunction.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 510f492b522..3eeb4bb0866 100644
--- a/tests/baselines/reference/classAbstractGeneric.js
+++ b/tests/baselines/reference/classAbstractGeneric.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 288b452c88c..37b005ed6e2 100644
--- a/tests/baselines/reference/classAbstractInAModule.js
+++ b/tests/baselines/reference/classAbstractInAModule.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ce76c42f190..8f7705ceac4 100644
--- a/tests/baselines/reference/classAbstractInheritance.js
+++ b/tests/baselines/reference/classAbstractInheritance.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fd2222a5377..fbab311025a 100644
--- a/tests/baselines/reference/classAbstractInstantiations1.js
+++ b/tests/baselines/reference/classAbstractInstantiations1.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d43568f3dbb..921453695e0 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.js
+++ b/tests/baselines/reference/classAbstractInstantiations2.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8502b5aa21e..9cb73f83cba 100644
--- a/tests/baselines/reference/classAbstractOverrideWithAbstract.js
+++ b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cff0842ff9b..33853b46f93 100644
--- a/tests/baselines/reference/classAbstractSuperCalls.js
+++ b/tests/baselines/reference/classAbstractSuperCalls.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5099fe11971..e8906510a45 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4e5b2ade0c8..fe59028c08e 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4c66edf5103..983a8e1f556 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.js
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -54,9 +54,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 888e9c5316b..4b1f4f31fc3 100644
--- a/tests/baselines/reference/classConstructorAccessibility4.js
+++ b/tests/baselines/reference/classConstructorAccessibility4.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94dd91637aa..1c1b02ac0b1 100644
--- a/tests/baselines/reference/classConstructorAccessibility5.js
+++ b/tests/baselines/reference/classConstructorAccessibility5.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 453900bf32d..1e802bc23ab 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6b497780ad..4f6dbe4b262 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 13cd7db5e4a..4fb60b4043b 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2c9c7ae1642..7f86dce2fbc 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3664491f83..3d7f1adae46 100644
--- a/tests/baselines/reference/classDeclaredBeforeClassFactory.js
+++ b/tests/baselines/reference/classDeclaredBeforeClassFactory.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2369bda834d..da9194cf488 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0dd173f34e8..8dd5771c29f 100644
--- a/tests/baselines/reference/classExpression2.js
+++ b/tests/baselines/reference/classExpression2.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 16ea2823a2f..5dcee4b5193 100644
--- a/tests/baselines/reference/classExpression3.js
+++ b/tests/baselines/reference/classExpression3.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bef91534fe1..a9a89ac9a96 100644
--- a/tests/baselines/reference/classExpressionExtendingAbstractClass.js
+++ b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1c8fa8aa34e..9c4e258b70d 100644
--- a/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
+++ b/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 83cd9b04bfa..f857b4209a7 100644
--- a/tests/baselines/reference/classExtendingBuiltinType.js
+++ b/tests/baselines/reference/classExtendingBuiltinType.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b6b7f9a76a..5e404484a6d 100644
--- a/tests/baselines/reference/classExtendingClass.js
+++ b/tests/baselines/reference/classExtendingClass.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 61af83d198d..1ae632084ae 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.js
+++ b/tests/baselines/reference/classExtendingClassLikeType.js
@@ -67,9 +67,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a1698b831d3..e9d5c1b85a9 100644
--- a/tests/baselines/reference/classExtendingNonConstructor.js
+++ b/tests/baselines/reference/classExtendingNonConstructor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 65c4fff4373..bfa7e0360fd 100644
--- a/tests/baselines/reference/classExtendingNull.js
+++ b/tests/baselines/reference/classExtendingNull.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5d9ee3c76bd..f1986f3ad34 100644
--- a/tests/baselines/reference/classExtendingPrimitive.js
+++ b/tests/baselines/reference/classExtendingPrimitive.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9cca267f309..1ebe2be1836 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.js
+++ b/tests/baselines/reference/classExtendingPrimitive2.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42d82f6ea0f..a4493fd86f4 100644
--- a/tests/baselines/reference/classExtendingQualifiedName.js
+++ b/tests/baselines/reference/classExtendingQualifiedName.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f0454c72f27..34a333619b9 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.js
+++ b/tests/baselines/reference/classExtendingQualifiedName2.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 953f7bd630b..b4ec841a30e 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -67,9 +66,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7613c23ae8d..fdf721d6ac5 100644
--- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8ad72c59b1e..51cb37a7834 100644
--- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6624104b8ba..3977e4e1d32 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e11d58af787..acdd2b75be8 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84aea7bdf8b..c04a32bef7c 100644
--- a/tests/baselines/reference/classExtendsInterface.js
+++ b/tests/baselines/reference/classExtendsInterface.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 261777267c7..7e18f045760 100644
--- a/tests/baselines/reference/classExtendsInterfaceInExpression.js
+++ b/tests/baselines/reference/classExtendsInterfaceInExpression.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 22a852a58bd..ba13cef76c6 100644
--- a/tests/baselines/reference/classExtendsInterfaceInModule.js
+++ b/tests/baselines/reference/classExtendsInterfaceInModule.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 407e55690cc..b71c8abed82 100644
--- a/tests/baselines/reference/classExtendsInterface_not.js
+++ b/tests/baselines/reference/classExtendsInterface_not.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b9eac2a341..4013c036cc8 100644
--- a/tests/baselines/reference/classExtendsItself.js
+++ b/tests/baselines/reference/classExtendsItself.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa2026179d3..a064acd93c3 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bd1d4afddce..14a1516ebc1 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4546e39b74c..7d800450388 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly3.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly3.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -51,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -75,9 +73,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -99,9 +96,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -123,9 +119,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -147,9 +142,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 27427f54141..199cd885c7b 100644
--- a/tests/baselines/reference/classExtendsMultipleBaseClasses.js
+++ b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 82fedc750a2..a2d8b670c19 100644
--- a/tests/baselines/reference/classExtendsNull.js
+++ b/tests/baselines/reference/classExtendsNull.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 23305ebdfce..ededf2a25d3 100644
--- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb8781c1562..30b98303d19 100644
--- a/tests/baselines/reference/classExtendsValidConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5bcc85966ae..f7f1a5d2440 100644
--- a/tests/baselines/reference/classExtensionNameOutput.js
+++ b/tests/baselines/reference/classExtensionNameOutput.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 13537655316..6f42a9bd9a2 100644
--- a/tests/baselines/reference/classHeritageWithTrailingSeparator.js
+++ b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 80f8863586f..97258c5c159 100644
--- a/tests/baselines/reference/classImplementsClass2.js
+++ b/tests/baselines/reference/classImplementsClass2.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 afa01e4c613..1d48b64b809 100644
--- a/tests/baselines/reference/classImplementsClass3.js
+++ b/tests/baselines/reference/classImplementsClass3.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5ad639f311a..babe28a722a 100644
--- a/tests/baselines/reference/classImplementsClass4.js
+++ b/tests/baselines/reference/classImplementsClass4.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8555a3f262c..655355d1375 100644
--- a/tests/baselines/reference/classImplementsClass5.js
+++ b/tests/baselines/reference/classImplementsClass5.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c373354722f..9ea92525d96 100644
--- a/tests/baselines/reference/classImplementsClass6.js
+++ b/tests/baselines/reference/classImplementsClass6.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a63e1777a67..83ead7522ae 100644
--- a/tests/baselines/reference/classIndexer3.js
+++ b/tests/baselines/reference/classIndexer3.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed3e55e2726..266aad9f966 100644
--- a/tests/baselines/reference/classInheritence.js
+++ b/tests/baselines/reference/classInheritence.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 98da3b47181..0f1c14c44f1 100644
--- a/tests/baselines/reference/classIsSubtypeOfBaseType.js
+++ b/tests/baselines/reference/classIsSubtypeOfBaseType.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8615a47ee4f..55e1239844c 100644
--- a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
+++ b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 437fe85c776..bd56a6c95b4 100644
--- a/tests/baselines/reference/classOrder2.js
+++ b/tests/baselines/reference/classOrder2.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eb0aed3c132..9a664e83bff 100644
--- a/tests/baselines/reference/classOrderBug.js
+++ b/tests/baselines/reference/classOrderBug.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 48b65706657..5795e5c4589 100644
--- a/tests/baselines/reference/classSideInheritance1.js
+++ b/tests/baselines/reference/classSideInheritance1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67b2022c460..0888735d373 100644
--- a/tests/baselines/reference/classSideInheritance2.js
+++ b/tests/baselines/reference/classSideInheritance2.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8d36c5915c6..b38b2eda85c 100644
--- a/tests/baselines/reference/classSideInheritance3.js
+++ b/tests/baselines/reference/classSideInheritance3.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ee6920b472..cb08b51e9f2 100644
--- a/tests/baselines/reference/classUpdateTests.js
+++ b/tests/baselines/reference/classUpdateTests.js
@@ -122,9 +122,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1dab28c11d7..226abd152d8 100644
--- a/tests/baselines/reference/classUsedBeforeInitializedVariables.js
+++ b/tests/baselines/reference/classUsedBeforeInitializedVariables.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6721e1db675..f4348a315e6 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 57be5658324..18cb61863e1 100644
--- a/tests/baselines/reference/classWithConstructors.js
+++ b/tests/baselines/reference/classWithConstructors.js
@@ -58,9 +58,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 826be5fa6f1..6028c76dfbc 100644
--- a/tests/baselines/reference/classWithProtectedProperty.js
+++ b/tests/baselines/reference/classWithProtectedProperty.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 094cd7a31ac..178d9900d85 100644
--- a/tests/baselines/reference/classWithStaticMembers.js
+++ b/tests/baselines/reference/classWithStaticMembers.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6f42a59592..66d32d477cd 100644
--- a/tests/baselines/reference/classdecl.js
+++ b/tests/baselines/reference/classdecl.js
@@ -102,9 +102,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfe890598cc..cb5b85e1be2 100644
--- a/tests/baselines/reference/cloduleGenericOnSelfMember.js
+++ b/tests/baselines/reference/cloduleGenericOnSelfMember.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 75d2ffeafbf..5a61e7c209b 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.js
+++ b/tests/baselines/reference/clodulesDerivedClasses.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e9aee055c3..d9faf83173b 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6fa8bfc0592..2bd949cbae6 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 54be5b45431..1e461178716 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c5632e0d8a2..b1501d33582 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8abe8522273..3e3278db6b9 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2398903bc89..669306e8ccc 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 058ed5f399e..463ba27cb2b 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d541d6e0ad1..ddcd656a833 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3e7ebcd6c48..ecc2b0239d6 100644
--- a/tests/baselines/reference/collisionSuperAndNameResolution.js
+++ b/tests/baselines/reference/collisionSuperAndNameResolution.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 49b31b9baf7..95576841cbb 100644
--- a/tests/baselines/reference/collisionSuperAndParameter.js
+++ b/tests/baselines/reference/collisionSuperAndParameter.js
@@ -71,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6713c8e3dc7..504fd6202f5 100644
--- a/tests/baselines/reference/collisionSuperAndParameter1.js
+++ b/tests/baselines/reference/collisionSuperAndParameter1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed4af66689a..f54793f152e 100644
--- a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
+++ b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 63b0c9ca0b0..7e6ae05a727 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 48c5f9875be..d98c1ef0622 100644
--- a/tests/baselines/reference/commentsInheritance.js
+++ b/tests/baselines/reference/commentsInheritance.js
@@ -159,9 +159,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1f34a4ba2da..b842ec25ed7 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
@@ -203,9 +203,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c5820aac9ab..c090c4f6eaf 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
@@ -177,9 +177,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 95fb1535ef3..c175ecaf712 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
@@ -177,9 +177,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bc5d5fffcdd..b535c4b4976 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
@@ -120,9 +120,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 654ec54a782..425c76f36f3 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
@@ -158,9 +158,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a0267f10229..74fef3246a6 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
@@ -158,9 +158,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 36a8fc96d84..a04612c8250 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
@@ -268,9 +268,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a51047a2904..1aa1f9c2ca4 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
@@ -230,9 +230,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7facdf34b27..f533db30b72 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
@@ -116,9 +116,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6326646f02d..12443bc7fd0 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
@@ -173,9 +173,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3a0d730ae6..4ee3c8b58ca 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
@@ -173,9 +173,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cec08c5ac47..f5510544422 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
@@ -87,9 +87,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b95142e2c1b..83513475dce 100644
--- a/tests/baselines/reference/complexClassRelationships.js
+++ b/tests/baselines/reference/complexClassRelationships.js
@@ -56,9 +56,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fff7d089798..b10228647f0 100644
--- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
+++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92dbd05ee78..3758f1c6605 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
@@ -131,9 +131,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d9fa2ce9a30..d32ed669fd6 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
@@ -94,9 +94,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e2f3a414716..cf19bbcc892 100644
--- a/tests/baselines/reference/computedPropertyNames24_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames24_ES5.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa02344de45..c85aeb8354b 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 048f85fa1de..307c8bd1f9f 100644
--- a/tests/baselines/reference/computedPropertyNames26_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames26_ES5.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f21ed47c6dc..2a9e3e0c5e1 100644
--- a/tests/baselines/reference/computedPropertyNames27_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames27_ES5.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 28fa01c7293..d0117dd6cd9 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 698c0483498..b0c5d636059 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c3f81fd59f5..e08f130ae19 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 217b6ee5898..8482c49c368 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f4556e594c..fa4ade01dd0 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2d362a321bb..afe310df031 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 564a5fc9ccc..e43369a86cf 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
@@ -56,9 +56,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7f919df1dd..45e4782c1c8 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90d6d34c545..d89d1a9d8a4 100644
--- a/tests/baselines/reference/constantOverloadFunction.js
+++ b/tests/baselines/reference/constantOverloadFunction.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fff4f8402c8..e43b9a11c1b 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3331c5009b..9a8b227934c 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 51057da5d50..4fa6ed30d6f 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ea051f36b58..11a9ababd25 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
@@ -122,9 +122,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ceb28ef993e..ddbd0819229 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b6f817c795b..ac6dca30ac5 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 becb659f7c0..15ec6643826 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7d23d6d79ee..f88735b52df 100644
--- a/tests/baselines/reference/constructorArgs.js
+++ b/tests/baselines/reference/constructorArgs.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 27b6d3c28f8..92d8570ab0c 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fec56a77170..210aec197a1 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9951397b09e..27d65afe6cd 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.js
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 05a842a2c23..bdf63756cd1 100644
--- a/tests/baselines/reference/constructorOverloads2.js
+++ b/tests/baselines/reference/constructorOverloads2.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c41d9b2f4ce..c460c94441b 100644
--- a/tests/baselines/reference/constructorOverloads3.js
+++ b/tests/baselines/reference/constructorOverloads3.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4a744035945..be8397ca335 100644
--- a/tests/baselines/reference/constructorWithCapturedSuper.js
+++ b/tests/baselines/reference/constructorWithCapturedSuper.js
@@ -61,9 +61,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c58d19843e2..b31a5475d06 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -288,9 +288,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fbe58ad0e51..ea5d8935047 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e74122b9210..453546633af 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f3246f8abf3..24cdda6244d 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 30b2175316b..81450e940b7 100644
--- a/tests/baselines/reference/controlFlowSuperPropertyAccess.js
+++ b/tests/baselines/reference/controlFlowSuperPropertyAccess.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d8e8abe81c9..a6f2c3ac965 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d27b6643840..bbb05a73617 100644
--- a/tests/baselines/reference/declFileClassExtendsNull.js
+++ b/tests/baselines/reference/declFileClassExtendsNull.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bc6ee7e27c0..d753b63edaf 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 672c5f64d32..4e8414cb0fa 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6b3a7d626a..7b5fcee16f3 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e533c31005d..e1382305498 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 43c47781845..2b8dd1c9fa2 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 424e2dcfe7d..88ae8010ff5 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ad5d0f9d4a..4b44b4c0233 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 91121fdcaa8..c00eb2ce84a 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends2.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 037ad6cf347..b156e9bd3d6 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0db8521a858..2ee00dd0033 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends4.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends4.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f89052b5112..21201fb108c 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends5.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7fd1e0c0848..63de3e68739 100644
--- a/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
+++ b/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 328209def1e..18f1017225c 100644
--- a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
+++ b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e8f97f7bd15..c90c8aa43c7 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts3.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts3.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 818b35bda85..067bac4cb8e 100644
--- a/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
+++ b/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a378890ec38..6fd8766bf1d 100644
--- a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
+++ b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84b9bbbc239..52d35b3474b 100644
--- a/tests/baselines/reference/declarationEmitProtectedMembers.js
+++ b/tests/baselines/reference/declarationEmitProtectedMembers.js
@@ -58,9 +58,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 170ff04db29..59199d8c0f0 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad78d445e7c..a155ffdb818 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8de69c43c16..a946b5983dd 100644
--- a/tests/baselines/reference/declarationNoDanglingGenerics.js
+++ b/tests/baselines/reference/declarationNoDanglingGenerics.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ae8a0c17d78..f75108175ba 100644
--- a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
+++ b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 35ee4e49b38..4af59a8e7e7 100644
--- a/tests/baselines/reference/declareDottedExtend.js
+++ b/tests/baselines/reference/declareDottedExtend.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 033d3d2aad3..8763c3605d1 100644
--- a/tests/baselines/reference/decoratorOnClass9.js
+++ b/tests/baselines/reference/decoratorOnClass9.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4dcb1eb9f6a..5770ba52608 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1247ed58709..10ca7fc146e 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 150b15ee0e7..485d0b90147 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor4.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad42c9e2d3e..145fa37064c 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8b6874afe31..e2fa8cbe80f 100644
--- a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
+++ b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -64,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f1ddf5b6786..c0fd3589312 100644
--- a/tests/baselines/reference/defineProperty(target=es5).js
+++ b/tests/baselines/reference/defineProperty(target=es5).js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90ee8409287..e02ce21e2a2 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b4a27645c4d..1d716082b78 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 a0834cd6035..c3ea5a23298 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -28,7 +27,7 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function C(value) {
 1->^^^^
@@ -43,9 +42,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               value: number
-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)
+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)
 ---
 >>>        this.cProp = 10;
 1->^^^^^^^^
@@ -58,11 +57,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 3 >                   = 
 4 >                     10
 5 >                       ;
-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)
+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)
 ---
 >>>        return {
 1 >^^^^^^^^
@@ -75,8 +74,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    constructor(value: number) {
   >        
 2 >        return 
-1 >Emitted(20, 9) Source(7, 9) + SourceIndex(0)
-2 >Emitted(20, 16) Source(7, 16) + SourceIndex(0)
+1 >Emitted(19, 9) Source(7, 9) + SourceIndex(0)
+2 >Emitted(19, 16) Source(7, 16) + SourceIndex(0)
 ---
 >>>            cProp: value,
 1->^^^^^^^^^^^^
@@ -89,10 +88,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            cProp
 3 >                 : 
 4 >                   value
-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)
+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)
 ---
 >>>            foo: function () {
 1->^^^^^^^^^^^^
@@ -101,8 +100,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->,
   >            
 2 >            foo
-1->Emitted(22, 13) Source(9, 13) + SourceIndex(0)
-2 >Emitted(22, 16) Source(9, 16) + SourceIndex(0)
+1->Emitted(21, 13) Source(9, 13) + SourceIndex(0)
+2 >Emitted(21, 16) Source(9, 16) + SourceIndex(0)
 ---
 >>>                return "well this looks kinda C-ish.";
 1->^^^^^^^^^^^^^^^^
@@ -114,10 +113,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                return 
 3 >                       "well this looks kinda C-ish."
 4 >                                                     ;
-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->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 >^^^^^^^^^^^^
@@ -125,8 +124,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            }
-1 >Emitted(24, 13) Source(11, 13) + SourceIndex(0)
-2 >Emitted(24, 14) Source(11, 14) + SourceIndex(0)
+1 >Emitted(23, 13) Source(11, 13) + SourceIndex(0)
+2 >Emitted(23, 14) Source(11, 14) + SourceIndex(0)
 ---
 >>>        };
 1 >^^^^^^^^^
@@ -134,8 +133,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >        }
 2 >         
-1 >Emitted(25, 10) Source(12, 10) + SourceIndex(0)
-2 >Emitted(25, 11) Source(12, 10) + SourceIndex(0)
+1 >Emitted(24, 10) Source(12, 10) + SourceIndex(0)
+2 >Emitted(24, 11) Source(12, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -144,8 +143,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(26, 5) Source(13, 5) + SourceIndex(0)
-2 >Emitted(26, 6) Source(13, 6) + SourceIndex(0)
+1 >Emitted(25, 5) Source(13, 5) + SourceIndex(0)
+2 >Emitted(25, 6) Source(13, 6) + SourceIndex(0)
 ---
 >>>    C.prototype.foo = function () { return "this never gets used."; };
 1->^^^^
@@ -166,15 +165,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                                  ;
 8 >                                                                    
 9 >                                                                    }
-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)
+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)
 ---
 >>>    return C;
 1 >^^^^
@@ -191,8 +190,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    }
   >
 2 >    }
-1 >Emitted(28, 5) Source(14, 1) + SourceIndex(0)
-2 >Emitted(28, 13) Source(14, 2) + SourceIndex(0)
+1 >Emitted(27, 5) Source(14, 1) + SourceIndex(0)
+2 >Emitted(27, 13) Source(14, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -217,10 +216,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >         }
   >     }
   > }
-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)
+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)
 ---
 >>>var D = /** @class */ (function (_super) {
 1->
@@ -228,15 +227,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
   >
-1->Emitted(30, 1) Source(16, 1) + SourceIndex(0)
+1->Emitted(29, 1) Source(16, 1) + SourceIndex(0)
 ---
 >>>    __extends(D, _super);
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^
 1->class D extends 
 2 >    C
-1->Emitted(31, 5) Source(16, 17) + SourceIndex(0)
-2 >Emitted(31, 26) Source(16, 18) + SourceIndex(0)
+1->Emitted(30, 5) Source(16, 17) + SourceIndex(0)
+2 >Emitted(30, 26) Source(16, 18) + SourceIndex(0)
 ---
 >>>    function D(a) {
 1 >^^^^
@@ -249,9 +248,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               a = 100
-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)
+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)
 ---
 >>>        if (a === void 0) { a = 100; }
 1->^^^^^^^^
@@ -263,10 +262,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >        
 3 >                          
 4 >                            a = 100
-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)
+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)
 ---
 >>>        var _this = _super.call(this, a) || this;
 1->^^^^^^^^
@@ -295,12 +294,12 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >                                                else
   >                                                    return null;
   >                                            }
-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)
+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)
 ---
 >>>        _this.dProp = function () { return _this; };
 1->^^^^^^^^
@@ -321,15 +320,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                
 8 >                                                  this
 9 >                                                   ;
-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)
+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)
 ---
 >>>        if (Math.random() < 0.5) {
 1 >^^^^^^^^
@@ -355,15 +354,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                          < 
 8 >                            0.5
 9 >                               ) 
-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)
+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)
 ---
 >>>            "You win!";
 1 >^^^^^^^^^^^^
@@ -373,9 +372,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >            
 2 >            "You win!"
 3 >                      
-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)
+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)
 ---
 >>>            return {
 1 >^^^^^^^^^^^^
@@ -384,8 +383,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            return 
-1 >Emitted(38, 13) Source(24, 13) + SourceIndex(0)
-2 >Emitted(38, 20) Source(24, 20) + SourceIndex(0)
+1 >Emitted(37, 13) Source(24, 13) + SourceIndex(0)
+2 >Emitted(37, 20) Source(24, 20) + SourceIndex(0)
 ---
 >>>                cProp: 1,
 1->^^^^^^^^^^^^^^^^
@@ -398,10 +397,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                cProp
 3 >                     : 
 4 >                       1
-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)
+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)
 ---
 >>>                dProp: function () { return _this; },
 1->^^^^^^^^^^^^^^^^
@@ -422,14 +421,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                            this
 7 >                                                 
 8 >                                                   this
-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)
+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)
 ---
 >>>                foo: function () { return "You win!!!!!"; }
 1->^^^^^^^^^^^^^^^^
@@ -449,14 +448,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                                        
 7 >                                                          
 8 >                                                          }
-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->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 >^^^^^^^^^^^^^
@@ -464,15 +463,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            }
 2 >             ;
-1 >Emitted(42, 14) Source(28, 14) + SourceIndex(0)
-2 >Emitted(42, 15) Source(28, 15) + SourceIndex(0)
+1 >Emitted(41, 14) Source(28, 14) + SourceIndex(0)
+2 >Emitted(41, 15) Source(28, 15) + SourceIndex(0)
 ---
 >>>        }
 1 >^^^^^^^^^
 2 >         ^^^^->
 1 >
   >        }
-1 >Emitted(43, 10) Source(29, 10) + SourceIndex(0)
+1 >Emitted(42, 10) Source(29, 10) + SourceIndex(0)
 ---
 >>>        else
 >>>            return null;
@@ -486,10 +485,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            return 
 3 >                   null
 4 >                       ;
-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->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 >^^^^
@@ -498,8 +497,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(46, 5) Source(32, 5) + SourceIndex(0)
-2 >Emitted(46, 6) Source(32, 6) + SourceIndex(0)
+1 >Emitted(45, 5) Source(32, 5) + SourceIndex(0)
+2 >Emitted(45, 6) Source(32, 6) + SourceIndex(0)
 ---
 >>>    return D;
 1->^^^^
@@ -507,8 +506,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
 2 >    }
-1->Emitted(47, 5) Source(33, 1) + SourceIndex(0)
-2 >Emitted(47, 13) Source(33, 2) + SourceIndex(0)
+1->Emitted(46, 5) Source(33, 1) + SourceIndex(0)
+2 >Emitted(46, 13) Source(33, 2) + SourceIndex(0)
 ---
 >>>}(C));
 1 >
@@ -541,11 +540,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >               return null;
   >       }
   >   }
-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)
+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)
 ---
 >>>//# 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 0442aaf8911..a2e5ea9af03 100644
--- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
+++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8394b689589..bf7d6631025 100644
--- a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
+++ b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79922c29bbb..76efe551df5 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2dc09fab050..35107d1da2c 100644
--- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
+++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d098bbdb490..5378e342fd4 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bfdd788f4de..a080cbacce2 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivates.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivates.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9db50fe9ac..62b14797332 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8874eb394d0..a2b271f82ff 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
@@ -72,9 +72,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aee578cbc60..fed9b4cf03d 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f7f18d97f4d..9562bd9edc2 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1595028eab3..02a2be56a5d 100644
--- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
@@ -71,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b65ee3a90e6..2964dfd637b 100644
--- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
+++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 46aecf42832..7be320920c2 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.js
+++ b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -104,9 +104,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 38a49bdb3fe..df42d2c22b4 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 34c814e023a..b2758596e01 100644
--- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
+++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b706a3a395..cb585761429 100644
--- a/tests/baselines/reference/derivedClassTransitivity.js
+++ b/tests/baselines/reference/derivedClassTransitivity.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f2da0b4b077..84c0bd24ee0 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.js
+++ b/tests/baselines/reference/derivedClassTransitivity2.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e7eee5b13d..24512be746e 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.js
+++ b/tests/baselines/reference/derivedClassTransitivity3.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 504db3a6197..9ce924abfa4 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.js
+++ b/tests/baselines/reference/derivedClassTransitivity4.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08bbf88c1cd..eee9fc871c1 100644
--- a/tests/baselines/reference/derivedClassWithAny.js
+++ b/tests/baselines/reference/derivedClassWithAny.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 28fa8c1ac35..03cf53e5ee5 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d17bed39ec0..6b70dd68b00 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 255623d51c4..59434074d67 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fd0a171d499..1609efab14f 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c014ac9eb73..53750feade6 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 26c593bd39b..ca329e46504 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e037862cbb4..88d6856e214 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
@@ -56,9 +56,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dd683cb066b..b416a4f4980 100644
--- a/tests/baselines/reference/derivedClasses.js
+++ b/tests/baselines/reference/derivedClasses.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c8d57a9f13a..c0cc36e4ad5 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.js
+++ b/tests/baselines/reference/derivedGenericClassWithAny.js
@@ -51,9 +51,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad17cf35af8..f59f10f4612 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8fc7af93c9c..a8347b040f6 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3967c88377..384abc71306 100644
--- a/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
+++ b/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
@@ -92,9 +92,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6fa2fb6666e..80243d163c5 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cf7aa47ef55..ee9655f3709 100644
--- a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
+++ b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d44fe6c6c6f..a6d020138d9 100644
--- a/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 444833aa7ab..36060ceb523 100644
--- a/tests/baselines/reference/emitBundleWithShebang1.js
+++ b/tests/baselines/reference/emitBundleWithShebang1.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c2808ec4217..11403472ef9 100644
--- a/tests/baselines/reference/emitBundleWithShebang2.js
+++ b/tests/baselines/reference/emitBundleWithShebang2.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d423664c32c..0811d4f1bf2 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f092a6bc426..53d1ee88480 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0b4df59fb1f..0f6b043b2c2 100644
--- a/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
+++ b/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 61c823d57fc..b40dce9e199 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 12e5b71a113..89dddd7bfec 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3d3d5431c05..03149434bd2 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 47581e1937d..da2daf8dcb2 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f31339e38af..54ebb7d8580 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e91b339e6d3..bb2fa76fc0c 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 05ac3119e17..790cd930e6b 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -579,9 +579,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9823bfaa55..e74d04a633e 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9edd01767fb..031a88dbb87 100644
--- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
+++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8610f95e0a8..2b8177adb6a 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -83,9 +83,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a33ff30d328..e609f86ca7c 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.js
+++ b/tests/baselines/reference/errorSuperPropertyAccess.js
@@ -137,9 +137,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 002bb48ded6..ea1ec3d125e 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.js
+++ b/tests/baselines/reference/errorsInGenericTypeReference.js
@@ -80,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f5a6bfc1d4d..f4d31aa1391 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.js
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2114d5b6f66..e14a73e6926 100644
--- a/tests/baselines/reference/es6ClassTest.js
+++ b/tests/baselines/reference/es6ClassTest.js
@@ -93,9 +93,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 82bdeec82ae..6e90fcbfedd 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -167,9 +167,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa9d38908a0..1932f6f2de6 100644
--- a/tests/baselines/reference/es6ClassTest7.js
+++ b/tests/baselines/reference/es6ClassTest7.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c93f9f6bcba..0256aa3baae 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a610a625d3d..8b795bc1ea6 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.js
+++ b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -85,9 +84,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b35a297f9ae..6cb95e2795b 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 de04b0eee54..b01d17c97df 100644
--- a/tests/baselines/reference/exportDefaultAbstractClass.js
+++ b/tests/baselines/reference/exportDefaultAbstractClass.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -55,9 +54,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2a131e2ac04..f80d7f4deaa 100644
--- a/tests/baselines/reference/extBaseClass1.js
+++ b/tests/baselines/reference/extBaseClass1.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 87ce7bc8778..7dc1ca88ab5 100644
--- a/tests/baselines/reference/extBaseClass2.js
+++ b/tests/baselines/reference/extBaseClass2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67c63726580..7676baef571 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c0bba1d8980..63f4aea8fe7 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 14f79f4a0f7..94d61954405 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 99d8156784b..e8bd0ecaffa 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2881f233649..4d3cc5053be 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.js
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 96559b8bf23..e2ee1bca709 100644
--- a/tests/baselines/reference/extendFromAny.js
+++ b/tests/baselines/reference/extendFromAny.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 80118ec8d08..b310e48685d 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.js
+++ b/tests/baselines/reference/extendNonClassSymbol1.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 de1f20636a9..82bfe35d586 100644
--- a/tests/baselines/reference/extendNonClassSymbol2.js
+++ b/tests/baselines/reference/extendNonClassSymbol2.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 86126a9c3e2..678e85d270a 100644
--- a/tests/baselines/reference/extendPrivateConstructorClass.js
+++ b/tests/baselines/reference/extendPrivateConstructorClass.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3126b860342..d431051fe6d 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -81,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5a3ff7e44f2..d7da659f1b2 100644
--- a/tests/baselines/reference/extendsClause.js
+++ b/tests/baselines/reference/extendsClause.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3a0fe12fe6a..e7bc3cf0930 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 da112e48983..260bb6d4bd5 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen2.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5284a2e9a74..ea378ae1298 100644
--- a/tests/baselines/reference/extendsUntypedModule.js
+++ b/tests/baselines/reference/extendsUntypedModule.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 859ad1a3975..2e36ae9dace 100644
--- a/tests/baselines/reference/fluentClasses.js
+++ b/tests/baselines/reference/fluentClasses.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 093eaad8b40..55c87503639 100644
--- a/tests/baselines/reference/for-inStatements.js
+++ b/tests/baselines/reference/for-inStatements.js
@@ -89,9 +89,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bdde889ee8c..0a863286b59 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.js
+++ b/tests/baselines/reference/for-inStatementsInvalid.js
@@ -72,9 +72,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 71b35c8cced..8c492ad4b73 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f516cbd55b..5be7467c7b5 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -82,9 +82,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b116bc2fa6..dba72fff13a 100644
--- a/tests/baselines/reference/functionImplementations.js
+++ b/tests/baselines/reference/functionImplementations.js
@@ -165,9 +165,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 decf4f4eaa9..1e7b5d0a79b 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 920cae18c83..53b66ff6a84 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 acb1b0f320f..28c292c318d 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -363,9 +363,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fce1e33177e..f198c9c7f00 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a66374608a5..3f62dde8cce 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 23f2f4b0410..b4433d63bfb 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
@@ -117,9 +117,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d5a36344ea6..4bb0e685a43 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d0e74ec1bff..3d23afda8ae 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3b0256a25c8..95c6011e5cf 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fab42865555..9cde80d5ee3 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 54861fd3fbf..0b9514867c2 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.js
+++ b/tests/baselines/reference/genericClassExpressionInFunction.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90a0c0098b9..abe892cda53 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 247e88490a0..bc5e1371ee8 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
@@ -84,9 +84,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 65c7603d5f8..47707cd8b94 100644
--- a/tests/baselines/reference/genericClassStaticMethod.js
+++ b/tests/baselines/reference/genericClassStaticMethod.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e70b7d84721..d97630ae1b9 100644
--- a/tests/baselines/reference/genericClasses3.js
+++ b/tests/baselines/reference/genericClasses3.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8412efa8091..6d504ce0fe0 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 96af28b411e..7506bbc2d1f 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 59fb2d8ccc0..5fccd8e717b 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42c00f9f8bb..7408a8ff174 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f643bd1524f..a3449eee10b 100644
--- a/tests/baselines/reference/genericInheritedDefaultConstructors.js
+++ b/tests/baselines/reference/genericInheritedDefaultConstructors.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3b61fe8299d..284d6e2b97e 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.js
+++ b/tests/baselines/reference/genericPrototypeProperty2.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 998459333fc..282d4c372d8 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.js
+++ b/tests/baselines/reference/genericPrototypeProperty3.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bba2d444601..a71a3c8093c 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b5a2e0a6588..7e9a8352241 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f29478f932a..85fd402a02d 100644
--- a/tests/baselines/reference/genericTypeAssertions2.js
+++ b/tests/baselines/reference/genericTypeAssertions2.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e1f0dcea28..2c7a0726c3b 100644
--- a/tests/baselines/reference/genericTypeAssertions4.js
+++ b/tests/baselines/reference/genericTypeAssertions4.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9b25616295..fb4b3afd4cd 100644
--- a/tests/baselines/reference/genericTypeAssertions6.js
+++ b/tests/baselines/reference/genericTypeAssertions6.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 926506cb276..4b1d266a25d 100644
--- a/tests/baselines/reference/genericTypeConstraints.js
+++ b/tests/baselines/reference/genericTypeConstraints.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8b7d96f7406..baa7793c96d 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 05ce07def37..ef29c54d9d6 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 09a8b085be6..33645d6bca7 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a9a265b1668..f63bc5e06a2 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.js
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.js
@@ -141,9 +141,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e024b6ae5f..9ad9ab10729 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -171,9 +171,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8fb94fe80e8..5663a2e0100 100644
--- a/tests/baselines/reference/illegalSuperCallsInConstructor.js
+++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3e92f279c5..5ed50f28165 100644
--- a/tests/baselines/reference/implementClausePrecedingExtends.js
+++ b/tests/baselines/reference/implementClausePrecedingExtends.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b51171c9276..34272a0a6b1 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
@@ -94,9 +94,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c2da946bc0a..7fb2a31ff55 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3986c4477c5..67aedaf329c 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f2cabab68f..d37bd230082 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -95,9 +95,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eda722c3b39..e2713dd725a 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -89,9 +89,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 29fe586b316..3fb4dabb286 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c6e650d3245..7bf6c1b10b6 100644
--- a/tests/baselines/reference/importNotElidedWhenNotFound.js
+++ b/tests/baselines/reference/importNotElidedWhenNotFound.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 39fdf2fb183..3e333a8fbc7 100644
--- a/tests/baselines/reference/importShadowsGlobalName.js
+++ b/tests/baselines/reference/importShadowsGlobalName.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3ed00c7b1f..1bcc14be47d 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 24dde4f12e7..1c857e3c376 100644
--- a/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
+++ b/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5224aa9da28..3cb1680c255 100644
--- a/tests/baselines/reference/indexedAccessRelation.js
+++ b/tests/baselines/reference/indexedAccessRelation.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cfa47c66a60..f15c3a68f4c 100644
--- a/tests/baselines/reference/indexedAccessTypeConstraints.js
+++ b/tests/baselines/reference/indexedAccessTypeConstraints.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a3553eb1f1d..d27bb46ad9a 100644
--- a/tests/baselines/reference/indexerConstraints2.js
+++ b/tests/baselines/reference/indexerConstraints2.js
@@ -90,9 +90,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e559acbfe2..6c8f2ea35a2 100644
--- a/tests/baselines/reference/indirectSelfReference.js
+++ b/tests/baselines/reference/indirectSelfReference.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4e1d7a3247c..641febf9b10 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.js
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79b052f3ab9..3aaa275514d 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d3e2fab9ef..a787b81d89c 100644
--- a/tests/baselines/reference/inheritFromGenericTypeParameter.js
+++ b/tests/baselines/reference/inheritFromGenericTypeParameter.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4167db52554..32612069ea1 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 12069905f8b..a800eef15d6 100644
--- a/tests/baselines/reference/inheritance.js
+++ b/tests/baselines/reference/inheritance.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb8593451bf..79a9fefda90 100644
--- a/tests/baselines/reference/inheritance1.js
+++ b/tests/baselines/reference/inheritance1.js
@@ -70,9 +70,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a3b4c4f4bee..0bcd4b06d5b 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a6e3aeeda6b..b8dba0bbc24 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aceab2377b5..3bc790a261c 100644
--- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 570e6811867..1f2ae5b2719 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0b5df5bcea0..257ee1b008d 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 21cef954352..2143a8327ee 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 731011b3374..e1742022d15 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 25f523fc639..5a7694ab8a1 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 42aad59f3b3..2ccac56d603 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f762a338b5d..987b4561a20 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfda6dbc0f9..098ec8d5f59 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5b15a34c41c..c5d84fd6a60 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ef745a281aa..3e0b748005b 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2a5694f0f9..970556f0662 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f35d95365a7..308e05dde03 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 015f571e4a6..70fbb6ff8f3 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ed4f33fcdb5..4d0f4f4c747 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7e57d9fd510..298fe5a9bf8 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cf7102ddbc6..5a96756a7fe 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6ac475f5f06..4fdd17b5905 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 21303e8e5a0..c8f912ac9b9 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8016a044a05..58830a5885b 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6f287a65ea3..9cbc37464f5 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d21d81f3efb..c86db6899c7 100644
--- a/tests/baselines/reference/inheritanceStaticMembersCompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ca14c995ae1..bed2bdd984f 100644
--- a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 54ba35af2e4..a5e65c9ccc6 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68d2b9334e0..2c58bbf1567 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f4c16b35e70..6d577ed7dfa 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 928e1845a2c..393c2059c5c 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1560f85c825..5c1ee2dfb46 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e06d1c67f1..3cda816969d 100644
--- a/tests/baselines/reference/inheritedModuleMembersForClodule.js
+++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a5a33e22457..ab9565f2c39 100644
--- a/tests/baselines/reference/instanceOfAssignability.js
+++ b/tests/baselines/reference/instanceOfAssignability.js
@@ -98,9 +98,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bfa315e0059..109ccf8f8b8 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
@@ -51,9 +51,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b19479a46b3..99304e5ef27 100644
--- a/tests/baselines/reference/instanceSubtypeCheck2.js
+++ b/tests/baselines/reference/instanceSubtypeCheck2.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 66875077615..3ecda3001f9 100644
--- a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
@@ -80,9 +80,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 71664cfe99e..5a3a88c181a 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.js
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 37fdaecaf88..bac4b82fc60 100644
--- a/tests/baselines/reference/interfaceClassMerging.js
+++ b/tests/baselines/reference/interfaceClassMerging.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c8f2791736c..738c2410347 100644
--- a/tests/baselines/reference/interfaceClassMerging2.js
+++ b/tests/baselines/reference/interfaceClassMerging2.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 284f98f966a..7dd969426aa 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.js
+++ b/tests/baselines/reference/interfaceExtendsClass1.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 01b312cdee9..15e09b94edd 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 924ba1d609d..15d63ab80e4 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92f5f6a24a0..3be49fbf1ec 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersection.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersection.js
@@ -63,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8b0ed42431d..bbed54436c6 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
@@ -57,9 +57,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 39685c25879..979526b4e13 100644
--- a/tests/baselines/reference/interfaceImplementation8.js
+++ b/tests/baselines/reference/interfaceImplementation8.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1309e467e92..ff1e8d44224 100644
--- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
@@ -88,9 +88,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 23b4f19d74c..a06b6c362b7 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 236612cc444..b1dcfaebf9f 100644
--- a/tests/baselines/reference/invalidReturnStatements.js
+++ b/tests/baselines/reference/invalidReturnStatements.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dcd0494edba..23169b3e784 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8ed5331e2e2..2a071228568 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfb3551fe0c..941cada6a10 100644
--- a/tests/baselines/reference/jsDeclarationsClasses.js
+++ b/tests/baselines/reference/jsDeclarationsClasses.js
@@ -204,9 +204,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9fa59e40433..b9174f3a708 100644
--- a/tests/baselines/reference/jsDeclarationsClassesErr.js
+++ b/tests/baselines/reference/jsDeclarationsClassesErr.js
@@ -82,9 +82,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a29d40099cc..d150cbe494f 100644
--- a/tests/baselines/reference/jsDeclarationsDefault.js
+++ b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -77,9 +77,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 14769f07fc3..2e76c79d4c5 100644
--- a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
+++ b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94269ff3774..25493c7dd5c 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.js
+++ b/tests/baselines/reference/jsdocTypeTagCast.js
@@ -87,9 +87,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 11fd8c72359..147df84c5a6 100644
--- a/tests/baselines/reference/jsxCallbackWithDestructuring.js
+++ b/tests/baselines/reference/jsxCallbackWithDestructuring.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e602b8e949e..0a0201b8f65 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d921994e725..48369668d83 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a2ef9bf3796..6527faf3efb 100644
--- a/tests/baselines/reference/jsxInExtendsClause.js
+++ b/tests/baselines/reference/jsxInExtendsClause.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 233d8b8d1fc..a731d60ec21 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 56204c64e9b..46511fed379 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 166f21a9979..4d367e0ab5c 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -667,9 +667,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e6ce8d50c11..bdce4736f1d 100644
--- a/tests/baselines/reference/lambdaArgCrash.js
+++ b/tests/baselines/reference/lambdaArgCrash.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5db64b3e5e3..ab7051e4eda 100644
--- a/tests/baselines/reference/lift.js
+++ b/tests/baselines/reference/lift.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 18eaf3f1b37..11d1a103c5a 100644
--- a/tests/baselines/reference/localTypes1.js
+++ b/tests/baselines/reference/localTypes1.js
@@ -149,9 +149,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c832bf0bb45..fd782b78685 100644
--- a/tests/baselines/reference/m7Bugs.js
+++ b/tests/baselines/reference/m7Bugs.js
@@ -35,9 +35,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f1070604bbd..969aba75845 100644
--- a/tests/baselines/reference/mappedTypePartialConstraints.js
+++ b/tests/baselines/reference/mappedTypePartialConstraints.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 71e0ab2df52..8f9eb7f0e73 100644
--- a/tests/baselines/reference/mergedDeclarations5.js
+++ b/tests/baselines/reference/mergedDeclarations5.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e097a6868a..95d282c2747 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1e5964c78e9..40b99342a4c 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.js
+++ b/tests/baselines/reference/mergedInheritedClassInterface.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1f9f1aac057..e24d6580c97 100644
--- a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0e44c6441f8..f2b7dd8c601 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 149e0ca3437..e11cfef736c 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6977750e44e..6aa9dc86f9d 100644
--- a/tests/baselines/reference/missingPropertiesOfClassExpression.js
+++ b/tests/baselines/reference/missingPropertiesOfClassExpression.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 40bf6cb94c1..fdc8d53f033 100644
--- a/tests/baselines/reference/mixinAccessModifiers.js
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -141,9 +141,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b3c16804410..9c261a62609 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.js
+++ b/tests/baselines/reference/mixinClassesAnnotated.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 426ee329a73..857aaabdaee 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.js
+++ b/tests/baselines/reference/mixinClassesAnonymous.js
@@ -74,9 +74,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 59e94b72b08..71ac2995974 100644
--- a/tests/baselines/reference/mixinClassesMembers.js
+++ b/tests/baselines/reference/mixinClassesMembers.js
@@ -107,9 +107,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e1caf9bf307..cf90daa2032 100644
--- a/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
+++ b/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b1b2804d2e..4b92804a6b0 100644
--- a/tests/baselines/reference/mixinPrivateAndProtected.js
+++ b/tests/baselines/reference/mixinPrivateAndProtected.js
@@ -99,9 +99,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2be97b8e1be..8de21e81ef8 100644
--- a/tests/baselines/reference/mixingApparentTypeOverrides.js
+++ b/tests/baselines/reference/mixingApparentTypeOverrides.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 800feed7f02..2be75e871c4 100644
--- a/tests/baselines/reference/moduleAsBaseType.js
+++ b/tests/baselines/reference/moduleAsBaseType.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 948febd9a17..7be97e8aaf8 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0dd2426f2d6..b60b12c1935 100644
--- a/tests/baselines/reference/moduleNoneOutFile.js
+++ b/tests/baselines/reference/moduleNoneOutFile.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d9a300e4814..941dacde74c 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
@@ -67,9 +67,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 50a22cd1d0d..62252ccce3e 100644
--- a/tests/baselines/reference/multipleInheritance.js
+++ b/tests/baselines/reference/multipleInheritance.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2fc06167b66..de39da0095f 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 073f0346887..e6a5aa12c34 100644
--- a/tests/baselines/reference/mutuallyRecursiveInference.js
+++ b/tests/baselines/reference/mutuallyRecursiveInference.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 77a0e12869b..d2bf3095ff0 100644
--- a/tests/baselines/reference/narrowingOfDottedNames.js
+++ b/tests/baselines/reference/narrowingOfDottedNames.js
@@ -102,9 +102,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c7f34b2afe0..24d0894fbb7 100644
--- a/tests/baselines/reference/neverReturningFunctions1.js
+++ b/tests/baselines/reference/neverReturningFunctions1.js
@@ -259,9 +259,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 98e99c275e3..ac8acff7160 100644
--- a/tests/baselines/reference/newTarget.es5.js
+++ b/tests/baselines/reference/newTarget.es5.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b09a5fff4ea..a2f88424ac1 100644
--- a/tests/baselines/reference/noCrashOnMixin.js
+++ b/tests/baselines/reference/noCrashOnMixin.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 31fe2ba0746..627ac477399 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 04f290c4dc3..0b38f44d2f9 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f58f22d8cab..f7b4231c21b 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
@@ -14,9 +14,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bddf70e93c2..a88f4d95d07 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cf6a801e0ca..afa676fa4f5 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.js
+++ b/tests/baselines/reference/numericIndexerConstraint3.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1327d749ed2..f9a8c67592e 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.js
+++ b/tests/baselines/reference/numericIndexerConstraint4.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d53219bee57..1cdcb546780 100644
--- a/tests/baselines/reference/numericIndexerTyping2.js
+++ b/tests/baselines/reference/numericIndexerTyping2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ae688652efd..d6eb469b401 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.js
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
@@ -64,9 +64,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ec9743c369b..f53155c2fda 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
@@ -63,9 +63,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ada58bded67..1d2029f7608 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
@@ -132,9 +132,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6462cc88cd4..bf650038c10 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
@@ -135,9 +135,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 75e272e63a5..fba7be17950 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
@@ -132,9 +132,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9bf759ee3bf..a458eeb39c4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
@@ -130,9 +130,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3ea79327af2..479b825a96d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f36622caf79..25873414546 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d900e81e504..5c04d4cfdb2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
@@ -132,9 +132,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 268eed44ce2..25633839757 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
@@ -135,9 +135,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c88f02effb7..805d37f27c7 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.js
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2e8e12f1b6e..be011e9d370 100644
--- a/tests/baselines/reference/optionalMethods.js
+++ b/tests/baselines/reference/optionalMethods.js
@@ -65,9 +65,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4778adaf18f..6ee8826b1f6 100644
--- a/tests/baselines/reference/optionalParamArgsTest.js
+++ b/tests/baselines/reference/optionalParamArgsTest.js
@@ -133,9 +133,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df56d1fc907..0dd95dacd6d 100644
--- a/tests/baselines/reference/optionalParamInOverride.js
+++ b/tests/baselines/reference/optionalParamInOverride.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad83510bc04..22b0c8f03d4 100644
--- a/tests/baselines/reference/optionalParameterProperty.js
+++ b/tests/baselines/reference/optionalParameterProperty.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0eebf4ec01a..3b360884eed 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1cd86072193..88329b5db3b 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 6861c54ac13..a4beef4d9fc 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -32,13 +31,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(21, 5) Source(1, 1) + SourceIndex(0)
+1 >Emitted(20, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(22, 9) Source(1, 1) + SourceIndex(0)
+1->Emitted(21, 9) Source(1, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -46,16 +45,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >         ^^^^^^^^^->
 1->export class A { 
 2 >        }
-1->Emitted(23, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(23, 10) Source(1, 19) + SourceIndex(0)
+1->Emitted(22, 9) Source(1, 18) + SourceIndex(0)
+2 >Emitted(22, 10) Source(1, 19) + SourceIndex(0)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(24, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(24, 17) Source(1, 19) + SourceIndex(0)
+1->Emitted(23, 9) Source(1, 18) + SourceIndex(0)
+2 >Emitted(23, 17) Source(1, 19) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
@@ -67,18 +66,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >    }
 3 >     
 4 >     export class A { }
-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)
+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)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(26, 5) Source(1, 14) + SourceIndex(0)
-2 >Emitted(26, 19) Source(1, 15) + SourceIndex(0)
+1->Emitted(25, 5) Source(1, 14) + SourceIndex(0)
+2 >Emitted(25, 19) Source(1, 15) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -94,21 +93,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(32, 5) Source(2, 1) + SourceIndex(1)
+1 >Emitted(31, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(33, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(33, 30) Source(2, 25) + SourceIndex(1)
+1->Emitted(32, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(32, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(34, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(33, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -117,16 +116,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(36, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(36, 10) Source(2, 29) + SourceIndex(1)
+1->Emitted(35, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(35, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(37, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(37, 17) Source(2, 29) + SourceIndex(1)
+1->Emitted(36, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(36, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -142,20 +141,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-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)
+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)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(39, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(39, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(38, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(38, 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 daf40adfdb5..1f721e4359a 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eeed28a88a3..a7a906b7a25 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 d77bf0e86a0..050b60fa6aa 100644
--- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -35,13 +34,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(24, 13) Source(1, 1) + SourceIndex(0)
+1 >Emitted(23, 13) Source(1, 1) + SourceIndex(0)
 ---
 >>>                function A() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(25, 17) Source(1, 1) + SourceIndex(0)
+1->Emitted(24, 17) Source(1, 1) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -49,16 +48,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                 ^^^^^^^^^->
 1->export class A { 
 2 >                }
-1->Emitted(26, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(26, 18) Source(1, 19) + SourceIndex(0)
+1->Emitted(25, 17) Source(1, 18) + SourceIndex(0)
+2 >Emitted(25, 18) Source(1, 19) + SourceIndex(0)
 ---
 >>>                return A;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(27, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(27, 25) Source(1, 19) + SourceIndex(0)
+1->Emitted(26, 17) Source(1, 18) + SourceIndex(0)
+2 >Emitted(26, 25) Source(1, 19) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -70,10 +69,10 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >            }
 3 >             
 4 >             export class A { }
-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)
+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)
 ---
 >>>            exports_1("A", A);
 >>>        }
@@ -82,8 +81,8 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->
   >
 2 >        
-1->Emitted(30, 9) Source(2, 1) + SourceIndex(0)
-2 >Emitted(30, 10) Source(2, 2) + SourceIndex(0)
+1->Emitted(29, 9) Source(2, 1) + SourceIndex(0)
+2 >Emitted(29, 10) Source(2, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -107,21 +106,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(44, 13) Source(2, 1) + SourceIndex(1)
+1 >Emitted(43, 13) Source(2, 1) + SourceIndex(1)
 ---
 >>>                __extends(B, _super);
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >                A
-1->Emitted(45, 17) Source(2, 24) + SourceIndex(1)
-2 >Emitted(45, 38) Source(2, 25) + SourceIndex(1)
+1->Emitted(44, 17) Source(2, 24) + SourceIndex(1)
+2 >Emitted(44, 38) Source(2, 25) + SourceIndex(1)
 ---
 >>>                function B() {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(46, 17) Source(2, 1) + SourceIndex(1)
+1 >Emitted(45, 17) Source(2, 1) + SourceIndex(1)
 ---
 >>>                    return _super !== null && _super.apply(this, arguments) || this;
 >>>                }
@@ -130,16 +129,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >                 ^^^^^^^^^->
 1->export class B extends A { 
 2 >                }
-1->Emitted(48, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(48, 18) Source(2, 29) + SourceIndex(1)
+1->Emitted(47, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(47, 18) Source(2, 29) + SourceIndex(1)
 ---
 >>>                return B;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(49, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(49, 25) Source(2, 29) + SourceIndex(1)
+1->Emitted(48, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(48, 25) Source(2, 29) + SourceIndex(1)
 ---
 >>>            }(a_1.A));
 1 >^^^^^^^^^^^^
@@ -155,12 +154,12 @@ sourceFile:tests/cases/compiler/b.ts
 4 >             export class B extends 
 5 >              A
 6 >                    { }
-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)
+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)
 ---
 >>>            exports_2("B", B);
 >>>        }
@@ -168,8 +167,8 @@ sourceFile:tests/cases/compiler/b.ts
 2 >        ^
 1->
 2 >        
-1->Emitted(52, 9) Source(2, 29) + SourceIndex(1)
-2 >Emitted(52, 10) Source(2, 30) + SourceIndex(1)
+1->Emitted(51, 9) Source(2, 29) + SourceIndex(1)
+2 >Emitted(51, 10) Source(2, 30) + SourceIndex(1)
 ---
 >>>    };
 >>>});
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
index 0da2aab44c2..5d0cbd0f5b2 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b81e3221f79..664558132f4 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 f89bac38001..0475ba6eb3d 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -30,21 +29,21 @@ sourceFile:tests/cases/compiler/ref/b.ts
 3 >                                 ^^^^^^->
 1 >
 2 >/// <reference path="./c.d.ts" />
-1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(17, 34) Source(1, 34) + SourceIndex(0)
+1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(16, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var Foo = /** @class */ (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(18, 1) Source(2, 1) + SourceIndex(0)
+1->Emitted(17, 1) Source(2, 1) + SourceIndex(0)
 ---
 >>>    function Foo() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(18, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -54,16 +53,16 @@ sourceFile:tests/cases/compiler/ref/b.ts
   >	member: Bar;
   >
 2 >    }
-1->Emitted(20, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(20, 6) Source(4, 2) + SourceIndex(0)
+1->Emitted(19, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(19, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return Foo;
 1->^^^^
 2 >    ^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(21, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(21, 15) Source(4, 2) + SourceIndex(0)
+1->Emitted(20, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(20, 15) Source(4, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -77,10 +76,10 @@ sourceFile:tests/cases/compiler/ref/b.ts
 4 > class Foo {
   > 	member: Bar;
   > }
-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)
+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)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -96,21 +95,21 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                                   ^^^^^^->
 1->
 2 >    /// <reference path="./b.ts" />
-1->Emitted(27, 5) Source(1, 1) + SourceIndex(1)
-2 >Emitted(27, 36) Source(1, 32) + SourceIndex(1)
+1->Emitted(26, 5) Source(1, 1) + SourceIndex(1)
+2 >Emitted(26, 36) Source(1, 32) + SourceIndex(1)
 ---
 >>>    var A = /** @class */ (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(28, 5) Source(2, 1) + SourceIndex(1)
+1->Emitted(27, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(29, 9) Source(2, 1) + SourceIndex(1)
+1->Emitted(28, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -120,16 +119,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
   >	member: typeof GlobalFoo;
   >
 2 >        }
-1->Emitted(30, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(30, 10) Source(4, 2) + SourceIndex(1)
+1->Emitted(29, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(29, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(31, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(31, 17) Source(4, 2) + SourceIndex(1)
+1->Emitted(30, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(30, 17) Source(4, 2) + SourceIndex(1)
 ---
 >>>    }());
 1 >^^^^
@@ -143,18 +142,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >     export class A {
   >     	member: typeof GlobalFoo;
   >     }
-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)
+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)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(33, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(33, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(32, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(32, 19) Source(2, 15) + SourceIndex(1)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -170,21 +169,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(39, 5) Source(2, 1) + SourceIndex(2)
+1 >Emitted(38, 5) Source(2, 1) + SourceIndex(2)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(40, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(40, 30) Source(2, 25) + SourceIndex(2)
+1->Emitted(39, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(39, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(41, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(40, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -193,16 +192,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(43, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(43, 10) Source(2, 29) + SourceIndex(2)
+1->Emitted(42, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(42, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(44, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(44, 17) Source(2, 29) + SourceIndex(2)
+1->Emitted(43, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(43, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -218,20 +217,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-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)
+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)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(46, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(46, 19) Source(2, 15) + SourceIndex(2)
+1->Emitted(45, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(45, 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 4405bf7c8df..69f8c063453 100644
--- a/tests/baselines/reference/overload1.js
+++ b/tests/baselines/reference/overload1.js
@@ -48,9 +48,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7cb2efd947c..db5019c35c9 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e12ff81fd12..34961cd5c7c 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7f413ff3e5..9e94af61b6f 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eeeb0717ff8..8e4558e0bfa 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ee2d71cf0a9..fe23d72dc21 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b8f69215ce9..3e7ec7be445 100644
--- a/tests/baselines/reference/overloadResolution.js
+++ b/tests/baselines/reference/overloadResolution.js
@@ -103,9 +103,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2193425996..f0878fbaa93 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.js
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.js
@@ -110,9 +110,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f5ad8ac1839..2d0bce82f56 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.js
+++ b/tests/baselines/reference/overloadResolutionConstructors.js
@@ -111,9 +111,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 baaeb86eb6d..a290f00402b 100644
--- a/tests/baselines/reference/overloadingOnConstants1.js
+++ b/tests/baselines/reference/overloadingOnConstants1.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5d21dd547ed..bbe734f79cd 100644
--- a/tests/baselines/reference/overloadingOnConstants2.js
+++ b/tests/baselines/reference/overloadingOnConstants2.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 697131ab8ed..fa626a6886d 100644
--- a/tests/baselines/reference/overrideBaseIntersectionMethod.js
+++ b/tests/baselines/reference/overrideBaseIntersectionMethod.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 114aa968d45..45a3e297d6f 100644
--- a/tests/baselines/reference/overridingPrivateStaticMembers.js
+++ b/tests/baselines/reference/overridingPrivateStaticMembers.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 951de322d75..709ba3cb1a5 100644
--- a/tests/baselines/reference/parseErrorInHeritageClause1.js
+++ b/tests/baselines/reference/parseErrorInHeritageClause1.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 061489933ac..52958aeb8b1 100644
--- a/tests/baselines/reference/parser509630.js
+++ b/tests/baselines/reference/parser509630.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b2f0649ae9c..7fcaba5f2af 100644
--- a/tests/baselines/reference/parserAstSpans1.js
+++ b/tests/baselines/reference/parserAstSpans1.js
@@ -228,9 +228,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 adb0aa59cc4..b1bbca204aa 100644
--- a/tests/baselines/reference/parserClassDeclaration1.js
+++ b/tests/baselines/reference/parserClassDeclaration1.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8f32ccd4b1a..4c59bce599a 100644
--- a/tests/baselines/reference/parserClassDeclaration3.js
+++ b/tests/baselines/reference/parserClassDeclaration3.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ad3de685e4e..5a8c897b3b5 100644
--- a/tests/baselines/reference/parserClassDeclaration4.js
+++ b/tests/baselines/reference/parserClassDeclaration4.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 060a81492f4..7516593953b 100644
--- a/tests/baselines/reference/parserClassDeclaration5.js
+++ b/tests/baselines/reference/parserClassDeclaration5.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b74c78df764..5e9515a6bd6 100644
--- a/tests/baselines/reference/parserClassDeclaration6.js
+++ b/tests/baselines/reference/parserClassDeclaration6.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f47cd7cae02..fd84e40f29c 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 93e5e579360..7a7a4560fd4 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4069a34360c..17937b4db6b 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 16ca6a0704f..7c81cf05d50 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb967d32950..82bf0a715ba 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b55289f9efc..9f16800d3a3 100644
--- a/tests/baselines/reference/parserRealSource10.js
+++ b/tests/baselines/reference/parserRealSource10.js
@@ -466,9 +466,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 384b89cd525..182f2c8cf30 100644
--- a/tests/baselines/reference/parserRealSource11.js
+++ b/tests/baselines/reference/parserRealSource11.js
@@ -2375,9 +2375,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b96a879fa03..b49f85e7e42 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2104,9 +2104,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 005af817d22..a959fb8efd7 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e54c78e7cec..e4a55c74969 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e4e889ca71d..d8bfb663ae7 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e90891e3f1a..dd5a08e9b51 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -137,9 +137,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0db9898a07b..0c5b48ca4a2 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -106,9 +106,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -305,9 +304,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c20a6d17a30..577263c8ad8 100644
--- a/tests/baselines/reference/privacyGloClass.js
+++ b/tests/baselines/reference/privacyGloClass.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f43d4d3039f..4f6b4586b15 100644
--- a/tests/baselines/reference/privateAccessInSubclass1.js
+++ b/tests/baselines/reference/privateAccessInSubclass1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 85b6eb408b5..92fcfb0648c 100644
--- a/tests/baselines/reference/privateInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/privateInstanceMemberAccessibility.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7695f95f952..46618b80e2f 100644
--- a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
+++ b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b058e6e4ed..d508a3e4a80 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.js
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d1192072623..93d6de686a3 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67edbb32c76..0d5d8a620cd 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 67edbb32c76..0d5d8a620cd 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1a64f288ebb..5fa132a8f28 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/out.js
+++ b/tests/baselines/reference/project/prologueEmit/amd/out.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1a64f288ebb..5fa132a8f28 100644
--- a/tests/baselines/reference/project/prologueEmit/node/out.js
+++ b/tests/baselines/reference/project/prologueEmit/node/out.js
@@ -6,9 +6,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0a0b0ec9d43..c8adc86478b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
@@ -7,9 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0a0b0ec9d43..c8adc86478b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
@@ -7,9 +7,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2caa4f9aff4..c2e73029b7c 100644
--- a/tests/baselines/reference/propertiesAndIndexers.js
+++ b/tests/baselines/reference/propertiesAndIndexers.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5fe7cc85599..093b780a62f 100644
--- a/tests/baselines/reference/propertyAccess.js
+++ b/tests/baselines/reference/propertyAccess.js
@@ -159,9 +159,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cc40b669491..c494c4dc8d6 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
@@ -91,9 +91,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ee4a4553559..27929ebf3ad 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
@@ -66,9 +66,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dab1983f8a7..1a4f0a27f2e 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d6f89d3d44a..014a5013ec9 100644
--- a/tests/baselines/reference/propertyOverridesAccessors4.js
+++ b/tests/baselines/reference/propertyOverridesAccessors4.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f701af5227d..6c0588fd1cd 100644
--- a/tests/baselines/reference/propertyOverridingPrototype.js
+++ b/tests/baselines/reference/propertyOverridingPrototype.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0718ddf1a2e..d6fdf461e6a 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 58adf2a7e32..f2de756499e 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
@@ -123,9 +123,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 657cbbc62f2..1485e5102cf 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c784adc5070..1f9c6c354f4 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
@@ -103,9 +103,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d60de9a2278..939ae7bab7a 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4f2a7b479da..e621bd73dfb 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b5ef7a42d14..2c57eefd5d6 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -124,9 +124,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 092e0d760bc..dd395868cbc 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4d5dff9bfbe..e050ca7f282 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08941e71f91..356fe07017c 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,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 085a4df0905..12005b16c32 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
@@ -79,9 +79,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aa2b6137d93..08d074a09b1 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.js
+++ b/tests/baselines/reference/reactHOCSpreadprops.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8989621f076..1a659a73636 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d823384e47e..92bb9126a13 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -157,9 +157,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 13f10b8d70f..21c9b2ee2d0 100644
--- a/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
+++ b/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d83fe78e86..9f19d092270 100644
--- a/tests/baselines/reference/readonlyConstructorAssignment.js
+++ b/tests/baselines/reference/readonlyConstructorAssignment.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fef99a0e1c1..18df2b2d54d 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.js
+++ b/tests/baselines/reference/recursiveBaseCheck3.js
@@ -13,9 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2c483b0a0ee..5eb66b604fb 100644
--- a/tests/baselines/reference/recursiveBaseCheck4.js
+++ b/tests/baselines/reference/recursiveBaseCheck4.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df5d3b06b73..b4ba9660754 100644
--- a/tests/baselines/reference/recursiveBaseCheck6.js
+++ b/tests/baselines/reference/recursiveBaseCheck6.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68b7bf6319e..cc503899c22 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
@@ -15,9 +15,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0b869b23b20..175d78620b4 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c4c68166bf8..7aea03bd667 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js
@@ -113,9 +113,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b87b394c3d6..84f26cd4967 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 2540891baa0..9e6e801affa 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -34,9 +34,8 @@ 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 __());
@@ -92,10 +91,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >          		}
   >          	}
   >          }
-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)
+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)
 ---
 >>>(function (Sample) {
 1->
@@ -104,9 +103,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >module 
 3 >           Sample
-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)
+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)
 ---
 >>>    var Actions;
 1 >^^^^
@@ -128,10 +127,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >               		}
   >               	}
   >               }
-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)
+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)
 ---
 >>>    (function (Actions) {
 1->^^^^
@@ -140,9 +139,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Actions
-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)
+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)
 ---
 >>>        var Thing;
 1 >^^^^^^^^
@@ -164,10 +163,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		}
   >                 	}
   >                 }
-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)
+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)
 ---
 >>>        (function (Thing_1) {
 1->^^^^^^^^
@@ -176,9 +175,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Thing
-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)
+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)
 ---
 >>>            var Find;
 1 >^^^^^^^^^^^^
@@ -200,10 +199,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>            (function (Find) {
 1->^^^^^^^^^^^^
@@ -213,22 +212,22 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       Find
-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)
+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)
 ---
 >>>                var StartFindAction = /** @class */ (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >	
-1->Emitted(27, 17) Source(33, 2) + SourceIndex(0)
+1->Emitted(26, 17) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    function StartFindAction() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(28, 21) Source(33, 2) + SourceIndex(0)
+1->Emitted(27, 21) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -244,8 +243,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		}
   >	
 2 >                    }
-1->Emitted(29, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(29, 22) Source(41, 3) + SourceIndex(0)
+1->Emitted(28, 21) Source(41, 2) + SourceIndex(0)
+2 >Emitted(28, 22) Source(41, 3) + SourceIndex(0)
 ---
 >>>                    StartFindAction.prototype.getId = function () { return "yo"; };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -266,15 +265,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                               ;
 8 >                                                                                 
 9 >                                                                                 }
-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)
+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)
 ---
 >>>                    StartFindAction.prototype.run = function (Thing) {
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -289,11 +288,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                                 
 4 >                                                    public run(
 5 >                                                              Thing:Sample.Thing.ICodeThing
-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)
+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)
 ---
 >>>                        return true;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -306,10 +305,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               true
 4 >                                   ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -318,8 +317,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(33, 21) Source(40, 3) + SourceIndex(0)
-2 >Emitted(33, 22) Source(40, 4) + SourceIndex(0)
+1 >Emitted(32, 21) Source(40, 3) + SourceIndex(0)
+2 >Emitted(32, 22) Source(40, 4) + SourceIndex(0)
 ---
 >>>                    return StartFindAction;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -327,8 +326,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
 2 >                    }
-1->Emitted(34, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(34, 43) Source(41, 3) + SourceIndex(0)
+1->Emitted(33, 21) Source(41, 2) + SourceIndex(0)
+2 >Emitted(33, 43) Source(41, 3) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -348,10 +347,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 			return true;
   >                 		}
   >                 	}
-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)
+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)
 ---
 >>>                Find.StartFindAction = StartFindAction;
 1->^^^^^^^^^^^^^^^^
@@ -371,10 +370,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                    		}
   >                                    	}
 4 >                                                      
-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)
+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)
 ---
 >>>            })(Find = Thing_1.Find || (Thing_1.Find = {}));
 1->^^^^^^^^^^^^
@@ -406,15 +405,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                   		}
   >                                                   	}
   >                                                   }
-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)
+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)
 ---
 >>>        })(Thing = Actions.Thing || (Actions.Thing = {}));
 1 >^^^^^^^^
@@ -446,15 +445,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-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)
+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)
 ---
 >>>    })(Actions = Sample.Actions || (Sample.Actions = {}));
 1->^^^^
@@ -485,15 +484,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-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)
+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)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -520,13 +519,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>(function (Sample) {
 1 >
@@ -537,9 +536,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-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)
+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)
 ---
 >>>    var Thing;
 1 >^^^^
@@ -571,10 +570,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-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)
+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)
 ---
 >>>    (function (Thing) {
 1->^^^^
@@ -584,9 +583,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-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)
+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)
 ---
 >>>        var Widgets;
 1->^^^^^^^^
@@ -618,10 +617,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                   
   >                   	}
   >                   }
-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)
+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)
 ---
 >>>        (function (Widgets) {
 1->^^^^^^^^
@@ -631,16 +630,16 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Widgets
-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)
+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)
 ---
 >>>            var FindWidget = /** @class */ (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >	
-1->Emitted(46, 13) Source(45, 2) + SourceIndex(0)
+1->Emitted(45, 13) Source(45, 2) + SourceIndex(0)
 ---
 >>>                function FindWidget(codeThing) {
 1->^^^^^^^^^^^^^^^^
@@ -655,9 +654,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		
 2 >                constructor(private 
 3 >                                    codeThing: Sample.Thing.ICodeThing
-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)
+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)
 ---
 >>>                    this.codeThing = codeThing;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -670,11 +669,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                  
 4 >                                     codeThing
 5 >                                              : Sample.Thing.ICodeThing
-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)
+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)
 ---
 >>>                    this.domNode = null;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -687,11 +686,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                :any = 
 4 >                                   null
 5 >                                       ;
-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)
+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)
 ---
 >>>                    // scenario 1
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -701,8 +700,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		constructor(private codeThing: Sample.Thing.ICodeThing) {
   >		    
 2 >                    // scenario 1
-1 >Emitted(50, 21) Source(51, 7) + SourceIndex(0)
-2 >Emitted(50, 34) Source(51, 20) + SourceIndex(0)
+1 >Emitted(49, 21) Source(51, 7) + SourceIndex(0)
+2 >Emitted(49, 34) Source(51, 20) + SourceIndex(0)
 ---
 >>>                    codeThing.addWidget("addWidget", this);
 1->^^^^^^^^^^^^^^^^^^^^
@@ -726,16 +725,16 @@ sourceFile:recursiveClassReferenceTest.ts
 8 >                                                     this
 9 >                                                         )
 10>                                                          ;
-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->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 >^^^^^^^^^^^^^^^^
@@ -744,8 +743,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(52, 17) Source(53, 3) + SourceIndex(0)
-2 >Emitted(52, 18) Source(53, 4) + SourceIndex(0)
+1 >Emitted(51, 17) Source(53, 3) + SourceIndex(0)
+2 >Emitted(51, 18) Source(53, 4) + SourceIndex(0)
 ---
 >>>                FindWidget.prototype.gar = function (runner) { if (true) {
 1->^^^^^^^^^^^^^^^^
@@ -766,15 +765,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                               if (
 8 >                                                                   true
 9 >                                                                       ) 
-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)
+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)
 ---
 >>>                    return runner(this);
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -791,13 +790,13 @@ sourceFile:recursiveClassReferenceTest.ts
 5 >                                  this
 6 >                                      )
 7 >                                       ;
-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 >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 >^^^^^^^^^^^^^^^^^
@@ -807,9 +806,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >}
 2 >                 
 3 >                  }
-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)
+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)
 ---
 >>>                FindWidget.prototype.getDomNode = function () {
 1->^^^^^^^^^^^^^^^^
@@ -826,9 +825,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                getDomNode
 3 >                                               
-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)
+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)
 ---
 >>>                    return domNode;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -840,10 +839,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                    return 
 3 >                           domNode
 4 >                                  ;
-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 >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 >^^^^^^^^^^^^^^^^
@@ -852,8 +851,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(58, 17) Source(57, 3) + SourceIndex(0)
-2 >Emitted(58, 18) Source(57, 4) + SourceIndex(0)
+1 >Emitted(57, 17) Source(57, 3) + SourceIndex(0)
+2 >Emitted(57, 18) Source(57, 4) + SourceIndex(0)
 ---
 >>>                FindWidget.prototype.destroy = function () {
 1->^^^^^^^^^^^^^^^^
@@ -864,9 +863,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                destroy
 3 >                                            
-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->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 >^^^^^^^^^^^^^^^^
@@ -876,8 +875,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >		
 2 >                }
-1 >Emitted(60, 17) Source(61, 3) + SourceIndex(0)
-2 >Emitted(60, 18) Source(61, 4) + SourceIndex(0)
+1 >Emitted(59, 17) Source(61, 3) + SourceIndex(0)
+2 >Emitted(59, 18) Source(61, 4) + SourceIndex(0)
 ---
 >>>                return FindWidget;
 1->^^^^^^^^^^^^^^^^
@@ -886,8 +885,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                }
-1->Emitted(61, 17) Source(63, 2) + SourceIndex(0)
-2 >Emitted(61, 34) Source(63, 3) + SourceIndex(0)
+1->Emitted(60, 17) Source(63, 2) + SourceIndex(0)
+2 >Emitted(60, 34) Source(63, 3) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -917,10 +916,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             		}
   >             
   >             	}
-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)
+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)
 ---
 >>>            Widgets.FindWidget = FindWidget;
 1->^^^^^^^^^^^^
@@ -950,10 +949,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                           
-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)
+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)
 ---
 >>>        })(Widgets = Thing.Widgets || (Thing.Widgets = {}));
 1->^^^^^^^^
@@ -995,15 +994,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                    
   >                                                    	}
   >                                                    }
-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)
+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)
 ---
 >>>    })(Thing = Sample.Thing || (Sample.Thing = {}));
 1 >^^^^
@@ -1044,15 +1043,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-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)
+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)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -1090,13 +1089,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>var AbstractMode = /** @class */ (function () {
 1->
@@ -1105,13 +1104,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >interface IMode { getInitialState(): IState;} 
   >
-1->Emitted(67, 1) Source(67, 1) + SourceIndex(0)
+1->Emitted(66, 1) Source(67, 1) + SourceIndex(0)
 ---
 >>>    function AbstractMode() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(68, 5) Source(67, 1) + SourceIndex(0)
+1->Emitted(67, 5) Source(67, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -1119,8 +1118,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->class AbstractMode implements IMode { public getInitialState(): IState { return null;} 
 2 >    }
-1->Emitted(69, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(69, 6) Source(67, 89) + SourceIndex(0)
+1->Emitted(68, 5) Source(67, 88) + SourceIndex(0)
+2 >Emitted(68, 6) Source(67, 89) + SourceIndex(0)
 ---
 >>>    AbstractMode.prototype.getInitialState = function () { return null; };
 1->^^^^
@@ -1141,23 +1140,23 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                      ;
 8 >                                                                       
 9 >                                                                        }
-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)
+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)
 ---
 >>>    return AbstractMode;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^
 1 > 
 2 >    }
-1 >Emitted(71, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(71, 24) Source(67, 89) + SourceIndex(0)
+1 >Emitted(70, 5) Source(67, 88) + SourceIndex(0)
+2 >Emitted(70, 24) Source(67, 89) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -1169,10 +1168,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >}
 3 > 
 4 > class AbstractMode implements IMode { public getInitialState(): IState { return null;} }
-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)
+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)
 ---
 >>>(function (Sample) {
 1->
@@ -1190,9 +1189,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-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)
+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)
 ---
 >>>    var Thing;
 1 >^^^^
@@ -1228,10 +1227,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-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)
+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)
 ---
 >>>    (function (Thing) {
 1->^^^^
@@ -1241,9 +1240,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-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)
+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)
 ---
 >>>        var Languages;
 1->^^^^^^^^
@@ -1279,10 +1278,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                     
   >                     	}
   >                     }
-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)
+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)
 ---
 >>>        (function (Languages) {
 1->^^^^^^^^
@@ -1291,9 +1290,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Languages
-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)
+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)
 ---
 >>>            var PlainText;
 1 >^^^^^^^^^^^^
@@ -1329,10 +1328,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                         
   >                         	}
   >                         }
-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)
+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)
 ---
 >>>            (function (PlainText) {
 1->^^^^^^^^^^^^
@@ -1342,9 +1341,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       PlainText
-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)
+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)
 ---
 >>>                var State = /** @class */ (function () {
 1->^^^^^^^^^^^^^^^^
@@ -1352,7 +1351,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1-> {
   >	
   >	
-1->Emitted(80, 17) Source(78, 2) + SourceIndex(0)
+1->Emitted(79, 17) Source(78, 2) + SourceIndex(0)
 ---
 >>>                    function State(mode) {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1363,9 +1362,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >        
 2 >                    constructor(private 
 3 >                                   mode: IMode
-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)
+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)
 ---
 >>>                        this.mode = mode;
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1378,11 +1377,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 
 4 >                                    mode
 5 >                                        : IMode
-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->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 >^^^^^^^^^^^^^^^^^^^^
@@ -1390,8 +1389,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >) { 
 2 >                    }
-1 >Emitted(83, 21) Source(79, 44) + SourceIndex(0)
-2 >Emitted(83, 22) Source(79, 45) + SourceIndex(0)
+1 >Emitted(82, 21) Source(79, 44) + SourceIndex(0)
+2 >Emitted(82, 22) Source(79, 45) + SourceIndex(0)
 ---
 >>>                    State.prototype.clone = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1401,9 +1400,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    clone
 3 >                                         
-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)
+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)
 ---
 >>>                        return this;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1415,10 +1414,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               this
 4 >                                   ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -1427,8 +1426,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(86, 21) Source(82, 3) + SourceIndex(0)
-2 >Emitted(86, 22) Source(82, 4) + SourceIndex(0)
+1 >Emitted(85, 21) Source(82, 3) + SourceIndex(0)
+2 >Emitted(85, 22) Source(82, 4) + SourceIndex(0)
 ---
 >>>                    State.prototype.equals = function (other) {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1443,11 +1442,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                          
 4 >                                             public equals(
 5 >                                                       other:IState
-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)
+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)
 ---
 >>>                        return this === other;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1463,12 +1462,12 @@ sourceFile:recursiveClassReferenceTest.ts
 4 >                                    === 
 5 >                                        other
 6 >                                             ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -1477,8 +1476,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(89, 21) Source(86, 3) + SourceIndex(0)
-2 >Emitted(89, 22) Source(86, 4) + SourceIndex(0)
+1 >Emitted(88, 21) Source(86, 3) + SourceIndex(0)
+2 >Emitted(88, 22) Source(86, 4) + SourceIndex(0)
 ---
 >>>                    State.prototype.getMode = function () { return mode; };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1501,15 +1500,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                       ;
 8 >                                                                         
 9 >                                                                         }
-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)
+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)
 ---
 >>>                    return State;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1517,8 +1516,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >	
 2 >                    }
-1 >Emitted(91, 21) Source(89, 2) + SourceIndex(0)
-2 >Emitted(91, 33) Source(89, 3) + SourceIndex(0)
+1 >Emitted(90, 21) Source(89, 2) + SourceIndex(0)
+2 >Emitted(90, 33) Source(89, 3) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -1541,10 +1540,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		
   >                 		public getMode(): IMode { return mode; }
   >                 	}
-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)
+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)
 ---
 >>>                PlainText.State = State;
 1->^^^^^^^^^^^^^^^^
@@ -1567,10 +1566,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                               		public getMode(): IMode { return mode; }
   >                               	}
 4 >                                       
-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)
+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)
 ---
 >>>                var Mode = /** @class */ (function (_super) {
 1->^^^^^^^^^^^^^^^^
@@ -1578,21 +1577,21 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
   >	
-1->Emitted(94, 17) Source(91, 2) + SourceIndex(0)
+1->Emitted(93, 17) Source(91, 2) + SourceIndex(0)
 ---
 >>>                    __extends(Mode, _super);
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^
 1->export class Mode extends 
 2 >                    AbstractMode
-1->Emitted(95, 21) Source(91, 28) + SourceIndex(0)
-2 >Emitted(95, 45) Source(91, 40) + SourceIndex(0)
+1->Emitted(94, 21) Source(91, 28) + SourceIndex(0)
+2 >Emitted(94, 45) Source(91, 40) + SourceIndex(0)
 ---
 >>>                    function Mode() {
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(96, 21) Source(91, 2) + SourceIndex(0)
+1 >Emitted(95, 21) Source(91, 2) + SourceIndex(0)
 ---
 >>>                        return _super !== null && _super.apply(this, arguments) || this;
 >>>                    }
@@ -1609,8 +1608,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(98, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(98, 22) Source(99, 3) + SourceIndex(0)
+1->Emitted(97, 21) Source(99, 2) + SourceIndex(0)
+2 >Emitted(97, 22) Source(99, 3) + SourceIndex(0)
 ---
 >>>                    // scenario 2
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1618,8 +1617,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >                    // scenario 2
-1->Emitted(99, 21) Source(93, 3) + SourceIndex(0)
-2 >Emitted(99, 34) Source(93, 16) + SourceIndex(0)
+1->Emitted(98, 21) Source(93, 3) + SourceIndex(0)
+2 >Emitted(98, 34) Source(93, 16) + SourceIndex(0)
 ---
 >>>                    Mode.prototype.getInitialState = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1629,9 +1628,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    getInitialState
 3 >                                                  
-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)
+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)
 ---
 >>>                        return new State(self);
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1651,14 +1650,14 @@ sourceFile:recursiveClassReferenceTest.ts
 6 >                                         self
 7 >                                             )
 8 >                                              ;
-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 >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 >^^^^^^^^^^^^^^^^^^^^
@@ -1667,8 +1666,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(102, 21) Source(96, 3) + SourceIndex(0)
-2 >Emitted(102, 22) Source(96, 4) + SourceIndex(0)
+1 >Emitted(101, 21) Source(96, 3) + SourceIndex(0)
+2 >Emitted(101, 22) Source(96, 4) + SourceIndex(0)
 ---
 >>>                    return Mode;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1679,8 +1678,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(103, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(103, 32) Source(99, 3) + SourceIndex(0)
+1->Emitted(102, 21) Source(99, 2) + SourceIndex(0)
+2 >Emitted(102, 32) Source(99, 3) + SourceIndex(0)
 ---
 >>>                }(AbstractMode));
 1->^^^^^^^^^^^^^^^^
@@ -1704,12 +1703,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              
   >                              	}
-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)
+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)
 ---
 >>>                PlainText.Mode = Mode;
 1->^^^^^^^^^^^^^^^^
@@ -1729,10 +1728,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                     
-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)
+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)
 ---
 >>>            })(PlainText = Languages.PlainText || (Languages.PlainText = {}));
 1->^^^^^^^^^^^^
@@ -1778,15 +1777,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                                      
   >                                                                      	}
   >                                                                      }
-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)
+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)
 ---
 >>>        })(Languages = Thing.Languages || (Thing.Languages = {}));
 1 >^^^^^^^^
@@ -1831,15 +1830,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                          
   >                                                          	}
   >                                                          }
-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)
+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)
 ---
 >>>    })(Thing = Sample.Thing || (Sample.Thing = {}));
 1 >^^^^
@@ -1884,15 +1883,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-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)
+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)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -1934,12 +1933,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-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)
+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)
 ---
 >>>//# 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 40f1639a939..2522ca4b0d2 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.js
+++ b/tests/baselines/reference/recursiveComplicatedClasses.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dd14ea1a9d1..c6b2ea0035d 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
@@ -38,9 +38,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8328751cd86..a85b9ffab0c 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7e5a2a8bf5b..5cc4b488403 100644
--- a/tests/baselines/reference/reexportDefaultIsCallable.js
+++ b/tests/baselines/reference/reexportDefaultIsCallable.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 31cb28a6533..208319f09c3 100644
--- a/tests/baselines/reference/reexportedMissingAlias.js
+++ b/tests/baselines/reference/reexportedMissingAlias.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b50b355ae09..597a579bd24 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -1028,9 +1028,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9f877e88132..463699011fc 100644
--- a/tests/baselines/reference/returnInConstructor1.js
+++ b/tests/baselines/reference/returnInConstructor1.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c0631fd81ca..a680fafa9a2 100644
--- a/tests/baselines/reference/returnStatements.js
+++ b/tests/baselines/reference/returnStatements.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6b81f995977..e5571e7464c 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 56737a58b50..f78000a85a2 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3272f2911f0..cd34e4f0fab 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 77635c5db9f..c9b87d76832 100644
--- a/tests/baselines/reference/scopeTests.js
+++ b/tests/baselines/reference/scopeTests.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0c70690dac3..0d217106264 100644
--- a/tests/baselines/reference/shadowPrivateMembers.js
+++ b/tests/baselines/reference/shadowPrivateMembers.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4e63f2b4b35..d93cac3514f 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d4bd460dbb..02fcbdc9341 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 6d0938a5750..338b47d1d21 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
@@ -16,9 +16,8 @@ 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 __());
@@ -28,13 +27,13 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function AbstractGreeter() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(18, 5) Source(1, 1) + SourceIndex(0)
+1->Emitted(17, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -43,16 +42,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->class AbstractGreeter {
   >
 2 >    }
-1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(19, 6) Source(2, 2) + SourceIndex(0)
+1->Emitted(18, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(18, 6) Source(2, 2) + SourceIndex(0)
 ---
 >>>    return AbstractGreeter;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(20, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(20, 27) Source(2, 2) + SourceIndex(0)
+1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(19, 27) Source(2, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -65,10 +64,10 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 > 
 4 > class AbstractGreeter {
   > }
-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)
+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)
 ---
 >>>var Greeter = /** @class */ (function (_super) {
 1->
@@ -76,21 +75,21 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->
   >
   >
-1->Emitted(22, 1) Source(4, 1) + SourceIndex(0)
+1->Emitted(21, 1) Source(4, 1) + SourceIndex(0)
 ---
 >>>    __extends(Greeter, _super);
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->class Greeter extends 
 2 >    AbstractGreeter
-1->Emitted(23, 5) Source(4, 23) + SourceIndex(0)
-2 >Emitted(23, 32) Source(4, 38) + SourceIndex(0)
+1->Emitted(22, 5) Source(4, 23) + SourceIndex(0)
+2 >Emitted(22, 32) Source(4, 38) + SourceIndex(0)
 ---
 >>>    function Greeter() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(24, 5) Source(4, 1) + SourceIndex(0)
+1 >Emitted(23, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>        var _this = _super !== null && _super.apply(this, arguments) || this;
 1->^^^^^^^^
@@ -100,8 +99,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >            public a = 10;
   >            public nameA = "Ten";
   >        }
-1->Emitted(25, 9) Source(4, 1) + SourceIndex(0)
-2 >Emitted(25, 78) Source(7, 2) + SourceIndex(0)
+1->Emitted(24, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(24, 78) Source(7, 2) + SourceIndex(0)
 ---
 >>>        _this.a = 10;
 1 >^^^^^^^^
@@ -115,11 +114,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                = 
 4 >                  10
 5 >                    ;
-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)
+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)
 ---
 >>>        _this.nameA = "Ten";
 1->^^^^^^^^
@@ -133,11 +132,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                    = 
 4 >                      "Ten"
 5 >                           ;
-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)
+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)
 ---
 >>>        return _this;
 >>>    }
@@ -147,8 +146,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
   >
 2 >    }
-1 >Emitted(29, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(29, 6) Source(7, 2) + SourceIndex(0)
+1 >Emitted(28, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(28, 6) Source(7, 2) + SourceIndex(0)
 ---
 >>>    return Greeter;
 1->^^^^
@@ -156,8 +155,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                  ^^^->
 1->
 2 >    }
-1->Emitted(30, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(30, 19) Source(7, 2) + SourceIndex(0)
+1->Emitted(29, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(29, 19) Source(7, 2) + SourceIndex(0)
 ---
 >>>}(AbstractGreeter));
 1->
@@ -176,11 +175,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >                     public a = 10;
   >                     public nameA = "Ten";
   >                 }
-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)
+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)
 ---
 >>>//# 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 b355546aaf7..5fe0e4c1d72 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.js
+++ b/tests/baselines/reference/specializedInheritedConstructors1.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9f6b85b560..20bdea5d383 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.js
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1b4234922c4..5a3cf95ecb4 100644
--- a/tests/baselines/reference/staticFactory1.js
+++ b/tests/baselines/reference/staticFactory1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 90fb0252437..64c8620281d 100644
--- a/tests/baselines/reference/staticInheritance.js
+++ b/tests/baselines/reference/staticInheritance.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d4990d38b64..f214d36d6cc 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6dabb115729..b2882f9678d 100644
--- a/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
+++ b/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 31781a40d28..b071e6dba8d 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa5b69de450..75ffa4ec2ce 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -69,9 +69,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 baae2b5408e..d762aff68f8 100644
--- a/tests/baselines/reference/strictModeReservedWord.js
+++ b/tests/baselines/reference/strictModeReservedWord.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79f2fd4d226..9818d4c3cce 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9ccba0029bf..5a959a81e57 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7804c003c2d..80819867c0e 100644
--- a/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
+++ b/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 abfbab4b9d7..186b6c60809 100644
--- a/tests/baselines/reference/subtypesOfTypeParameter.js
+++ b/tests/baselines/reference/subtypesOfTypeParameter.js
@@ -115,9 +115,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f5bbcaa5b13..267ebc5aa2a 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
@@ -177,9 +177,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cb7c4ec7f0d..7fc78fef16a 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
@@ -88,9 +88,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1845966cb67..56869ee2ad0 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
@@ -167,9 +167,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cfc66d95a15..e951bbaba58 100644
--- a/tests/baselines/reference/subtypingTransitivity.js
+++ b/tests/baselines/reference/subtypingTransitivity.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 89a13ff13eb..d70673825a4 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -182,9 +182,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ec15d8dc63c..d2b9399eee8 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -129,9 +129,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 287908e373b..270ea29a4c8 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.js
@@ -121,9 +121,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8af59214c18..03a17252477 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js
@@ -182,9 +182,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 765e2f2b388..a16f4677525 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js
@@ -131,9 +131,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aeb7f1bd193..2a13d91c225 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js
@@ -121,9 +121,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d81166ce7fc..c3459967680 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1e7b9752a88..b0e07126be0 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.js
@@ -62,9 +62,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92862f6b327..61d1243a056 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3842353a421..1e125e56b5b 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6273a0a6e6f..32e083ab8bd 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5e7afcedee6..8393fdb0fca 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 752c9ea52c5..1fc3784fefe 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 93de82e6777..5420c3c3399 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b8cc088d3d6..e95ae5f90d7 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
@@ -71,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c24d80f1470..602d8952842 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer.js
@@ -50,9 +50,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dea9dc21f27..85e617304cf 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 32e6151eaf2..f086a80dc3f 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8ad74974054..58b2d058a42 100644
--- a/tests/baselines/reference/super.js
+++ b/tests/baselines/reference/super.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f512611bf9d..6a57c71030a 100644
--- a/tests/baselines/reference/super1.js
+++ b/tests/baselines/reference/super1.js
@@ -75,9 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c7e5082ba6c..bfe5160184d 100644
--- a/tests/baselines/reference/super2.js
+++ b/tests/baselines/reference/super2.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2b2d1828aad..65c71d5551f 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 33e88304123..1cd4e446dac 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3203e0e1d63..0df0acc27aa 100644
--- a/tests/baselines/reference/superAccessCastedCall.js
+++ b/tests/baselines/reference/superAccessCastedCall.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 18cf1dfb7b2..e689e55aea4 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.js
+++ b/tests/baselines/reference/superAccessInFatArrow1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8f960589185..fe683a2eb06 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.js
+++ b/tests/baselines/reference/superCallArgsMustMatch.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 da1e783e845..ded81aa902c 100644
--- a/tests/baselines/reference/superCallAssignResult.js
+++ b/tests/baselines/reference/superCallAssignResult.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cd4a3b01b10..b9041fe2ea1 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 46aef974712..69c3e36c5cd 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aa8e5d18b89..c5d69413454 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 df968b2ec5e..192615a8386 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 983d72ed404..5a0e1b4b532 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.js
@@ -16,9 +16,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6623d55985e..df6111c2968 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5c76d43f480..3e54ea4919e 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7ff0ab7f429..846b10236b2 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a1468ab1ff7..dd53198d5f5 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7924c74a82b..0519c6979e7 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dc6c9c34d35..e0617a91ad0 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 91f258602e6..4f6ba1f6ceb 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c19ba063c5d..b4ecbb6d0b6 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 24fb622ccc4..40422e84749 100644
--- a/tests/baselines/reference/superCallInNonStaticMethod.js
+++ b/tests/baselines/reference/superCallInNonStaticMethod.js
@@ -59,9 +59,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f2f8ca1eff..5d0209eedd2 100644
--- a/tests/baselines/reference/superCallInStaticMethod.js
+++ b/tests/baselines/reference/superCallInStaticMethod.js
@@ -55,9 +55,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 381a671ec82..7f76fd0be68 100644
--- a/tests/baselines/reference/superCallInsideClassDeclaration.js
+++ b/tests/baselines/reference/superCallInsideClassDeclaration.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 84ffd8e9fb6..520fa39fd73 100644
--- a/tests/baselines/reference/superCallInsideClassExpression.js
+++ b/tests/baselines/reference/superCallInsideClassExpression.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 085c3f84f56..b5476c9b2bc 100644
--- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
+++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 12937ccfa81..77f76e1282e 100644
--- a/tests/baselines/reference/superCallOutsideConstructor.js
+++ b/tests/baselines/reference/superCallOutsideConstructor.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 addb0a9ba22..8dc37241f29 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4a9266de4c5..c5f6a1ab400 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping2.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping2.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1838072b627..67cd1695fa7 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7c2020052a..acad3d95783 100644
--- a/tests/baselines/reference/superCallWithCommentEmit01.js
+++ b/tests/baselines/reference/superCallWithCommentEmit01.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 61660eafd64..9837544119f 100644
--- a/tests/baselines/reference/superCallWithMissingBaseClass.js
+++ b/tests/baselines/reference/superCallWithMissingBaseClass.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9730557a34b..9dca6526d95 100644
--- a/tests/baselines/reference/superCalls.js
+++ b/tests/baselines/reference/superCalls.js
@@ -39,9 +39,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e963a9fafd3..450a7d06321 100644
--- a/tests/baselines/reference/superCallsInConstructor.js
+++ b/tests/baselines/reference/superCallsInConstructor.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 39ec3d25582..5cd7b5a74f0 100644
--- a/tests/baselines/reference/superElementAccess.js
+++ b/tests/baselines/reference/superElementAccess.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5781964bbe4..51ff643f084 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dbf9fd28844..61880906988 100644
--- a/tests/baselines/reference/superHasMethodsFromMergedInterface.js
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6e631780236..5090b8e7071 100644
--- a/tests/baselines/reference/superInCatchBlock1.js
+++ b/tests/baselines/reference/superInCatchBlock1.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eac4af99e83..2586346f83b 100644
--- a/tests/baselines/reference/superInConstructorParam1.js
+++ b/tests/baselines/reference/superInConstructorParam1.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 50e7039768f..fbb718d3f1a 100644
--- a/tests/baselines/reference/superInLambdas.js
+++ b/tests/baselines/reference/superInLambdas.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 257bc39a239..569a897134c 100644
--- a/tests/baselines/reference/superInObjectLiterals_ES5.js
+++ b/tests/baselines/reference/superInObjectLiterals_ES5.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1f015132cac..ea6607aee5b 100644
--- a/tests/baselines/reference/superNewCall1.js
+++ b/tests/baselines/reference/superNewCall1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 021b897532a..4f068792450 100644
--- a/tests/baselines/reference/superNoModifiersCrash.js
+++ b/tests/baselines/reference/superNoModifiersCrash.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 66803cb3adf..89b7df11aba 100644
--- a/tests/baselines/reference/superPropertyAccess.js
+++ b/tests/baselines/reference/superPropertyAccess.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e13521eb93a..afe50f577cf 100644
--- a/tests/baselines/reference/superPropertyAccess1.js
+++ b/tests/baselines/reference/superPropertyAccess1.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0456a88661c..fee00146b49 100644
--- a/tests/baselines/reference/superPropertyAccess2.js
+++ b/tests/baselines/reference/superPropertyAccess2.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 745eb47e29e..25d4bddf332 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5b71c34d3a5..7f93cd13332 100644
--- a/tests/baselines/reference/superPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/superPropertyAccessInSuperCall01.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 79574a2c229..e5bd5f14969 100644
--- a/tests/baselines/reference/superPropertyAccessNoError.js
+++ b/tests/baselines/reference/superPropertyAccessNoError.js
@@ -85,9 +85,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b06e38e4b18..5994b0a0aae 100644
--- a/tests/baselines/reference/superPropertyAccess_ES5.js
+++ b/tests/baselines/reference/superPropertyAccess_ES5.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d284bb54f66..a97c7a45a2c 100644
--- a/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
+++ b/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
@@ -26,9 +26,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 dfd7cb74acd..05ac08b689c 100644
--- a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3c4712dd9da..4256ed6c9fc 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess5.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess5.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 43d6c7ce9bc..b5b68ae9e71 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess6.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess6.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 43c277106f5..ab1d306ccbc 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.js
+++ b/tests/baselines/reference/superWithGenericSpecialization.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 73136ccbfb5..1c0f8eb85cc 100644
--- a/tests/baselines/reference/superWithGenerics.js
+++ b/tests/baselines/reference/superWithGenerics.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1201db208d8..0d677d2a6b0 100644
--- a/tests/baselines/reference/superWithTypeArgument.js
+++ b/tests/baselines/reference/superWithTypeArgument.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 179b13adacf..8c2ba03e299 100644
--- a/tests/baselines/reference/superWithTypeArgument2.js
+++ b/tests/baselines/reference/superWithTypeArgument2.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 75757d76828..8bbd1f1c65e 100644
--- a/tests/baselines/reference/superWithTypeArgument3.js
+++ b/tests/baselines/reference/superWithTypeArgument3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fd364d4e9be..e14a69ca330 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,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94d18716d8b..27409f14eb0 100644
--- a/tests/baselines/reference/switchStatements.js
+++ b/tests/baselines/reference/switchStatements.js
@@ -64,9 +64,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e2640811bac..c03bb3f0872 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -39,9 +39,8 @@ 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 d33fcdcfe72..e186e1b6618 100644
--- a/tests/baselines/reference/targetTypeBaseCalls.js
+++ b/tests/baselines/reference/targetTypeBaseCalls.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0f89e8b29e6..60b67b9d1b3 100644
--- a/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
+++ b/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 206df67849c..1557b9d1572 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -57,9 +57,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9be13e16c2b..b310cbfa26f 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -58,9 +58,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9e50377314e..24ff1be045a 100644
--- a/tests/baselines/reference/thisInSuperCall.js
+++ b/tests/baselines/reference/thisInSuperCall.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 0ab5af1e762..272299f6ec3 100644
--- a/tests/baselines/reference/thisInSuperCall1.js
+++ b/tests/baselines/reference/thisInSuperCall1.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 45599a5b231..09b3336d98b 100644
--- a/tests/baselines/reference/thisInSuperCall2.js
+++ b/tests/baselines/reference/thisInSuperCall2.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d86def33846..69d5892b702 100644
--- a/tests/baselines/reference/thisInSuperCall3.js
+++ b/tests/baselines/reference/thisInSuperCall3.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c575bb64bf3..76ef6df943d 100644
--- a/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
+++ b/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
@@ -32,9 +32,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 11f14828e7a..9dcee70745d 100644
--- a/tests/baselines/reference/thisTypeInFunctions.js
+++ b/tests/baselines/reference/thisTypeInFunctions.js
@@ -203,9 +203,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f42f227213..6252d088f44 100644
--- a/tests/baselines/reference/thisTypeInFunctions3.js
+++ b/tests/baselines/reference/thisTypeInFunctions3.js
@@ -19,9 +19,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5e1d98219a2..f8e280838ad 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.js
+++ b/tests/baselines/reference/tsxAttributeResolution15.js
@@ -25,9 +25,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 312a8df0796..c9cb2806d40 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.js
+++ b/tests/baselines/reference/tsxAttributeResolution16.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c4b84a51adb..20970c59e77 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 94002953889..60a8c1bb38d 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 08934728467..fe55e8b372d 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 723689e049d..a6e87979fde 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 269e8442b06..f97c7e5fc1f 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a41c9967084..fb84fea6657 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5e0b8f5558d..d719dde6809 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 ededc625796..e965cd4f855 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 208a11a9eef..20bcc100d22 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -40,9 +40,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " 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,9 +71,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 86ce6221986..353b2e2a731 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c0d8b29ff47..f4646f5ac3c 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.js
+++ b/tests/baselines/reference/tsxGenericAttributesType3.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e0a271f106d..4f475cca953 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.js
+++ b/tests/baselines/reference/tsxGenericAttributesType4.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 92afb996e7a..ff65a82766e 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.js
+++ b/tests/baselines/reference/tsxGenericAttributesType5.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 002a63f1080..544fd73b34e 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.js
+++ b/tests/baselines/reference/tsxGenericAttributesType6.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b1329b31a23..aedcec369a1 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.js
+++ b/tests/baselines/reference/tsxGenericAttributesType9.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 2a41c1a8894..92fd3d2a39a 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.js
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.js
@@ -135,9 +135,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c5dc176c031..504fb3d6fd5 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c9485b956bb..9698a478748 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
@@ -24,9 +24,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 eca3e2db18f..453e1bb86b4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e943531e7d6..02a30309695 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 5153086903a..b774f3259a8 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
@@ -42,9 +42,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cffc7e69f3f..cf3e8a3a0da 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution17.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution17.js
@@ -29,9 +29,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8e27eb15d12..c4fb822a4ef 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6529fa98909..562d6da842a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
@@ -31,9 +31,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 fa25dc1e36f..5859238eff1 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
@@ -44,9 +44,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 556df2263b4..d605b16ccf0 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
@@ -43,9 +43,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bf0e8118661..57b22fb1e20 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 bff8d86000a..7a7214ca7f6 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 203665f8505..07c36cfc5a5 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3958b722d3e..04e77f960d4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
@@ -34,9 +34,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f077b435cdd..2929d413384 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 456fb843e4c..6869bce4982 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -47,9 +47,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e2dcee2eefe..1cb1fa61d05 100644
--- a/tests/baselines/reference/tsxUnionElementType3.js
+++ b/tests/baselines/reference/tsxUnionElementType3.js
@@ -46,9 +46,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4cee2d6d536..28e0a03be76 100644
--- a/tests/baselines/reference/tsxUnionElementType4.js
+++ b/tests/baselines/reference/tsxUnionElementType4.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 aa0cf6cc14a..642ee60382f 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4b55d1cbae0..0963813244b 100644
--- a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
+++ b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
@@ -23,9 +23,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d525eda14f0..e546b21f1b3 100644
--- a/tests/baselines/reference/typeAssertions.js
+++ b/tests/baselines/reference/typeAssertions.js
@@ -60,9 +60,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardConstructorDerivedClass.js b/tests/baselines/reference/typeGuardConstructorDerivedClass.js
index 8ffabcb987a..8b929eebdb7 100644
--- a/tests/baselines/reference/typeGuardConstructorDerivedClass.js
+++ b/tests/baselines/reference/typeGuardConstructorDerivedClass.js
@@ -75,6 +75,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + b + " is not a constructor or null");
         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 465af917351..fe93923a0aa 100644
--- a/tests/baselines/reference/typeGuardFunction.js
+++ b/tests/baselines/reference/typeGuardFunction.js
@@ -91,9 +91,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 7d66b4902ed..023fd8130f9 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -176,9 +176,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e148a983921..7870c9d3109 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.js
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 1e0544332b9..7e7ea2701fa 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js
@@ -150,9 +150,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7a8f7053c5..784b4cc7b89 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
@@ -68,9 +68,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 04e19d27ec9..d482544c64e 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
@@ -81,9 +81,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a0223809175..9fcf125002e 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.js
+++ b/tests/baselines/reference/typeGuardOfFormIsType.js
@@ -45,9 +45,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6eaf11f1e8f..c5e3bfacce5 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.js
@@ -91,9 +91,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8adef023d1b..8a7cc63221f 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d64296f744b..5174540119b 100644
--- a/tests/baselines/reference/typeMatch2.js
+++ b/tests/baselines/reference/typeMatch2.js
@@ -53,9 +53,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b4c42b6daf5..ff8b8ad73d2 100644
--- a/tests/baselines/reference/typeOfSuperCall.js
+++ b/tests/baselines/reference/typeOfSuperCall.js
@@ -17,9 +17,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a54e4724ca9..d7e7d11fede 100644
--- a/tests/baselines/reference/typeParameterAsBaseClass.js
+++ b/tests/baselines/reference/typeParameterAsBaseClass.js
@@ -11,9 +11,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9cd4e8eb439..8329275e562 100644
--- a/tests/baselines/reference/typeParameterAsBaseType.js
+++ b/tests/baselines/reference/typeParameterAsBaseType.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 72c7e1ed2b5..efed8435d94 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a2086aedc39..d813e887290 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.js
@@ -21,9 +21,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a97f59ccc0d..f0853faef55 100644
--- a/tests/baselines/reference/typeRelationships.js
+++ b/tests/baselines/reference/typeRelationships.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 080781e1238..889911f1472 100644
--- a/tests/baselines/reference/typeValueConflict1.js
+++ b/tests/baselines/reference/typeValueConflict1.js
@@ -20,9 +20,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d88b9582313..76e772a6bef 100644
--- a/tests/baselines/reference/typeValueConflict2.js
+++ b/tests/baselines/reference/typeValueConflict2.js
@@ -27,9 +27,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9847668e5c5..c404b6f983e 100644
--- a/tests/baselines/reference/typeVariableTypeGuards.js
+++ b/tests/baselines/reference/typeVariableTypeGuards.js
@@ -93,9 +93,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f458981edd0..06b9662e062 100644
--- a/tests/baselines/reference/typeofClass2.js
+++ b/tests/baselines/reference/typeofClass2.js
@@ -30,9 +30,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e3e0d37bbae..613d1b5bd34 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
@@ -51,9 +51,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 3f898dee089..d69e2eda2b9 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
@@ -49,9 +49,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 82f259b7bb2..91fe71e2678 100644
--- a/tests/baselines/reference/undeclaredBase.js
+++ b/tests/baselines/reference/undeclaredBase.js
@@ -12,9 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 276c0bce1aa..eae10ca7ade 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
@@ -131,9 +131,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c69f16c9741..c8a8d4e4099 100644
--- a/tests/baselines/reference/underscoreMapFirst.js
+++ b/tests/baselines/reference/underscoreMapFirst.js
@@ -57,9 +57,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a47f2661ae6..4fc222c0b8c 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass01.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass01.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 b21d1fdc3ea..b2616fdda83 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass02.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass02.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9b8688bd774..489c5c59074 100644
--- a/tests/baselines/reference/unionTypeEquivalence.js
+++ b/tests/baselines/reference/unionTypeEquivalence.js
@@ -28,9 +28,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f8f3c224655..f1ce62a13bf 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.js
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js
@@ -36,9 +36,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 a7352b2545b..386efe6f6a1 100644
--- a/tests/baselines/reference/unionTypesAssignability.js
+++ b/tests/baselines/reference/unionTypesAssignability.js
@@ -82,9 +82,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 c80ec6cfdd2..0e30d1e0fdf 100644
--- a/tests/baselines/reference/unknownSymbols1.js
+++ b/tests/baselines/reference/unknownSymbols1.js
@@ -41,9 +41,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 d27fd958a7b..e771ecf58ab 100644
--- a/tests/baselines/reference/unspecializedConstraints.js
+++ b/tests/baselines/reference/unspecializedConstraints.js
@@ -162,9 +162,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 9d0f9f88f6c..0893a139463 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
@@ -52,9 +52,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 cc932a000ae..b9e3b55a514 100644
--- a/tests/baselines/reference/unusedClassesinNamespace4.js
+++ b/tests/baselines/reference/unusedClassesinNamespace4.js
@@ -22,9 +22,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 580e7a40a8c..72ea1ff5081 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.js
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.js
@@ -110,9 +110,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 68177b5c614..b5fdcc911c7 100644
--- a/tests/baselines/reference/unusedInvalidTypeArguments.js
+++ b/tests/baselines/reference/unusedInvalidTypeArguments.js
@@ -61,9 +61,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -111,9 +110,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 f6f15c1d12f..6b33a55f346 100644
--- a/tests/baselines/reference/useBeforeDeclaration_superClass.js
+++ b/tests/baselines/reference/useBeforeDeclaration_superClass.js
@@ -37,9 +37,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 4903aba5a72..71bff4214c9 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.js
+++ b/tests/baselines/reference/validUseOfThisInSuper.js
@@ -18,9 +18,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 6106f7fb687..632d1c9e398 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -33,9 +33,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 8bc8f89703b..87b79c1882b 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         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 e6059cddb6b..e6bb30de431 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
@@ -76,9 +76,8 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null) {
+        if (typeof b !== "function" && b !== null)
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
-        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

From 5bc000245073e9a5a8abc42cfe2f315330257b2a Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@codecademy.com>
Date: Tue, 1 Dec 2020 18:53:54 -0500
Subject: [PATCH 5/6] ...except for the small master merge slipups

---
 package-lock.json                   | 8521 +++++++++++++++++++++++++++
 src/compiler/factory/emitHelpers.ts |    2 +-
 2 files changed, 8522 insertions(+), 1 deletion(-)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000000..fb242d7237c
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,8521 @@
+{
+    "name": "typescript",
+    "version": "4.2.0",
+    "lockfileVersion": 1,
+    "requires": true,
+    "dependencies": {
+        "@babel/code-frame": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+            "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+            "dev": true,
+            "requires": {
+                "@babel/highlight": "^7.10.4"
+            }
+        },
+        "@babel/helper-validator-identifier": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+            "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+            "dev": true
+        },
+        "@babel/highlight": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+            "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-validator-identifier": "^7.10.4",
+                "chalk": "^2.0.0",
+                "js-tokens": "^4.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "^1.9.0"
+                    }
+                },
+                "chalk": {
+                    "version": "2.4.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^3.2.1",
+                        "escape-string-regexp": "^1.0.5",
+                        "supports-color": "^5.3.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "1.9.3",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+                    "dev": true,
+                    "requires": {
+                        "color-name": "1.1.3"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+                    "dev": true
+                },
+                "has-flag": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "5.5.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                }
+            }
+        },
+        "@esfx/cancelable": {
+            "version": "1.0.0-pre.13",
+            "resolved": "https://registry.npmjs.org/@esfx/cancelable/-/cancelable-1.0.0-pre.13.tgz",
+            "integrity": "sha512-JpcXOrEPh/AMaZ8OGWrjYq+o65/emqxZFnW7NRRS6x8nrHbbZTUHEJnQmjahXkjvliPBgsFqueaLphXP52ACug==",
+            "dev": true,
+            "requires": {
+                "@esfx/disposable": "^1.0.0-pre.13",
+                "@esfx/internal-deprecate": "^1.0.0-pre.13",
+                "@esfx/internal-guards": "^1.0.0-pre.11",
+                "@esfx/internal-tag": "^1.0.0-pre.6",
+                "tslib": "^1.9.3"
+            }
+        },
+        "@esfx/disposable": {
+            "version": "1.0.0-pre.13",
+            "resolved": "https://registry.npmjs.org/@esfx/disposable/-/disposable-1.0.0-pre.13.tgz",
+            "integrity": "sha512-rTypmtVgC8nx3gfxHIX96By2UNub0ewRthxUiWE1x/+NTSfzGOHVpVu0H8DF+VQJND04E6srcwwbO+Hpek16GA==",
+            "dev": true,
+            "requires": {
+                "@esfx/internal-deprecate": "^1.0.0-pre.13",
+                "@esfx/internal-guards": "^1.0.0-pre.11",
+                "@esfx/internal-tag": "^1.0.0-pre.6",
+                "tslib": "^1.9.3"
+            }
+        },
+        "@esfx/internal-deprecate": {
+            "version": "1.0.0-pre.13",
+            "resolved": "https://registry.npmjs.org/@esfx/internal-deprecate/-/internal-deprecate-1.0.0-pre.13.tgz",
+            "integrity": "sha512-uF4EhrILmUJdcDkSQNsr+33XEKaMj92/8804VIHswytdbwaQjQ85dbj1bSB9TFsXG2zkZtJo09NKNQ9p7NvTPQ==",
+            "dev": true,
+            "requires": {
+                "tslib": "^1.9.3"
+            }
+        },
+        "@esfx/internal-guards": {
+            "version": "1.0.0-pre.11",
+            "resolved": "https://registry.npmjs.org/@esfx/internal-guards/-/internal-guards-1.0.0-pre.11.tgz",
+            "integrity": "sha512-DnRXkwwSrqIaml+sAm/zzpfDOCBnZkzflmGB833AqVYbgopO7xPBobngxqGBhYjutgTmVuXV3GKP0g08h4mQEw==",
+            "dev": true,
+            "requires": {
+                "@esfx/type-model": "^1.0.0-pre.11",
+                "tslib": "^1.9.3"
+            }
+        },
+        "@esfx/internal-tag": {
+            "version": "1.0.0-pre.6",
+            "resolved": "https://registry.npmjs.org/@esfx/internal-tag/-/internal-tag-1.0.0-pre.6.tgz",
+            "integrity": "sha512-nODidP9/RBLqX39HL12IhFLgaoBHrC5nrm6D/BwquCGNoPQI9EXNPau+IdmGqeUcaMoVOFLFOkYtnHU52RVngw==",
+            "dev": true
+        },
+        "@esfx/type-model": {
+            "version": "1.0.0-pre.11",
+            "resolved": "https://registry.npmjs.org/@esfx/type-model/-/type-model-1.0.0-pre.11.tgz",
+            "integrity": "sha512-ImM8fj0HFE2GRPRq+q1xnW3kNaIbZscpJfWjGyeo9KdMxKoI75bJebsA3XK6AH9zbEWba+521V+m6NDvDhcnSw==",
+            "dev": true,
+            "requires": {
+                "tslib": "^1.9.3"
+            }
+        },
+        "@eslint/eslintrc": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz",
+            "integrity": "sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==",
+            "dev": true,
+            "requires": {
+                "ajv": "^6.12.4",
+                "debug": "^4.1.1",
+                "espree": "^7.3.0",
+                "globals": "^12.1.0",
+                "ignore": "^4.0.6",
+                "import-fresh": "^3.2.1",
+                "js-yaml": "^3.13.1",
+                "lodash": "^4.17.19",
+                "minimatch": "^3.0.4",
+                "strip-json-comments": "^3.1.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "ignore": {
+                    "version": "4.0.6",
+                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+                    "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+                    "dev": true
+                }
+            }
+        },
+        "@gulp-sourcemaps/identity-map": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
+            "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
+            "dev": true,
+            "requires": {
+                "acorn": "^6.4.1",
+                "normalize-path": "^3.0.0",
+                "postcss": "^7.0.16",
+                "source-map": "^0.6.0",
+                "through2": "^3.0.1"
+            },
+            "dependencies": {
+                "acorn": {
+                    "version": "6.4.2",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+                    "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
+                "through2": {
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+                    "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.4",
+                        "readable-stream": "2 || 3"
+                    }
+                }
+            }
+        },
+        "@gulp-sourcemaps/map-sources": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
+            "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+            "dev": true,
+            "requires": {
+                "normalize-path": "^2.0.1",
+                "through2": "^2.0.3"
+            },
+            "dependencies": {
+                "normalize-path": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+                    "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+                    "dev": true,
+                    "requires": {
+                        "remove-trailing-separator": "^1.0.1"
+                    }
+                },
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "@nodelib/fs.scandir": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+            "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.stat": "2.0.3",
+                "run-parallel": "^1.1.9"
+            }
+        },
+        "@nodelib/fs.stat": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+            "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+            "dev": true
+        },
+        "@nodelib/fs.walk": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+            "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.scandir": "2.1.3",
+                "fastq": "^1.6.0"
+            }
+        },
+        "@octokit/auth-token": {
+            "version": "2.4.4",
+            "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz",
+            "integrity": "sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==",
+            "dev": true,
+            "requires": {
+                "@octokit/types": "^6.0.0"
+            }
+        },
+        "@octokit/core": {
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.2.2.tgz",
+            "integrity": "sha512-cZEP6dC8xpepbAqtdS1GgX88omLer8VQegw5BpQ5fbSrkxgY9Y9K7ratu8ezAd9bD0GVOR1GVWiRzYdxiprU1w==",
+            "dev": true,
+            "requires": {
+                "@octokit/auth-token": "^2.4.0",
+                "@octokit/graphql": "^4.3.1",
+                "@octokit/request": "^5.4.0",
+                "@octokit/types": "^6.0.0",
+                "before-after-hook": "^2.1.0",
+                "universal-user-agent": "^6.0.0"
+            }
+        },
+        "@octokit/endpoint": {
+            "version": "6.0.10",
+            "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz",
+            "integrity": "sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==",
+            "dev": true,
+            "requires": {
+                "@octokit/types": "^6.0.0",
+                "is-plain-object": "^5.0.0",
+                "universal-user-agent": "^6.0.0"
+            }
+        },
+        "@octokit/graphql": {
+            "version": "4.5.8",
+            "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.8.tgz",
+            "integrity": "sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA==",
+            "dev": true,
+            "requires": {
+                "@octokit/request": "^5.3.0",
+                "@octokit/types": "^6.0.0",
+                "universal-user-agent": "^6.0.0"
+            }
+        },
+        "@octokit/openapi-types": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-1.2.2.tgz",
+            "integrity": "sha512-vrKDLd/Rq4IE16oT+jJkDBx0r29NFkdkU8GwqVSP4RajsAvP23CMGtFhVK0pedUhAiMvG1bGnFcTC/xCKaKgmw==",
+            "dev": true
+        },
+        "@octokit/plugin-paginate-rest": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.6.0.tgz",
+            "integrity": "sha512-o+O8c1PqsC5++BHXfMZabRRsBIVb34tXPWyQLyp2IXq5MmkxdipS7TXM4Y9ldL1PzY9CTrCsn/lzFFJGM3oRRA==",
+            "dev": true,
+            "requires": {
+                "@octokit/types": "^5.5.0"
+            },
+            "dependencies": {
+                "@octokit/types": {
+                    "version": "5.5.0",
+                    "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz",
+                    "integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/node": ">= 8"
+                    }
+                }
+            }
+        },
+        "@octokit/plugin-request-log": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz",
+            "integrity": "sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==",
+            "dev": true
+        },
+        "@octokit/plugin-rest-endpoint-methods": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.2.1.tgz",
+            "integrity": "sha512-QyFr4Bv807Pt1DXZOC5a7L5aFdrwz71UHTYoHVajYV5hsqffWm8FUl9+O7nxRu5PDMtB/IKrhFqTmdBTK5cx+A==",
+            "dev": true,
+            "requires": {
+                "@octokit/types": "^5.5.0",
+                "deprecation": "^2.3.1"
+            },
+            "dependencies": {
+                "@octokit/types": {
+                    "version": "5.5.0",
+                    "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz",
+                    "integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/node": ">= 8"
+                    }
+                }
+            }
+        },
+        "@octokit/request": {
+            "version": "5.4.11",
+            "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.11.tgz",
+            "integrity": "sha512-vskebNjuz4oTdPIv+9cQjHvjk8vjrMv2fOmSo6zr7IIaFHeVsJlG/C07MXiSS/+g/qU1GHjkPG1XW3faz57EoQ==",
+            "dev": true,
+            "requires": {
+                "@octokit/endpoint": "^6.0.1",
+                "@octokit/request-error": "^2.0.0",
+                "@octokit/types": "^6.0.0",
+                "deprecation": "^2.0.0",
+                "is-plain-object": "^5.0.0",
+                "node-fetch": "^2.6.1",
+                "once": "^1.4.0",
+                "universal-user-agent": "^6.0.0"
+            },
+            "dependencies": {
+                "node-fetch": {
+                    "version": "2.6.1",
+                    "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+                    "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+                    "dev": true
+                }
+            }
+        },
+        "@octokit/request-error": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz",
+            "integrity": "sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==",
+            "dev": true,
+            "requires": {
+                "@octokit/types": "^6.0.0",
+                "deprecation": "^2.0.0",
+                "once": "^1.4.0"
+            }
+        },
+        "@octokit/rest": {
+            "version": "18.0.9",
+            "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.0.9.tgz",
+            "integrity": "sha512-CC5+cIx974Ygx9lQNfUn7/oXDQ9kqGiKUC6j1A9bAVZZ7aoTF8K6yxu0pQhQrLBwSl92J6Z3iVDhGhGFgISCZg==",
+            "dev": true,
+            "requires": {
+                "@octokit/core": "^3.0.0",
+                "@octokit/plugin-paginate-rest": "^2.2.0",
+                "@octokit/plugin-request-log": "^1.0.0",
+                "@octokit/plugin-rest-endpoint-methods": "4.2.1"
+            }
+        },
+        "@octokit/types": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.0.0.tgz",
+            "integrity": "sha512-vLunkq0Tedel0vpDC4Ir07ZLrkt6jpb+uGlIc9HZp7wTLvf2eC4AudZw7S+5B0bt2KiytEYPFtQy2X4Z1HJm/g==",
+            "dev": true,
+            "requires": {
+                "@octokit/openapi-types": "^1.2.0",
+                "@types/node": ">= 8"
+            }
+        },
+        "@types/browserify": {
+            "version": "12.0.36",
+            "resolved": "https://registry.npmjs.org/@types/browserify/-/browserify-12.0.36.tgz",
+            "integrity": "sha512-hYXvPod5upkYTC7auziOATFsu/0MGxozbzNI80sZV044JTF7UtstHeNOM52b+bg7/taZ3fheK7oeb+jpm4C0/w==",
+            "dev": true,
+            "requires": {
+                "@types/insert-module-globals": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/chai": {
+            "version": "4.2.14",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz",
+            "integrity": "sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==",
+            "dev": true
+        },
+        "@types/convert-source-map": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/@types/convert-source-map/-/convert-source-map-1.5.1.tgz",
+            "integrity": "sha512-laiDIXqqthjJlyAMYAXOtN3N8+UlbM+KvZi4BaY5ZOekmVkBs/UxfK5O0HWeJVG2eW8F+Mu2ww13fTX+kY1FlQ==",
+            "dev": true
+        },
+        "@types/expect": {
+            "version": "1.20.4",
+            "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
+            "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
+            "dev": true
+        },
+        "@types/glob": {
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+            "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+            "dev": true,
+            "requires": {
+                "@types/minimatch": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/glob-stream": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-6.1.0.tgz",
+            "integrity": "sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==",
+            "dev": true,
+            "requires": {
+                "@types/glob": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/gulp": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.6.tgz",
+            "integrity": "sha512-0E8/iV/7FKWyQWSmi7jnUvgXXgaw+pfAzEB06Xu+l0iXVJppLbpOye5z7E2klw5akXd+8kPtYuk65YBcZPM4ow==",
+            "dev": true,
+            "requires": {
+                "@types/undertaker": "*",
+                "@types/vinyl-fs": "*",
+                "chokidar": "^2.1.2"
+            }
+        },
+        "@types/gulp-concat": {
+            "version": "0.0.32",
+            "resolved": "https://registry.npmjs.org/@types/gulp-concat/-/gulp-concat-0.0.32.tgz",
+            "integrity": "sha512-CUCFADlITzzBfBa2bdGzhKtvBr4eFh+evb+4igVbvPoO5RyPfHifmyQlZl6lM7q19+OKncRlFXDU7B4X9Ayo2g==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/gulp-newer": {
+            "version": "0.0.31",
+            "resolved": "https://registry.npmjs.org/@types/gulp-newer/-/gulp-newer-0.0.31.tgz",
+            "integrity": "sha512-e7J/Zv5Wd7CC0WpuA2syWVitgwrkG0u221e41w7r07XUR6hMH6kHPkq9tUrusHkbeW8QbuLbis5fODOwQCyggQ==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/gulp-rename": {
+            "version": "0.0.33",
+            "resolved": "https://registry.npmjs.org/@types/gulp-rename/-/gulp-rename-0.0.33.tgz",
+            "integrity": "sha512-FIZQvbZJj6V1gHPTzO+g/BCWpDur7fJrroae4gwV3LaoHBQ+MrR9sB+2HssK8fHv4WdY6hVNxkcft9bYatuPIA==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/gulp-sourcemaps": {
+            "version": "0.0.32",
+            "resolved": "https://registry.npmjs.org/@types/gulp-sourcemaps/-/gulp-sourcemaps-0.0.32.tgz",
+            "integrity": "sha512-+7BAmptW2bxyJnJcCEuie7vLoop3FwWgCdBMzyv7MYXED/HeNMeQuX7uPCkp4vfU1TTu4CYFH0IckNPvo0VePA==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/insert-module-globals": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/@types/insert-module-globals/-/insert-module-globals-7.0.1.tgz",
+            "integrity": "sha512-qtSfo/jdYHO4jNO6QCp4CwR/TPrvR39Yan5K4nPU1iCmxcnTWiERKDXcvFGuXEmfpjrHeOCvrZPa0UrUsy+mvA==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/jake": {
+            "version": "0.0.32",
+            "resolved": "https://registry.npmjs.org/@types/jake/-/jake-0.0.32.tgz",
+            "integrity": "sha512-uDj5tLTFknk8qmYCTan+1A8eumCxUEa+T8vhY8qf1Ll+uHmA/j9Q0ejxmLY4Bqadphg/nL7FYimf2oQZuzqkbQ==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/json-schema": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+            "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+            "dev": true
+        },
+        "@types/json5": {
+            "version": "0.0.29",
+            "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+            "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+            "dev": true
+        },
+        "@types/merge2": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/@types/merge2/-/merge2-1.3.0.tgz",
+            "integrity": "sha512-3xFWjsGhm5GCVlRrcrrVr9oapPxpbG5M3G/4JGF+Gra++7DWoeDOQphCEhyMpbpbptD3w/4PesYIMby/yHrzkQ==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/microsoft__typescript-etw": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@types/microsoft__typescript-etw/-/microsoft__typescript-etw-0.1.1.tgz",
+            "integrity": "sha512-zdgHyZJEwbFKI6zhOqWPsNMhlrAk6qMrn9VMA6VQtRt/F+jNJKeaHIMysuO9oTLv0fWcli0gwUrMv8MeFyb3Sw==",
+            "dev": true
+        },
+        "@types/minimatch": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+            "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+            "dev": true
+        },
+        "@types/minimist": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+            "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+            "dev": true
+        },
+        "@types/mkdirp": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz",
+            "integrity": "sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/mocha": {
+            "version": "8.0.4",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.0.4.tgz",
+            "integrity": "sha512-M4BwiTJjHmLq6kjON7ZoI2JMlBvpY3BYSdiP6s/qCT3jb1s9/DeJF0JELpAxiVSIxXDzfNKe+r7yedMIoLbknQ==",
+            "dev": true
+        },
+        "@types/ms": {
+            "version": "0.7.31",
+            "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
+            "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+            "dev": true
+        },
+        "@types/node": {
+            "version": "14.14.10",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz",
+            "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==",
+            "dev": true
+        },
+        "@types/node-fetch": {
+            "version": "2.5.7",
+            "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+            "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*",
+                "form-data": "^3.0.0"
+            }
+        },
+        "@types/q": {
+            "version": "1.5.4",
+            "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+            "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+            "dev": true
+        },
+        "@types/source-map-support": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.3.tgz",
+            "integrity": "sha512-fvjMjVH8Rmokw2dWh1dkj90iX5R8FPjeZzjNH+6eFXReh0QnHFf1YBl3B0CF0RohIAA3SDRJsGeeUWKl6d7HqA==",
+            "dev": true,
+            "requires": {
+                "source-map": "^0.6.0"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                }
+            }
+        },
+        "@types/through2": {
+            "version": "2.0.36",
+            "resolved": "https://registry.npmjs.org/@types/through2/-/through2-2.0.36.tgz",
+            "integrity": "sha512-vuifQksQHJXhV9McpVsXKuhnf3lsoX70PnhcqIAbs9dqLH2NgrGz0DzZPDY3+Yh6eaRqcE1gnCQ6QhBn1/PT5A==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/travis-fold": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@types/travis-fold/-/travis-fold-0.1.0.tgz",
+            "integrity": "sha512-qrXB0Div8vIzA8P809JRlh9lD4mSOYwRBJbU1zcj0BWhULP15Zx0oQyJtjaOnkNR5RZcYQDbgimj40M1GDmhcQ==",
+            "dev": true
+        },
+        "@types/undertaker": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.3.tgz",
+            "integrity": "sha512-OhvIYx6pUJBxYZf5fM/BVMNXZQMy095kplml+4cWrlNqM1t6XtSIQCuVySGmICZCnzi69Epdljyplm86BlTouQ==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*",
+                "@types/undertaker-registry": "*"
+            }
+        },
+        "@types/undertaker-registry": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+            "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==",
+            "dev": true
+        },
+        "@types/vinyl": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.4.tgz",
+            "integrity": "sha512-2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ==",
+            "dev": true,
+            "requires": {
+                "@types/expect": "^1.20.4",
+                "@types/node": "*"
+            }
+        },
+        "@types/vinyl-fs": {
+            "version": "2.4.11",
+            "resolved": "https://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-2.4.11.tgz",
+            "integrity": "sha512-2OzQSfIr9CqqWMGqmcERE6Hnd2KY3eBVtFaulVo3sJghplUcaeMdL9ZjEiljcQQeHjheWY9RlNmumjIAvsBNaA==",
+            "dev": true,
+            "requires": {
+                "@types/glob-stream": "*",
+                "@types/node": "*",
+                "@types/vinyl": "*"
+            }
+        },
+        "@types/xml2js": {
+            "version": "0.4.5",
+            "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz",
+            "integrity": "sha512-yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@typescript-eslint/eslint-plugin": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.5.0.tgz",
+            "integrity": "sha512-mjb/gwNcmDKNt+6mb7Aj/TjKzIJjOPcoCJpjBQC9ZnTRnBt1p4q5dJSSmIqAtsZ/Pff5N+hJlbiPc5bl6QN4OQ==",
+            "dev": true,
+            "requires": {
+                "@typescript-eslint/experimental-utils": "4.5.0",
+                "@typescript-eslint/scope-manager": "4.5.0",
+                "debug": "^4.1.1",
+                "functional-red-black-tree": "^1.0.1",
+                "regexpp": "^3.0.0",
+                "semver": "^7.3.2",
+                "tsutils": "^3.17.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                }
+            }
+        },
+        "@typescript-eslint/experimental-utils": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.5.0.tgz",
+            "integrity": "sha512-bW9IpSAKYvkqDGRZzayBXIgPsj2xmmVHLJ+flGSoN0fF98pGoKFhbunIol0VF2Crka7z984EEhFi623Rl7e6gg==",
+            "dev": true,
+            "requires": {
+                "@types/json-schema": "^7.0.3",
+                "@typescript-eslint/scope-manager": "4.5.0",
+                "@typescript-eslint/types": "4.5.0",
+                "@typescript-eslint/typescript-estree": "4.5.0",
+                "eslint-scope": "^5.0.0",
+                "eslint-utils": "^2.0.0"
+            }
+        },
+        "@typescript-eslint/parser": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.5.0.tgz",
+            "integrity": "sha512-xb+gmyhQcnDWe+5+xxaQk5iCw6KqXd8VQxGiTeELTMoYeRjpocZYYRP1gFVM2C8Yl0SpUvLa1lhprwqZ00w3Iw==",
+            "dev": true,
+            "requires": {
+                "@typescript-eslint/scope-manager": "4.5.0",
+                "@typescript-eslint/types": "4.5.0",
+                "@typescript-eslint/typescript-estree": "4.5.0",
+                "debug": "^4.1.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                }
+            }
+        },
+        "@typescript-eslint/scope-manager": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.5.0.tgz",
+            "integrity": "sha512-C0cEO0cTMPJ/w4RA/KVe4LFFkkSh9VHoFzKmyaaDWAnPYIEzVCtJ+Un8GZoJhcvq+mPFXEsXa01lcZDHDG6Www==",
+            "dev": true,
+            "requires": {
+                "@typescript-eslint/types": "4.5.0",
+                "@typescript-eslint/visitor-keys": "4.5.0"
+            }
+        },
+        "@typescript-eslint/types": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.5.0.tgz",
+            "integrity": "sha512-n2uQoXnyWNk0Les9MtF0gCK3JiWd987JQi97dMSxBOzVoLZXCNtxFckVqt1h8xuI1ix01t+iMY4h4rFMj/303g==",
+            "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.5.0.tgz",
+            "integrity": "sha512-gN1mffq3zwRAjlYWzb5DanarOPdajQwx5MEWkWCk0XvqC8JpafDTeioDoow2L4CA/RkYZu7xEsGZRhqrTsAG8w==",
+            "dev": true,
+            "requires": {
+                "@typescript-eslint/types": "4.5.0",
+                "@typescript-eslint/visitor-keys": "4.5.0",
+                "debug": "^4.1.1",
+                "globby": "^11.0.1",
+                "is-glob": "^4.0.1",
+                "lodash": "^4.17.15",
+                "semver": "^7.3.2",
+                "tsutils": "^3.17.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "globby": {
+                    "version": "11.0.1",
+                    "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+                    "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+                    "dev": true,
+                    "requires": {
+                        "array-union": "^2.1.0",
+                        "dir-glob": "^3.0.1",
+                        "fast-glob": "^3.1.1",
+                        "ignore": "^5.1.4",
+                        "merge2": "^1.3.0",
+                        "slash": "^3.0.0"
+                    }
+                }
+            }
+        },
+        "@typescript-eslint/visitor-keys": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.5.0.tgz",
+            "integrity": "sha512-UHq4FSa55NDZqscRU//O5ROFhHa9Hqn9KWTEvJGTArtTQp5GKv9Zqf6d/Q3YXXcFv4woyBml7fJQlQ+OuqRcHA==",
+            "dev": true,
+            "requires": {
+                "@typescript-eslint/types": "4.5.0",
+                "eslint-visitor-keys": "^2.0.0"
+            }
+        },
+        "@ungap/promise-all-settled": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+            "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+            "dev": true
+        },
+        "JSONStream": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+            "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+            "dev": true,
+            "requires": {
+                "jsonparse": "^1.2.0",
+                "through": ">=2.2.7 <3"
+            }
+        },
+        "abbrev": {
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+            "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+            "dev": true
+        },
+        "acorn": {
+            "version": "7.4.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+            "dev": true
+        },
+        "acorn-jsx": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+            "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+            "dev": true
+        },
+        "acorn-node": {
+            "version": "1.8.2",
+            "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+            "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+            "dev": true,
+            "requires": {
+                "acorn": "^7.0.0",
+                "acorn-walk": "^7.0.0",
+                "xtend": "^4.0.2"
+            }
+        },
+        "acorn-walk": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+            "dev": true
+        },
+        "aggregate-error": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
+            "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
+            "dev": true,
+            "requires": {
+                "clean-stack": "^2.0.0",
+                "indent-string": "^4.0.0"
+            }
+        },
+        "ajv": {
+            "version": "6.12.6",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "dev": true,
+            "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            }
+        },
+        "amdefine": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+            "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+            "dev": true,
+            "optional": true
+        },
+        "ansi-colors": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+            "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+            "dev": true,
+            "requires": {
+                "ansi-wrap": "^0.1.0"
+            }
+        },
+        "ansi-cyan": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+            "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+            "dev": true,
+            "requires": {
+                "ansi-wrap": "0.1.0"
+            }
+        },
+        "ansi-gray": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+            "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+            "dev": true,
+            "requires": {
+                "ansi-wrap": "0.1.0"
+            }
+        },
+        "ansi-red": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+            "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+            "dev": true,
+            "requires": {
+                "ansi-wrap": "0.1.0"
+            }
+        },
+        "ansi-regex": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+            "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+            "dev": true
+        },
+        "ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "requires": {
+                "color-convert": "^2.0.1"
+            }
+        },
+        "ansi-wrap": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+            "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+            "dev": true
+        },
+        "anymatch": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+            "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+            "dev": true,
+            "requires": {
+                "micromatch": "^3.1.4",
+                "normalize-path": "^2.1.1"
+            },
+            "dependencies": {
+                "normalize-path": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+                    "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+                    "dev": true,
+                    "requires": {
+                        "remove-trailing-separator": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "append-buffer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+            "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+            "dev": true,
+            "requires": {
+                "buffer-equal": "^1.0.0"
+            }
+        },
+        "archy": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+            "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+            "dev": true
+        },
+        "argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "requires": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "arr-diff": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+            "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+            "dev": true
+        },
+        "arr-filter": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+            "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+            "dev": true,
+            "requires": {
+                "make-iterator": "^1.0.0"
+            }
+        },
+        "arr-flatten": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+            "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+            "dev": true
+        },
+        "arr-map": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+            "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+            "dev": true,
+            "requires": {
+                "make-iterator": "^1.0.0"
+            }
+        },
+        "arr-union": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+            "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+            "dev": true
+        },
+        "array-each": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+            "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+            "dev": true
+        },
+        "array-filter": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz",
+            "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=",
+            "dev": true
+        },
+        "array-includes": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
+            "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0",
+                "is-string": "^1.0.5"
+            }
+        },
+        "array-initial": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+            "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+            "dev": true,
+            "requires": {
+                "array-slice": "^1.0.0",
+                "is-number": "^4.0.0"
+            },
+            "dependencies": {
+                "is-number": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+                    "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+                    "dev": true
+                }
+            }
+        },
+        "array-last": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+            "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+            "dev": true,
+            "requires": {
+                "is-number": "^4.0.0"
+            },
+            "dependencies": {
+                "is-number": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+                    "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+                    "dev": true
+                }
+            }
+        },
+        "array-slice": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+            "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+            "dev": true
+        },
+        "array-sort": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+            "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+            "dev": true,
+            "requires": {
+                "default-compare": "^1.0.0",
+                "get-value": "^2.0.6",
+                "kind-of": "^5.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+                    "dev": true
+                }
+            }
+        },
+        "array-union": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+            "dev": true
+        },
+        "array-unique": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+            "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+            "dev": true
+        },
+        "array.prototype.flat": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
+            "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0-next.1"
+            }
+        },
+        "asn1.js": {
+            "version": "5.4.1",
+            "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+            "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.0.0",
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0",
+                "safer-buffer": "^2.1.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "assert": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+            "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+            "dev": true,
+            "requires": {
+                "object-assign": "^4.1.1",
+                "util": "0.10.3"
+            },
+            "dependencies": {
+                "inherits": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                    "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+                    "dev": true
+                },
+                "util": {
+                    "version": "0.10.3",
+                    "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                    "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "2.0.1"
+                    }
+                }
+            }
+        },
+        "assertion-error": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+            "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+            "dev": true
+        },
+        "assign-symbols": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+            "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+            "dev": true
+        },
+        "astral-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+            "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+            "dev": true
+        },
+        "async": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+            "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
+            "dev": true
+        },
+        "async-done": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+            "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+            "dev": true,
+            "requires": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.2",
+                "process-nextick-args": "^2.0.0",
+                "stream-exhaust": "^1.0.1"
+            }
+        },
+        "async-each": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+            "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+            "dev": true
+        },
+        "async-settle": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+            "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+            "dev": true,
+            "requires": {
+                "async-done": "^1.2.2"
+            }
+        },
+        "asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+            "dev": true
+        },
+        "at-least-node": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+            "dev": true
+        },
+        "atob": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+            "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+            "dev": true
+        },
+        "available-typed-arrays": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz",
+            "integrity": "sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==",
+            "dev": true,
+            "requires": {
+                "array-filter": "^1.0.0"
+            }
+        },
+        "azure-devops-node-api": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.1.1.tgz",
+            "integrity": "sha512-P4Hyrh/+Nzc2KXQk73z72/GsenSWIH5o8uiyELqykJYs9TWTVCxVwghoR7lPeiY6QVoXkq2S2KtvAgi5fyjl9w==",
+            "dev": true,
+            "requires": {
+                "tunnel": "0.0.6",
+                "typed-rest-client": "^1.7.3",
+                "underscore": "1.8.3"
+            }
+        },
+        "bach": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+            "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+            "dev": true,
+            "requires": {
+                "arr-filter": "^1.1.1",
+                "arr-flatten": "^1.0.1",
+                "arr-map": "^2.0.0",
+                "array-each": "^1.0.0",
+                "array-initial": "^1.0.0",
+                "array-last": "^1.1.1",
+                "async-done": "^1.2.2",
+                "async-settle": "^1.0.0",
+                "now-and-later": "^2.0.0"
+            }
+        },
+        "balanced-match": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+            "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+            "dev": true
+        },
+        "base": {
+            "version": "0.11.2",
+            "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+            "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+            "dev": true,
+            "requires": {
+                "cache-base": "^1.0.1",
+                "class-utils": "^0.3.5",
+                "component-emitter": "^1.2.1",
+                "define-property": "^1.0.0",
+                "isobject": "^3.0.1",
+                "mixin-deep": "^1.2.0",
+                "pascalcase": "^0.1.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "dev": true
+        },
+        "before-after-hook": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz",
+            "integrity": "sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==",
+            "dev": true
+        },
+        "binary-extensions": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+            "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+            "dev": true
+        },
+        "bindings": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "file-uri-to-path": "1.0.0"
+            }
+        },
+        "bn.js": {
+            "version": "5.1.3",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+            "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+            "dev": true
+        },
+        "brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "braces": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+            "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+            "dev": true,
+            "requires": {
+                "arr-flatten": "^1.1.0",
+                "array-unique": "^0.3.2",
+                "extend-shallow": "^2.0.1",
+                "fill-range": "^4.0.0",
+                "isobject": "^3.0.1",
+                "repeat-element": "^1.1.2",
+                "snapdragon": "^0.8.1",
+                "snapdragon-node": "^2.0.1",
+                "split-string": "^3.0.2",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "brorand": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+            "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+            "dev": true
+        },
+        "browser-pack": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
+            "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
+            "dev": true,
+            "requires": {
+                "JSONStream": "^1.0.3",
+                "combine-source-map": "~0.8.0",
+                "defined": "^1.0.0",
+                "safe-buffer": "^5.1.1",
+                "through2": "^2.0.0",
+                "umd": "^3.0.0"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "browser-resolve": {
+            "version": "1.11.3",
+            "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+            "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+            "dev": true,
+            "requires": {
+                "resolve": "1.1.7"
+            }
+        },
+        "browser-stdout": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+            "dev": true
+        },
+        "browserify": {
+            "version": "17.0.0",
+            "resolved": "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz",
+            "integrity": "sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==",
+            "dev": true,
+            "requires": {
+                "JSONStream": "^1.0.3",
+                "assert": "^1.4.0",
+                "browser-pack": "^6.0.1",
+                "browser-resolve": "^2.0.0",
+                "browserify-zlib": "~0.2.0",
+                "buffer": "~5.2.1",
+                "cached-path-relative": "^1.0.0",
+                "concat-stream": "^1.6.0",
+                "console-browserify": "^1.1.0",
+                "constants-browserify": "~1.0.0",
+                "crypto-browserify": "^3.0.0",
+                "defined": "^1.0.0",
+                "deps-sort": "^2.0.1",
+                "domain-browser": "^1.2.0",
+                "duplexer2": "~0.1.2",
+                "events": "^3.0.0",
+                "glob": "^7.1.0",
+                "has": "^1.0.0",
+                "htmlescape": "^1.1.0",
+                "https-browserify": "^1.0.0",
+                "inherits": "~2.0.1",
+                "insert-module-globals": "^7.2.1",
+                "labeled-stream-splicer": "^2.0.0",
+                "mkdirp-classic": "^0.5.2",
+                "module-deps": "^6.2.3",
+                "os-browserify": "~0.3.0",
+                "parents": "^1.0.1",
+                "path-browserify": "^1.0.0",
+                "process": "~0.11.0",
+                "punycode": "^1.3.2",
+                "querystring-es3": "~0.2.0",
+                "read-only-stream": "^2.0.0",
+                "readable-stream": "^2.0.2",
+                "resolve": "^1.1.4",
+                "shasum-object": "^1.0.0",
+                "shell-quote": "^1.6.1",
+                "stream-browserify": "^3.0.0",
+                "stream-http": "^3.0.0",
+                "string_decoder": "^1.1.1",
+                "subarg": "^1.0.0",
+                "syntax-error": "^1.1.1",
+                "through2": "^2.0.0",
+                "timers-browserify": "^1.0.1",
+                "tty-browserify": "0.0.1",
+                "url": "~0.11.0",
+                "util": "~0.12.0",
+                "vm-browserify": "^1.0.0",
+                "xtend": "^4.0.0"
+            },
+            "dependencies": {
+                "browser-resolve": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+                    "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
+                    "dev": true,
+                    "requires": {
+                        "resolve": "^1.17.0"
+                    },
+                    "dependencies": {
+                        "resolve": {
+                            "version": "1.19.0",
+                            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+                            "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+                            "dev": true,
+                            "requires": {
+                                "is-core-module": "^2.1.0",
+                                "path-parse": "^1.0.6"
+                            }
+                        }
+                    }
+                },
+                "is-core-module": {
+                    "version": "2.2.0",
+                    "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+                    "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+                    "dev": true,
+                    "requires": {
+                        "has": "^1.0.3"
+                    }
+                },
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "browserify-aes": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+            "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+            "dev": true,
+            "requires": {
+                "buffer-xor": "^1.0.3",
+                "cipher-base": "^1.0.0",
+                "create-hash": "^1.1.0",
+                "evp_bytestokey": "^1.0.3",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "browserify-cipher": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+            "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+            "dev": true,
+            "requires": {
+                "browserify-aes": "^1.0.4",
+                "browserify-des": "^1.0.0",
+                "evp_bytestokey": "^1.0.0"
+            }
+        },
+        "browserify-des": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+            "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.1",
+                "des.js": "^1.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "browserify-rsa": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+            "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^5.0.0",
+                "randombytes": "^2.0.1"
+            }
+        },
+        "browserify-sign": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+            "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^5.1.1",
+                "browserify-rsa": "^4.0.1",
+                "create-hash": "^1.2.0",
+                "create-hmac": "^1.1.7",
+                "elliptic": "^6.5.3",
+                "inherits": "^2.0.4",
+                "parse-asn1": "^5.1.5",
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "browserify-zlib": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+            "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+            "dev": true,
+            "requires": {
+                "pako": "~1.0.5"
+            }
+        },
+        "buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+            "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+            "dev": true,
+            "requires": {
+                "base64-js": "^1.0.2",
+                "ieee754": "^1.1.4"
+            }
+        },
+        "buffer-equal": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+            "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+            "dev": true
+        },
+        "buffer-from": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+            "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+            "dev": true
+        },
+        "buffer-xor": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+            "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+            "dev": true
+        },
+        "builtin-status-codes": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+            "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+            "dev": true
+        },
+        "cache-base": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+            "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+            "dev": true,
+            "requires": {
+                "collection-visit": "^1.0.0",
+                "component-emitter": "^1.2.1",
+                "get-value": "^2.0.6",
+                "has-value": "^1.0.0",
+                "isobject": "^3.0.1",
+                "set-value": "^2.0.0",
+                "to-object-path": "^0.3.0",
+                "union-value": "^1.0.0",
+                "unset-value": "^1.0.0"
+            }
+        },
+        "cached-path-relative": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
+            "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==",
+            "dev": true
+        },
+        "callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true
+        },
+        "camelcase": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+            "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+            "dev": true
+        },
+        "chai": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+            "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+            "dev": true,
+            "requires": {
+                "assertion-error": "^1.1.0",
+                "check-error": "^1.0.2",
+                "deep-eql": "^3.0.1",
+                "get-func-name": "^2.0.0",
+                "pathval": "^1.1.0",
+                "type-detect": "^4.0.5"
+            }
+        },
+        "chalk": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+            "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            }
+        },
+        "check-error": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+            "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+            "dev": true
+        },
+        "chokidar": {
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+            "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+            "dev": true,
+            "requires": {
+                "anymatch": "^2.0.0",
+                "async-each": "^1.0.1",
+                "braces": "^2.3.2",
+                "fsevents": "^1.2.7",
+                "glob-parent": "^3.1.0",
+                "inherits": "^2.0.3",
+                "is-binary-path": "^1.0.0",
+                "is-glob": "^4.0.0",
+                "normalize-path": "^3.0.0",
+                "path-is-absolute": "^1.0.0",
+                "readdirp": "^2.2.1",
+                "upath": "^1.1.1"
+            }
+        },
+        "cipher-base": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+            "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "class-utils": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+            "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+            "dev": true,
+            "requires": {
+                "arr-union": "^3.1.0",
+                "define-property": "^0.2.5",
+                "isobject": "^3.0.0",
+                "static-extend": "^0.1.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "clean-stack": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+            "dev": true
+        },
+        "cliui": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+            "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+            "dev": true,
+            "requires": {
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wrap-ansi": "^2.0.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                    "dev": true
+                },
+                "is-fullwidth-code-point": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+                    "dev": true,
+                    "requires": {
+                        "number-is-nan": "^1.0.0"
+                    }
+                },
+                "string-width": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                    "dev": true,
+                    "requires": {
+                        "code-point-at": "^1.0.0",
+                        "is-fullwidth-code-point": "^1.0.0",
+                        "strip-ansi": "^3.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^2.0.0"
+                    }
+                }
+            }
+        },
+        "clone": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+            "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+            "dev": true
+        },
+        "clone-buffer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+            "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+            "dev": true
+        },
+        "clone-stats": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+            "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+            "dev": true
+        },
+        "cloneable-readable": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+            "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "process-nextick-args": "^2.0.0",
+                "readable-stream": "^2.3.5"
+            }
+        },
+        "code-point-at": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+            "dev": true
+        },
+        "collection-map": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+            "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+            "dev": true,
+            "requires": {
+                "arr-map": "^2.0.2",
+                "for-own": "^1.0.0",
+                "make-iterator": "^1.0.0"
+            }
+        },
+        "collection-visit": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+            "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+            "dev": true,
+            "requires": {
+                "map-visit": "^1.0.0",
+                "object-visit": "^1.0.0"
+            }
+        },
+        "color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "requires": {
+                "color-name": "~1.1.4"
+            }
+        },
+        "color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true
+        },
+        "color-support": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+            "dev": true
+        },
+        "combine-source-map": {
+            "version": "0.8.0",
+            "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
+            "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
+            "dev": true,
+            "requires": {
+                "convert-source-map": "~1.1.0",
+                "inline-source-map": "~0.6.0",
+                "lodash.memoize": "~3.0.3",
+                "source-map": "~0.5.3"
+            },
+            "dependencies": {
+                "convert-source-map": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+                    "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=",
+                    "dev": true
+                }
+            }
+        },
+        "combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
+            "requires": {
+                "delayed-stream": "~1.0.0"
+            }
+        },
+        "comment-parser": {
+            "version": "0.7.6",
+            "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz",
+            "integrity": "sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==",
+            "dev": true
+        },
+        "component-emitter": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+            "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+            "dev": true
+        },
+        "concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true
+        },
+        "concat-stream": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+            "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+            "dev": true,
+            "requires": {
+                "buffer-from": "^1.0.0",
+                "inherits": "^2.0.3",
+                "readable-stream": "^2.2.2",
+                "typedarray": "^0.0.6"
+            }
+        },
+        "concat-with-sourcemaps": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+            "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+            "dev": true,
+            "requires": {
+                "source-map": "^0.6.1"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                }
+            }
+        },
+        "console-browserify": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+            "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+            "dev": true
+        },
+        "constants-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+            "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+            "dev": true
+        },
+        "contains-path": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+            "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+            "dev": true
+        },
+        "convert-source-map": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+            "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "~5.1.1"
+            }
+        },
+        "copy-descriptor": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+            "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+            "dev": true
+        },
+        "copy-props": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+            "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+            "dev": true,
+            "requires": {
+                "each-props": "^1.3.0",
+                "is-plain-object": "^2.0.1"
+            },
+            "dependencies": {
+                "is-plain-object": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+                    "dev": true,
+                    "requires": {
+                        "isobject": "^3.0.1"
+                    }
+                }
+            }
+        },
+        "core-util-is": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+            "dev": true
+        },
+        "create-ecdh": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+            "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "elliptic": "^6.5.3"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "create-hash": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+            "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.1",
+                "inherits": "^2.0.1",
+                "md5.js": "^1.3.4",
+                "ripemd160": "^2.0.1",
+                "sha.js": "^2.4.0"
+            }
+        },
+        "create-hmac": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+            "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.3",
+                "create-hash": "^1.1.0",
+                "inherits": "^2.0.1",
+                "ripemd160": "^2.0.0",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "cross-spawn": {
+            "version": "6.0.5",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+            "dev": true,
+            "requires": {
+                "nice-try": "^1.0.4",
+                "path-key": "^2.0.1",
+                "semver": "^5.5.0",
+                "shebang-command": "^1.2.0",
+                "which": "^1.2.9"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "5.7.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "dev": true
+                }
+            }
+        },
+        "crypto-browserify": {
+            "version": "3.12.0",
+            "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+            "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+            "dev": true,
+            "requires": {
+                "browserify-cipher": "^1.0.0",
+                "browserify-sign": "^4.0.0",
+                "create-ecdh": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "create-hmac": "^1.1.0",
+                "diffie-hellman": "^5.0.0",
+                "inherits": "^2.0.1",
+                "pbkdf2": "^3.0.3",
+                "public-encrypt": "^4.0.0",
+                "randombytes": "^2.0.0",
+                "randomfill": "^1.0.3"
+            }
+        },
+        "css": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+            "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.4",
+                "source-map": "^0.6.1",
+                "source-map-resolve": "^0.6.0"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
+                "source-map-resolve": {
+                    "version": "0.6.0",
+                    "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+                    "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+                    "dev": true,
+                    "requires": {
+                        "atob": "^2.1.2",
+                        "decode-uri-component": "^0.2.0"
+                    }
+                }
+            }
+        },
+        "d": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+            "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+            "dev": true,
+            "requires": {
+                "es5-ext": "^0.10.50",
+                "type": "^1.0.1"
+            }
+        },
+        "dash-ast": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
+            "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==",
+            "dev": true
+        },
+        "debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "requires": {
+                "ms": "2.0.0"
+            },
+            "dependencies": {
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "dev": true
+                }
+            }
+        },
+        "debug-fabulous": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+            "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+            "dev": true,
+            "requires": {
+                "debug": "3.X",
+                "memoizee": "0.4.X",
+                "object-assign": "4.X"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "3.2.7",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+                    "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "^2.1.1"
+                    }
+                }
+            }
+        },
+        "decamelize": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+            "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+            "dev": true
+        },
+        "decode-uri-component": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+            "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+            "dev": true
+        },
+        "deep-eql": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+            "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+            "dev": true,
+            "requires": {
+                "type-detect": "^4.0.0"
+            }
+        },
+        "deep-is": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+            "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+            "dev": true
+        },
+        "default-compare": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+            "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+            "dev": true,
+            "requires": {
+                "kind-of": "^5.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+                    "dev": true
+                }
+            }
+        },
+        "default-resolution": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+            "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+            "dev": true
+        },
+        "define-properties": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+            "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+            "requires": {
+                "object-keys": "^1.0.12"
+            }
+        },
+        "define-property": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+            "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+            "dev": true,
+            "requires": {
+                "is-descriptor": "^1.0.2",
+                "isobject": "^3.0.1"
+            },
+            "dependencies": {
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "defined": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+            "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+            "dev": true
+        },
+        "del": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
+            "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==",
+            "dev": true,
+            "requires": {
+                "globby": "^10.0.1",
+                "graceful-fs": "^4.2.2",
+                "is-glob": "^4.0.1",
+                "is-path-cwd": "^2.2.0",
+                "is-path-inside": "^3.0.1",
+                "p-map": "^3.0.0",
+                "rimraf": "^3.0.0",
+                "slash": "^3.0.0"
+            }
+        },
+        "delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+            "dev": true
+        },
+        "deprecation": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+            "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+            "dev": true
+        },
+        "deps-sort": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz",
+            "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==",
+            "dev": true,
+            "requires": {
+                "JSONStream": "^1.0.3",
+                "shasum-object": "^1.0.0",
+                "subarg": "^1.0.0",
+                "through2": "^2.0.0"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "des.js": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+            "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "detect-file": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+            "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+            "dev": true
+        },
+        "detect-newline": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+            "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+            "dev": true
+        },
+        "detective": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
+            "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
+            "dev": true,
+            "requires": {
+                "acorn-node": "^1.6.1",
+                "defined": "^1.0.0",
+                "minimist": "^1.1.1"
+            }
+        },
+        "diff": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+            "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+            "dev": true
+        },
+        "diffie-hellman": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+            "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "miller-rabin": "^4.0.0",
+                "randombytes": "^2.0.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "dir-glob": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+            "dev": true,
+            "requires": {
+                "path-type": "^4.0.0"
+            }
+        },
+        "doctrine": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+            "dev": true,
+            "requires": {
+                "esutils": "^2.0.2"
+            }
+        },
+        "domain-browser": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+            "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+            "dev": true
+        },
+        "duplexer2": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+            "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+            "dev": true,
+            "requires": {
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "duplexify": {
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+            "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+            "dev": true,
+            "requires": {
+                "end-of-stream": "^1.0.0",
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.0.0",
+                "stream-shift": "^1.0.0"
+            }
+        },
+        "each-props": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+            "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+            "dev": true,
+            "requires": {
+                "is-plain-object": "^2.0.1",
+                "object.defaults": "^1.1.0"
+            },
+            "dependencies": {
+                "is-plain-object": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+                    "dev": true,
+                    "requires": {
+                        "isobject": "^3.0.1"
+                    }
+                }
+            }
+        },
+        "elliptic": {
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+            "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.4.0",
+                "brorand": "^1.0.1",
+                "hash.js": "^1.0.0",
+                "hmac-drbg": "^1.0.0",
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0",
+                "minimalistic-crypto-utils": "^1.0.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "emoji-regex": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+            "dev": true
+        },
+        "end-of-stream": {
+            "version": "1.4.4",
+            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+            "dev": true,
+            "requires": {
+                "once": "^1.4.0"
+            }
+        },
+        "enquirer": {
+            "version": "2.3.6",
+            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+            "dev": true,
+            "requires": {
+                "ansi-colors": "^4.1.1"
+            },
+            "dependencies": {
+                "ansi-colors": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+                    "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+                    "dev": true
+                }
+            }
+        },
+        "error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "requires": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "es-abstract": {
+            "version": "1.17.7",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+            "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+            "dev": true,
+            "requires": {
+                "es-to-primitive": "^1.2.1",
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1",
+                "is-callable": "^1.2.2",
+                "is-regex": "^1.1.1",
+                "object-inspect": "^1.8.0",
+                "object-keys": "^1.1.1",
+                "object.assign": "^4.1.1",
+                "string.prototype.trimend": "^1.0.1",
+                "string.prototype.trimstart": "^1.0.1"
+            },
+            "dependencies": {
+                "es-abstract": {
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+                    "requires": {
+                        "es-to-primitive": "^1.2.1",
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.1",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
+                        "object-keys": "^1.1.1",
+                        "object.assign": "^4.1.1",
+                        "string.prototype.trimend": "^1.0.1",
+                        "string.prototype.trimstart": "^1.0.1"
+                    }
+                },
+                "object.assign": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+                    "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+                    "requires": {
+                        "define-properties": "^1.1.3",
+                        "es-abstract": "^1.18.0-next.0",
+                        "has-symbols": "^1.0.1",
+                        "object-keys": "^1.1.1"
+                    },
+                    "dependencies": {
+                        "es-abstract": {
+                            "version": "1.18.0-next.1",
+                            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                            "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+                            "requires": {
+                                "es-to-primitive": "^1.2.1",
+                                "function-bind": "^1.1.1",
+                                "has": "^1.0.3",
+                                "has-symbols": "^1.0.1",
+                                "is-callable": "^1.2.2",
+                                "is-negative-zero": "^2.0.0",
+                                "is-regex": "^1.1.1",
+                                "object-inspect": "^1.8.0",
+                                "object-keys": "^1.1.1",
+                                "object.assign": "^4.1.1",
+                                "string.prototype.trimend": "^1.0.1",
+                                "string.prototype.trimstart": "^1.0.1"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "es-to-primitive": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+            "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+            "requires": {
+                "is-callable": "^1.1.4",
+                "is-date-object": "^1.0.1",
+                "is-symbol": "^1.0.2"
+            }
+        },
+        "es5-ext": {
+            "version": "0.10.53",
+            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+            "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+            "dev": true,
+            "requires": {
+                "es6-iterator": "~2.0.3",
+                "es6-symbol": "~3.1.3",
+                "next-tick": "~1.0.0"
+            }
+        },
+        "es6-iterator": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+            "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+            "dev": true,
+            "requires": {
+                "d": "1",
+                "es5-ext": "^0.10.35",
+                "es6-symbol": "^3.1.1"
+            }
+        },
+        "es6-symbol": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+            "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+            "dev": true,
+            "requires": {
+                "d": "^1.0.1",
+                "ext": "^1.1.2"
+            }
+        },
+        "es6-weak-map": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+            "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+            "dev": true,
+            "requires": {
+                "d": "1",
+                "es5-ext": "^0.10.46",
+                "es6-iterator": "^2.0.3",
+                "es6-symbol": "^3.1.1"
+            }
+        },
+        "escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "dev": true
+        },
+        "escodegen": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+            "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+            "dev": true,
+            "requires": {
+                "esprima": "^2.7.1",
+                "estraverse": "^1.9.1",
+                "esutils": "^2.0.2",
+                "optionator": "^0.8.1",
+                "source-map": "~0.2.0"
+            },
+            "dependencies": {
+                "esprima": {
+                    "version": "2.7.3",
+                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+                    "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+                    "dev": true
+                },
+                "estraverse": {
+                    "version": "1.9.3",
+                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+                    "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+                    "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "amdefine": ">=0.0.4"
+                    }
+                }
+            }
+        },
+        "eslint": {
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz",
+            "integrity": "sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.0.0",
+                "@eslint/eslintrc": "^0.2.1",
+                "ajv": "^6.10.0",
+                "chalk": "^4.0.0",
+                "cross-spawn": "^7.0.2",
+                "debug": "^4.0.1",
+                "doctrine": "^3.0.0",
+                "enquirer": "^2.3.5",
+                "eslint-scope": "^5.1.1",
+                "eslint-utils": "^2.1.0",
+                "eslint-visitor-keys": "^2.0.0",
+                "espree": "^7.3.0",
+                "esquery": "^1.2.0",
+                "esutils": "^2.0.2",
+                "file-entry-cache": "^5.0.1",
+                "functional-red-black-tree": "^1.0.1",
+                "glob-parent": "^5.0.0",
+                "globals": "^12.1.0",
+                "ignore": "^4.0.6",
+                "import-fresh": "^3.0.0",
+                "imurmurhash": "^0.1.4",
+                "is-glob": "^4.0.0",
+                "js-yaml": "^3.13.1",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "levn": "^0.4.1",
+                "lodash": "^4.17.19",
+                "minimatch": "^3.0.4",
+                "natural-compare": "^1.4.0",
+                "optionator": "^0.9.1",
+                "progress": "^2.0.0",
+                "regexpp": "^3.1.0",
+                "semver": "^7.2.1",
+                "strip-ansi": "^6.0.0",
+                "strip-json-comments": "^3.1.0",
+                "table": "^5.2.3",
+                "text-table": "^0.2.0",
+                "v8-compile-cache": "^2.0.3"
+            },
+            "dependencies": {
+                "cross-spawn": {
+                    "version": "7.0.3",
+                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+                    "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+                    "dev": true,
+                    "requires": {
+                        "path-key": "^3.1.0",
+                        "shebang-command": "^2.0.0",
+                        "which": "^2.0.1"
+                    }
+                },
+                "debug": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "glob-parent": {
+                    "version": "5.1.1",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+                    "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+                    "dev": true,
+                    "requires": {
+                        "is-glob": "^4.0.1"
+                    }
+                },
+                "ignore": {
+                    "version": "4.0.6",
+                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+                    "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+                    "dev": true
+                },
+                "levn": {
+                    "version": "0.4.1",
+                    "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+                    "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+                    "dev": true,
+                    "requires": {
+                        "prelude-ls": "^1.2.1",
+                        "type-check": "~0.4.0"
+                    }
+                },
+                "optionator": {
+                    "version": "0.9.1",
+                    "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+                    "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+                    "dev": true,
+                    "requires": {
+                        "deep-is": "^0.1.3",
+                        "fast-levenshtein": "^2.0.6",
+                        "levn": "^0.4.1",
+                        "prelude-ls": "^1.2.1",
+                        "type-check": "^0.4.0",
+                        "word-wrap": "^1.2.3"
+                    }
+                },
+                "path-key": {
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+                    "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+                    "dev": true
+                },
+                "prelude-ls": {
+                    "version": "1.2.1",
+                    "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+                    "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+                    "dev": true
+                },
+                "shebang-command": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+                    "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+                    "dev": true,
+                    "requires": {
+                        "shebang-regex": "^3.0.0"
+                    }
+                },
+                "shebang-regex": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+                    "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+                    "dev": true
+                },
+                "type-check": {
+                    "version": "0.4.0",
+                    "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+                    "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+                    "dev": true,
+                    "requires": {
+                        "prelude-ls": "^1.2.1"
+                    }
+                },
+                "which": {
+                    "version": "2.0.2",
+                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+                    "dev": true,
+                    "requires": {
+                        "isexe": "^2.0.0"
+                    }
+                }
+            }
+        },
+        "eslint-formatter-autolinkable-stylish": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/eslint-formatter-autolinkable-stylish/-/eslint-formatter-autolinkable-stylish-1.1.4.tgz",
+            "integrity": "sha512-aw8TKZLTiSMMstbfWNQiFZ0Em0sBW32NP8O8RUVPiF9kPjoYWg6M1lXcBr6MGijt39tmSFrdibgWQ2S6HYVsMA==",
+            "dev": true,
+            "requires": {
+                "chalk": "^4.1.0",
+                "plur": "^4.0.0"
+            }
+        },
+        "eslint-import-resolver-node": {
+            "version": "0.3.4",
+            "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+            "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+            "dev": true,
+            "requires": {
+                "debug": "^2.6.9",
+                "resolve": "^1.13.1"
+            },
+            "dependencies": {
+                "resolve": {
+                    "version": "1.18.1",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
+                    "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+                    "dev": true,
+                    "requires": {
+                        "is-core-module": "^2.0.0",
+                        "path-parse": "^1.0.6"
+                    }
+                }
+            }
+        },
+        "eslint-module-utils": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+            "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+            "dev": true,
+            "requires": {
+                "debug": "^2.6.9",
+                "pkg-dir": "^2.0.0"
+            }
+        },
+        "eslint-plugin-import": {
+            "version": "2.22.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+            "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
+            "dev": true,
+            "requires": {
+                "array-includes": "^3.1.1",
+                "array.prototype.flat": "^1.2.3",
+                "contains-path": "^0.1.0",
+                "debug": "^2.6.9",
+                "doctrine": "1.5.0",
+                "eslint-import-resolver-node": "^0.3.4",
+                "eslint-module-utils": "^2.6.0",
+                "has": "^1.0.3",
+                "minimatch": "^3.0.4",
+                "object.values": "^1.1.1",
+                "read-pkg-up": "^2.0.0",
+                "resolve": "^1.17.0",
+                "tsconfig-paths": "^3.9.0"
+            },
+            "dependencies": {
+                "doctrine": {
+                    "version": "1.5.0",
+                    "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+                    "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+                    "dev": true,
+                    "requires": {
+                        "esutils": "^2.0.2",
+                        "isarray": "^1.0.0"
+                    }
+                },
+                "resolve": {
+                    "version": "1.18.1",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
+                    "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+                    "dev": true,
+                    "requires": {
+                        "is-core-module": "^2.0.0",
+                        "path-parse": "^1.0.6"
+                    }
+                }
+            }
+        },
+        "eslint-plugin-jsdoc": {
+            "version": "30.7.6",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.6.tgz",
+            "integrity": "sha512-w18IOiS/9ahKgRfQOuHbce+EQYx3fwIkZhUZDEK+augNlhJkzgTSZkrBkzaflSbFNZ9/Tk4xzUABEaTbsBSzew==",
+            "dev": true,
+            "requires": {
+                "comment-parser": "^0.7.6",
+                "debug": "^4.2.0",
+                "jsdoctypeparser": "^9.0.0",
+                "lodash": "^4.17.20",
+                "regextras": "^0.7.1",
+                "semver": "^7.3.2",
+                "spdx-expression-parse": "^3.0.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                }
+            }
+        },
+        "eslint-plugin-no-null": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-no-null/-/eslint-plugin-no-null-1.0.2.tgz",
+            "integrity": "sha1-EjaoEjkTkKGHetQAfCbnRTQclR8=",
+            "dev": true
+        },
+        "eslint-scope": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+            "dev": true,
+            "requires": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^4.1.1"
+            }
+        },
+        "eslint-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+            "dev": true,
+            "requires": {
+                "eslint-visitor-keys": "^1.1.0"
+            },
+            "dependencies": {
+                "eslint-visitor-keys": {
+                    "version": "1.3.0",
+                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+                    "dev": true
+                }
+            }
+        },
+        "eslint-visitor-keys": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+            "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+            "dev": true
+        },
+        "espree": {
+            "version": "7.3.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz",
+            "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==",
+            "dev": true,
+            "requires": {
+                "acorn": "^7.4.0",
+                "acorn-jsx": "^5.2.0",
+                "eslint-visitor-keys": "^1.3.0"
+            },
+            "dependencies": {
+                "eslint-visitor-keys": {
+                    "version": "1.3.0",
+                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+                    "dev": true
+                }
+            }
+        },
+        "esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true
+        },
+        "esquery": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+            "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+            "dev": true,
+            "requires": {
+                "estraverse": "^5.1.0"
+            },
+            "dependencies": {
+                "estraverse": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+                    "dev": true
+                }
+            }
+        },
+        "esrecurse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+            "dev": true,
+            "requires": {
+                "estraverse": "^5.2.0"
+            },
+            "dependencies": {
+                "estraverse": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+                    "dev": true
+                }
+            }
+        },
+        "estraverse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+            "dev": true
+        },
+        "esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true
+        },
+        "event-emitter": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+            "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+            "dev": true,
+            "requires": {
+                "d": "1",
+                "es5-ext": "~0.10.14"
+            }
+        },
+        "events": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+            "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+            "dev": true
+        },
+        "evp_bytestokey": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+            "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+            "dev": true,
+            "requires": {
+                "md5.js": "^1.3.4",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "execa": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+            "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+            "dev": true,
+            "requires": {
+                "cross-spawn": "^6.0.0",
+                "get-stream": "^4.0.0",
+                "is-stream": "^1.1.0",
+                "npm-run-path": "^2.0.0",
+                "p-finally": "^1.0.0",
+                "signal-exit": "^3.0.0",
+                "strip-eof": "^1.0.0"
+            }
+        },
+        "expand-brackets": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+            "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+            "dev": true,
+            "requires": {
+                "debug": "^2.3.3",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "posix-character-classes": "^0.1.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "expand-tilde": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+            "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+            "dev": true,
+            "requires": {
+                "homedir-polyfill": "^1.0.1"
+            }
+        },
+        "ext": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+            "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+            "dev": true,
+            "requires": {
+                "type": "^2.0.0"
+            },
+            "dependencies": {
+                "type": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
+                    "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+                    "dev": true
+                }
+            }
+        },
+        "extend": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+            "dev": true
+        },
+        "extend-shallow": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+            "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+            "dev": true,
+            "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+            },
+            "dependencies": {
+                "is-extendable": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+                    "dev": true,
+                    "requires": {
+                        "is-plain-object": "^2.0.4"
+                    }
+                },
+                "is-plain-object": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+                    "dev": true,
+                    "requires": {
+                        "isobject": "^3.0.1"
+                    }
+                }
+            }
+        },
+        "extglob": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+            "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+            "dev": true,
+            "requires": {
+                "array-unique": "^0.3.2",
+                "define-property": "^1.0.0",
+                "expand-brackets": "^2.1.4",
+                "extend-shallow": "^2.0.1",
+                "fragment-cache": "^0.2.1",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "fancy-log": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+            "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+            "dev": true,
+            "requires": {
+                "ansi-gray": "^0.1.1",
+                "color-support": "^1.1.3",
+                "parse-node-version": "^1.0.0",
+                "time-stamp": "^1.0.0"
+            }
+        },
+        "fast-deep-equal": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true
+        },
+        "fast-glob": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+            "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.0",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.2",
+                "picomatch": "^2.2.1"
+            },
+            "dependencies": {
+                "braces": {
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+                    "dev": true,
+                    "requires": {
+                        "fill-range": "^7.0.1"
+                    }
+                },
+                "fill-range": {
+                    "version": "7.0.1",
+                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+                    "dev": true,
+                    "requires": {
+                        "to-regex-range": "^5.0.1"
+                    }
+                },
+                "glob-parent": {
+                    "version": "5.1.1",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+                    "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+                    "dev": true,
+                    "requires": {
+                        "is-glob": "^4.0.1"
+                    }
+                },
+                "is-number": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+                    "dev": true
+                },
+                "micromatch": {
+                    "version": "4.0.2",
+                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+                    "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+                    "dev": true,
+                    "requires": {
+                        "braces": "^3.0.1",
+                        "picomatch": "^2.0.5"
+                    }
+                },
+                "to-regex-range": {
+                    "version": "5.0.1",
+                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+                    "dev": true,
+                    "requires": {
+                        "is-number": "^7.0.0"
+                    }
+                }
+            }
+        },
+        "fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true
+        },
+        "fast-levenshtein": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+            "dev": true
+        },
+        "fast-safe-stringify": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+            "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+            "dev": true
+        },
+        "fastq": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+            "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+            "dev": true,
+            "requires": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "file-entry-cache": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+            "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+            "dev": true,
+            "requires": {
+                "flat-cache": "^2.0.1"
+            }
+        },
+        "file-uri-to-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+            "dev": true,
+            "optional": true
+        },
+        "fill-range": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+            "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1",
+                "to-regex-range": "^2.1.0"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "find-up": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+            "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+            "dev": true,
+            "requires": {
+                "locate-path": "^2.0.0"
+            }
+        },
+        "findup-sync": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+            "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+            "dev": true,
+            "requires": {
+                "detect-file": "^1.0.0",
+                "is-glob": "^4.0.0",
+                "micromatch": "^3.0.4",
+                "resolve-dir": "^1.0.1"
+            }
+        },
+        "fined": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+            "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+            "dev": true,
+            "requires": {
+                "expand-tilde": "^2.0.2",
+                "is-plain-object": "^2.0.3",
+                "object.defaults": "^1.1.0",
+                "object.pick": "^1.2.0",
+                "parse-filepath": "^1.0.1"
+            },
+            "dependencies": {
+                "is-plain-object": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+                    "dev": true,
+                    "requires": {
+                        "isobject": "^3.0.1"
+                    }
+                }
+            }
+        },
+        "flagged-respawn": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+            "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+            "dev": true
+        },
+        "flat": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+            "dev": true
+        },
+        "flat-cache": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+            "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+            "dev": true,
+            "requires": {
+                "flatted": "^2.0.0",
+                "rimraf": "2.6.3",
+                "write": "1.0.3"
+            },
+            "dependencies": {
+                "rimraf": {
+                    "version": "2.6.3",
+                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+                    "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+                    "dev": true,
+                    "requires": {
+                        "glob": "^7.1.3"
+                    }
+                }
+            }
+        },
+        "flatted": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+            "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+            "dev": true
+        },
+        "flush-write-stream": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+            "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.3",
+                "readable-stream": "^2.3.6"
+            }
+        },
+        "for-in": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+            "dev": true
+        },
+        "for-own": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+            "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+            "dev": true,
+            "requires": {
+                "for-in": "^1.0.1"
+            }
+        },
+        "foreach": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+            "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+            "dev": true
+        },
+        "form-data": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+            "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+            "dev": true,
+            "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            }
+        },
+        "fragment-cache": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+            "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+            "dev": true,
+            "requires": {
+                "map-cache": "^0.2.2"
+            }
+        },
+        "fs-extra": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
+            "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+            "dev": true,
+            "requires": {
+                "at-least-node": "^1.0.0",
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^1.0.0"
+            }
+        },
+        "fs-mkdirp-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+            "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.1.11",
+                "through2": "^2.0.3"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+            "dev": true
+        },
+        "fsevents": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+            "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "bindings": "^1.5.0",
+                "nan": "^2.12.1"
+            }
+        },
+        "function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+        },
+        "functional-red-black-tree": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+            "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+            "dev": true
+        },
+        "get-assigned-identifiers": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
+            "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==",
+            "dev": true
+        },
+        "get-caller-file": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+            "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+            "dev": true
+        },
+        "get-func-name": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+            "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+            "dev": true
+        },
+        "get-stream": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+            "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+            "dev": true,
+            "requires": {
+                "pump": "^3.0.0"
+            },
+            "dependencies": {
+                "pump": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+                    "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+                    "dev": true,
+                    "requires": {
+                        "end-of-stream": "^1.1.0",
+                        "once": "^1.3.1"
+                    }
+                }
+            }
+        },
+        "get-value": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+            "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+            "dev": true
+        },
+        "glob": {
+            "version": "7.1.6",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+            "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+            "dev": true,
+            "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            }
+        },
+        "glob-parent": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+            "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+            "dev": true,
+            "requires": {
+                "is-glob": "^3.1.0",
+                "path-dirname": "^1.0.0"
+            },
+            "dependencies": {
+                "is-glob": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+                    "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+                    "dev": true,
+                    "requires": {
+                        "is-extglob": "^2.1.0"
+                    }
+                }
+            }
+        },
+        "glob-stream": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+            "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+            "dev": true,
+            "requires": {
+                "extend": "^3.0.0",
+                "glob": "^7.1.1",
+                "glob-parent": "^3.1.0",
+                "is-negated-glob": "^1.0.0",
+                "ordered-read-streams": "^1.0.0",
+                "pumpify": "^1.3.5",
+                "readable-stream": "^2.1.5",
+                "remove-trailing-separator": "^1.0.1",
+                "to-absolute-glob": "^2.0.0",
+                "unique-stream": "^2.0.2"
+            }
+        },
+        "glob-watcher": {
+            "version": "5.0.5",
+            "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+            "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+            "dev": true,
+            "requires": {
+                "anymatch": "^2.0.0",
+                "async-done": "^1.2.0",
+                "chokidar": "^2.0.0",
+                "is-negated-glob": "^1.0.0",
+                "just-debounce": "^1.0.0",
+                "normalize-path": "^3.0.0",
+                "object.defaults": "^1.1.0"
+            }
+        },
+        "global-modules": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+            "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+            "dev": true,
+            "requires": {
+                "global-prefix": "^1.0.1",
+                "is-windows": "^1.0.1",
+                "resolve-dir": "^1.0.0"
+            }
+        },
+        "global-prefix": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+            "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+            "dev": true,
+            "requires": {
+                "expand-tilde": "^2.0.2",
+                "homedir-polyfill": "^1.0.1",
+                "ini": "^1.3.4",
+                "is-windows": "^1.0.1",
+                "which": "^1.2.14"
+            }
+        },
+        "globals": {
+            "version": "12.4.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+            "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+            "dev": true,
+            "requires": {
+                "type-fest": "^0.8.1"
+            }
+        },
+        "globby": {
+            "version": "10.0.2",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
+            "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
+            "dev": true,
+            "requires": {
+                "@types/glob": "^7.1.1",
+                "array-union": "^2.1.0",
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.0.3",
+                "glob": "^7.1.3",
+                "ignore": "^5.1.1",
+                "merge2": "^1.2.3",
+                "slash": "^3.0.0"
+            }
+        },
+        "glogg": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+            "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+            "dev": true,
+            "requires": {
+                "sparkles": "^1.0.0"
+            }
+        },
+        "graceful-fs": {
+            "version": "4.2.4",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+            "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+            "dev": true
+        },
+        "growl": {
+            "version": "1.10.5",
+            "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+            "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+            "dev": true
+        },
+        "gulp": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+            "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+            "dev": true,
+            "requires": {
+                "glob-watcher": "^5.0.3",
+                "gulp-cli": "^2.2.0",
+                "undertaker": "^1.2.1",
+                "vinyl-fs": "^3.0.0"
+            },
+            "dependencies": {
+                "gulp-cli": {
+                    "version": "2.3.0",
+                    "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+                    "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-colors": "^1.0.1",
+                        "archy": "^1.0.0",
+                        "array-sort": "^1.0.0",
+                        "color-support": "^1.1.3",
+                        "concat-stream": "^1.6.0",
+                        "copy-props": "^2.0.1",
+                        "fancy-log": "^1.3.2",
+                        "gulplog": "^1.0.0",
+                        "interpret": "^1.4.0",
+                        "isobject": "^3.0.1",
+                        "liftoff": "^3.1.0",
+                        "matchdep": "^2.0.0",
+                        "mute-stdout": "^1.0.0",
+                        "pretty-hrtime": "^1.0.0",
+                        "replace-homedir": "^1.0.0",
+                        "semver-greatest-satisfied-range": "^1.1.0",
+                        "v8flags": "^3.2.0",
+                        "yargs": "^7.1.0"
+                    }
+                }
+            }
+        },
+        "gulp-concat": {
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+            "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+            "dev": true,
+            "requires": {
+                "concat-with-sourcemaps": "^1.0.0",
+                "through2": "^2.0.0",
+                "vinyl": "^2.0.0"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "gulp-insert": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/gulp-insert/-/gulp-insert-0.5.0.tgz",
+            "integrity": "sha1-MjE/E+SiPPWsylzl8MCAkjx3hgI=",
+            "dev": true,
+            "requires": {
+                "readable-stream": "^1.0.26-4",
+                "streamqueue": "0.0.6"
+            },
+            "dependencies": {
+                "isarray": {
+                    "version": "0.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+                    "dev": true
+                },
+                "readable-stream": {
+                    "version": "1.1.14",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+                    "dev": true,
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.1",
+                        "isarray": "0.0.1",
+                        "string_decoder": "~0.10.x"
+                    }
+                },
+                "string_decoder": {
+                    "version": "0.10.31",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+                    "dev": true
+                }
+            }
+        },
+        "gulp-newer": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.4.0.tgz",
+            "integrity": "sha512-h79fGO55S/P9eAADbLAP9aTtVYpLSR1ONj08VPaSdVVNVYhTS8p1CO1TW7kEMu+hC+sytmCqcUr5LesvZEtDoQ==",
+            "dev": true,
+            "requires": {
+                "glob": "^7.0.3",
+                "kew": "^0.7.0",
+                "plugin-error": "^0.1.2"
+            },
+            "dependencies": {
+                "arr-diff": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+                    "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+                    "dev": true,
+                    "requires": {
+                        "arr-flatten": "^1.0.1",
+                        "array-slice": "^0.2.3"
+                    }
+                },
+                "arr-union": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+                    "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+                    "dev": true
+                },
+                "array-slice": {
+                    "version": "0.2.3",
+                    "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+                    "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+                    "dev": true
+                },
+                "extend-shallow": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+                    "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^1.1.0"
+                    }
+                },
+                "kind-of": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+                    "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+                    "dev": true
+                },
+                "plugin-error": {
+                    "version": "0.1.2",
+                    "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+                    "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-cyan": "^0.1.1",
+                        "ansi-red": "^0.1.1",
+                        "arr-diff": "^1.0.1",
+                        "arr-union": "^2.0.1",
+                        "extend-shallow": "^1.1.2"
+                    }
+                }
+            }
+        },
+        "gulp-rename": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
+            "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
+            "dev": true
+        },
+        "gulp-sourcemaps": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
+            "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
+            "dev": true,
+            "requires": {
+                "@gulp-sourcemaps/identity-map": "^2.0.1",
+                "@gulp-sourcemaps/map-sources": "^1.0.0",
+                "acorn": "^6.4.1",
+                "convert-source-map": "^1.0.0",
+                "css": "^3.0.0",
+                "debug-fabulous": "^1.0.0",
+                "detect-newline": "^2.0.0",
+                "graceful-fs": "^4.0.0",
+                "source-map": "^0.6.0",
+                "strip-bom-string": "^1.0.0",
+                "through2": "^2.0.0"
+            },
+            "dependencies": {
+                "acorn": {
+                    "version": "6.4.2",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+                    "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "gulplog": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+            "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+            "dev": true,
+            "requires": {
+                "glogg": "^1.0.0"
+            }
+        },
+        "handlebars": {
+            "version": "4.7.6",
+            "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
+            "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+            "dev": true,
+            "requires": {
+                "minimist": "^1.2.5",
+                "neo-async": "^2.6.0",
+                "source-map": "^0.6.1",
+                "uglify-js": "^3.1.4",
+                "wordwrap": "^1.0.0"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                }
+            }
+        },
+        "has": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+            "requires": {
+                "function-bind": "^1.1.1"
+            }
+        },
+        "has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true
+        },
+        "has-symbols": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+            "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+        },
+        "has-value": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+            "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+            "dev": true,
+            "requires": {
+                "get-value": "^2.0.6",
+                "has-values": "^1.0.0",
+                "isobject": "^3.0.0"
+            }
+        },
+        "has-values": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+            "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+            "dev": true,
+            "requires": {
+                "is-number": "^3.0.0",
+                "kind-of": "^4.0.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+                    "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "hash-base": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+            "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "hash.js": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+            "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.3",
+                "minimalistic-assert": "^1.0.1"
+            }
+        },
+        "he": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+            "dev": true
+        },
+        "hmac-drbg": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+            "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+            "dev": true,
+            "requires": {
+                "hash.js": "^1.0.3",
+                "minimalistic-assert": "^1.0.0",
+                "minimalistic-crypto-utils": "^1.0.1"
+            }
+        },
+        "homedir-polyfill": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+            "dev": true,
+            "requires": {
+                "parse-passwd": "^1.0.0"
+            }
+        },
+        "hosted-git-info": {
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+            "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+            "dev": true
+        },
+        "htmlescape": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
+            "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=",
+            "dev": true
+        },
+        "https-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+            "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+            "dev": true
+        },
+        "ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "dev": true
+        },
+        "ignore": {
+            "version": "5.1.8",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+            "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+            "dev": true
+        },
+        "import-fresh": {
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz",
+            "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==",
+            "dev": true,
+            "requires": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            }
+        },
+        "imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+            "dev": true
+        },
+        "indent-string": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+            "dev": true
+        },
+        "inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "dev": true,
+            "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "ini": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+            "dev": true
+        },
+        "inline-source-map": {
+            "version": "0.6.2",
+            "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
+            "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
+            "dev": true,
+            "requires": {
+                "source-map": "~0.5.3"
+            }
+        },
+        "insert-module-globals": {
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz",
+            "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==",
+            "dev": true,
+            "requires": {
+                "JSONStream": "^1.0.3",
+                "acorn-node": "^1.5.2",
+                "combine-source-map": "^0.8.0",
+                "concat-stream": "^1.6.1",
+                "is-buffer": "^1.1.0",
+                "path-is-absolute": "^1.0.1",
+                "process": "~0.11.0",
+                "through2": "^2.0.0",
+                "undeclared-identifiers": "^1.1.2",
+                "xtend": "^4.0.0"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "interpret": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+            "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+            "dev": true
+        },
+        "invert-kv": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+            "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+            "dev": true
+        },
+        "irregular-plurals": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.2.0.tgz",
+            "integrity": "sha512-YqTdPLfwP7YFN0SsD3QUVCkm9ZG2VzOXv3DOrw5G5mkMbVwptTwVcFv7/C0vOpBmgTxAeTG19XpUs1E522LW9Q==",
+            "dev": true
+        },
+        "is-absolute": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+            "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+            "dev": true,
+            "requires": {
+                "is-relative": "^1.0.0",
+                "is-windows": "^1.0.1"
+            }
+        },
+        "is-accessor-descriptor": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-arguments": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+            "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+            "dev": true
+        },
+        "is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+            "dev": true
+        },
+        "is-binary-path": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+            "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+            "dev": true,
+            "requires": {
+                "binary-extensions": "^1.0.0"
+            }
+        },
+        "is-buffer": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+            "dev": true
+        },
+        "is-callable": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+            "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
+        },
+        "is-core-module": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz",
+            "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==",
+            "dev": true,
+            "requires": {
+                "has": "^1.0.3"
+            }
+        },
+        "is-data-descriptor": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-date-object": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+            "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+        },
+        "is-descriptor": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+            "dev": true,
+            "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+                    "dev": true
+                }
+            }
+        },
+        "is-extendable": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+            "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+            "dev": true
+        },
+        "is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+            "dev": true
+        },
+        "is-fullwidth-code-point": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+            "dev": true
+        },
+        "is-generator-function": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz",
+            "integrity": "sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==",
+            "dev": true
+        },
+        "is-glob": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "dev": true,
+            "requires": {
+                "is-extglob": "^2.1.1"
+            }
+        },
+        "is-negated-glob": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+            "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+            "dev": true
+        },
+        "is-negative-zero": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+            "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
+        },
+        "is-number": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+            "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-path-cwd": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+            "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+            "dev": true
+        },
+        "is-path-inside": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+            "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+            "dev": true
+        },
+        "is-plain-obj": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+            "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+            "dev": true
+        },
+        "is-plain-object": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+            "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+            "dev": true
+        },
+        "is-promise": {
+            "version": "2.2.2",
+            "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+            "dev": true
+        },
+        "is-regex": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+            "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+            "requires": {
+                "has-symbols": "^1.0.1"
+            }
+        },
+        "is-relative": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+            "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+            "dev": true,
+            "requires": {
+                "is-unc-path": "^1.0.0"
+            }
+        },
+        "is-stream": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+            "dev": true
+        },
+        "is-string": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+            "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+            "dev": true
+        },
+        "is-symbol": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+            "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+            "requires": {
+                "has-symbols": "^1.0.1"
+            }
+        },
+        "is-typed-array": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.3.tgz",
+            "integrity": "sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==",
+            "dev": true,
+            "requires": {
+                "available-typed-arrays": "^1.0.0",
+                "es-abstract": "^1.17.4",
+                "foreach": "^2.0.5",
+                "has-symbols": "^1.0.1"
+            }
+        },
+        "is-unc-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+            "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+            "dev": true,
+            "requires": {
+                "unc-path-regex": "^0.1.2"
+            }
+        },
+        "is-utf8": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+            "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+            "dev": true
+        },
+        "is-valid-glob": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+            "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+            "dev": true
+        },
+        "is-windows": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+            "dev": true
+        },
+        "isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+            "dev": true
+        },
+        "isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+            "dev": true
+        },
+        "isobject": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+            "dev": true
+        },
+        "istanbul": {
+            "version": "0.4.5",
+            "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+            "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+            "dev": true,
+            "requires": {
+                "abbrev": "1.0.x",
+                "async": "1.x",
+                "escodegen": "1.8.x",
+                "esprima": "2.7.x",
+                "glob": "^5.0.15",
+                "handlebars": "^4.0.1",
+                "js-yaml": "3.x",
+                "mkdirp": "0.5.x",
+                "nopt": "3.x",
+                "once": "1.x",
+                "resolve": "1.1.x",
+                "supports-color": "^3.1.0",
+                "which": "^1.1.1",
+                "wordwrap": "^1.0.0"
+            },
+            "dependencies": {
+                "async": {
+                    "version": "1.5.2",
+                    "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+                    "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+                    "dev": true
+                },
+                "esprima": {
+                    "version": "2.7.3",
+                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+                    "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+                    "dev": true
+                },
+                "glob": {
+                    "version": "5.0.15",
+                    "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                    "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+                    "dev": true,
+                    "requires": {
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "2 || 3",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                },
+                "has-flag": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+                    "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+                    "dev": true
+                },
+                "mkdirp": {
+                    "version": "0.5.5",
+                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+                    "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+                    "dev": true,
+                    "requires": {
+                        "minimist": "^1.2.5"
+                    }
+                },
+                "supports-color": {
+                    "version": "3.2.3",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+                    "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^1.0.0"
+                    }
+                }
+            }
+        },
+        "js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true
+        },
+        "js-yaml": {
+            "version": "3.14.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+            "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+            "dev": true,
+            "requires": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            }
+        },
+        "jsdoctypeparser": {
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
+            "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+            "dev": true
+        },
+        "json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true
+        },
+        "json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+            "dev": true
+        },
+        "json5": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+            "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+            "dev": true,
+            "requires": {
+                "minimist": "^1.2.0"
+            }
+        },
+        "jsonfile": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+            "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.1.6",
+                "universalify": "^1.0.0"
+            }
+        },
+        "jsonparse": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+            "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+            "dev": true
+        },
+        "just-debounce": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+            "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+            "dev": true
+        },
+        "kew": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+            "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
+            "dev": true
+        },
+        "kind-of": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+            "dev": true
+        },
+        "labeled-stream-splicer": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
+            "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "stream-splicer": "^2.0.0"
+            }
+        },
+        "last-run": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+            "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+            "dev": true,
+            "requires": {
+                "default-resolution": "^2.0.0",
+                "es6-weak-map": "^2.0.1"
+            }
+        },
+        "lazystream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+            "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+            "dev": true,
+            "requires": {
+                "readable-stream": "^2.0.5"
+            }
+        },
+        "lcid": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+            "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+            "dev": true,
+            "requires": {
+                "invert-kv": "^1.0.0"
+            }
+        },
+        "lead": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+            "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+            "dev": true,
+            "requires": {
+                "flush-write-stream": "^1.0.2"
+            }
+        },
+        "levn": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+            "dev": true,
+            "requires": {
+                "prelude-ls": "~1.1.2",
+                "type-check": "~0.3.2"
+            }
+        },
+        "liftoff": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+            "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+            "dev": true,
+            "requires": {
+                "extend": "^3.0.0",
+                "findup-sync": "^3.0.0",
+                "fined": "^1.0.1",
+                "flagged-respawn": "^1.0.0",
+                "is-plain-object": "^2.0.4",
+                "object.map": "^1.0.0",
+                "rechoir": "^0.6.2",
+                "resolve": "^1.1.7"
+            },
+            "dependencies": {
+                "is-plain-object": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+                    "dev": true,
+                    "requires": {
+                        "isobject": "^3.0.1"
+                    }
+                }
+            }
+        },
+        "load-json-file": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+            "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.1.2",
+                "parse-json": "^2.2.0",
+                "pify": "^2.0.0",
+                "strip-bom": "^3.0.0"
+            }
+        },
+        "locate-path": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+            "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+            "dev": true,
+            "requires": {
+                "p-locate": "^2.0.0",
+                "path-exists": "^3.0.0"
+            }
+        },
+        "lodash": {
+            "version": "4.17.20",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+            "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+            "dev": true
+        },
+        "lodash.memoize": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+            "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
+            "dev": true
+        },
+        "log-symbols": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+            "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+            "dev": true,
+            "requires": {
+                "chalk": "^4.0.0"
+            }
+        },
+        "lru-queue": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+            "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+            "dev": true,
+            "requires": {
+                "es5-ext": "~0.10.2"
+            }
+        },
+        "make-iterator": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+            "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+            "dev": true,
+            "requires": {
+                "kind-of": "^6.0.2"
+            }
+        },
+        "map-age-cleaner": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+            "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+            "dev": true,
+            "requires": {
+                "p-defer": "^1.0.0"
+            }
+        },
+        "map-cache": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+            "dev": true
+        },
+        "map-visit": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+            "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+            "dev": true,
+            "requires": {
+                "object-visit": "^1.0.0"
+            }
+        },
+        "matchdep": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+            "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+            "dev": true,
+            "requires": {
+                "findup-sync": "^2.0.0",
+                "micromatch": "^3.0.4",
+                "resolve": "^1.4.0",
+                "stack-trace": "0.0.10"
+            },
+            "dependencies": {
+                "findup-sync": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+                    "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+                    "dev": true,
+                    "requires": {
+                        "detect-file": "^1.0.0",
+                        "is-glob": "^3.1.0",
+                        "micromatch": "^3.0.4",
+                        "resolve-dir": "^1.0.1"
+                    }
+                },
+                "is-glob": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+                    "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+                    "dev": true,
+                    "requires": {
+                        "is-extglob": "^2.1.0"
+                    }
+                },
+                "resolve": {
+                    "version": "1.17.0",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+                    "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+                    "dev": true,
+                    "requires": {
+                        "path-parse": "^1.0.6"
+                    }
+                }
+            }
+        },
+        "md5.js": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+            "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+            "dev": true,
+            "requires": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "mem": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+            "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+            "dev": true,
+            "requires": {
+                "map-age-cleaner": "^0.1.1",
+                "mimic-fn": "^2.0.0",
+                "p-is-promise": "^2.0.0"
+            }
+        },
+        "memoizee": {
+            "version": "0.4.14",
+            "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+            "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+            "dev": true,
+            "requires": {
+                "d": "1",
+                "es5-ext": "^0.10.45",
+                "es6-weak-map": "^2.0.2",
+                "event-emitter": "^0.3.5",
+                "is-promise": "^2.1",
+                "lru-queue": "0.1",
+                "next-tick": "1",
+                "timers-ext": "^0.1.5"
+            }
+        },
+        "merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true
+        },
+        "micromatch": {
+            "version": "3.1.10",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+            "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+            "dev": true,
+            "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "braces": "^2.3.1",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "extglob": "^2.0.4",
+                "fragment-cache": "^0.2.1",
+                "kind-of": "^6.0.2",
+                "nanomatch": "^1.2.9",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.2"
+            }
+        },
+        "miller-rabin": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+            "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.0.0",
+                "brorand": "^1.0.1"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "mime-db": {
+            "version": "1.44.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+            "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+            "dev": true
+        },
+        "mime-types": {
+            "version": "2.1.27",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+            "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+            "dev": true,
+            "requires": {
+                "mime-db": "1.44.0"
+            }
+        },
+        "mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true
+        },
+        "minimalistic-assert": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+            "dev": true
+        },
+        "minimalistic-crypto-utils": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+            "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+            "dev": true
+        },
+        "minimatch": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "dev": true,
+            "requires": {
+                "brace-expansion": "^1.1.7"
+            }
+        },
+        "minimist": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+            "dev": true
+        },
+        "mixin-deep": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+            "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+            "dev": true,
+            "requires": {
+                "for-in": "^1.0.2",
+                "is-extendable": "^1.0.1"
+            },
+            "dependencies": {
+                "is-extendable": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+                    "dev": true,
+                    "requires": {
+                        "is-plain-object": "^2.0.4"
+                    }
+                },
+                "is-plain-object": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+                    "dev": true,
+                    "requires": {
+                        "isobject": "^3.0.1"
+                    }
+                }
+            }
+        },
+        "mkdirp": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+            "dev": true
+        },
+        "mkdirp-classic": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+            "dev": true
+        },
+        "mocha": {
+            "version": "8.2.1",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz",
+            "integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==",
+            "dev": true,
+            "requires": {
+                "@ungap/promise-all-settled": "1.1.2",
+                "ansi-colors": "4.1.1",
+                "browser-stdout": "1.3.1",
+                "chokidar": "3.4.3",
+                "debug": "4.2.0",
+                "diff": "4.0.2",
+                "escape-string-regexp": "4.0.0",
+                "find-up": "5.0.0",
+                "glob": "7.1.6",
+                "growl": "1.10.5",
+                "he": "1.2.0",
+                "js-yaml": "3.14.0",
+                "log-symbols": "4.0.0",
+                "minimatch": "3.0.4",
+                "ms": "2.1.2",
+                "nanoid": "3.1.12",
+                "serialize-javascript": "5.0.1",
+                "strip-json-comments": "3.1.1",
+                "supports-color": "7.2.0",
+                "which": "2.0.2",
+                "wide-align": "1.1.3",
+                "workerpool": "6.0.2",
+                "yargs": "13.3.2",
+                "yargs-parser": "13.1.2",
+                "yargs-unparser": "2.0.0"
+            },
+            "dependencies": {
+                "ansi-colors": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+                    "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+                    "dev": true
+                },
+                "ansi-regex": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+                    "dev": true
+                },
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "^1.9.0"
+                    }
+                },
+                "anymatch": {
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+                    "dev": true,
+                    "requires": {
+                        "normalize-path": "^3.0.0",
+                        "picomatch": "^2.0.4"
+                    }
+                },
+                "binary-extensions": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+                    "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+                    "dev": true
+                },
+                "braces": {
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+                    "dev": true,
+                    "requires": {
+                        "fill-range": "^7.0.1"
+                    }
+                },
+                "camelcase": {
+                    "version": "5.3.1",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+                    "dev": true
+                },
+                "chokidar": {
+                    "version": "3.4.3",
+                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+                    "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+                    "dev": true,
+                    "requires": {
+                        "anymatch": "~3.1.1",
+                        "braces": "~3.0.2",
+                        "fsevents": "~2.1.2",
+                        "glob-parent": "~5.1.0",
+                        "is-binary-path": "~2.1.0",
+                        "is-glob": "~4.0.1",
+                        "normalize-path": "~3.0.0",
+                        "readdirp": "~3.5.0"
+                    }
+                },
+                "cliui": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+                    "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+                    "dev": true,
+                    "requires": {
+                        "string-width": "^3.1.0",
+                        "strip-ansi": "^5.2.0",
+                        "wrap-ansi": "^5.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "1.9.3",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+                    "dev": true,
+                    "requires": {
+                        "color-name": "1.1.3"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+                    "dev": true
+                },
+                "debug": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "escape-string-regexp": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+                    "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+                    "dev": true
+                },
+                "fill-range": {
+                    "version": "7.0.1",
+                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+                    "dev": true,
+                    "requires": {
+                        "to-regex-range": "^5.0.1"
+                    }
+                },
+                "find-up": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+                    "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+                    "dev": true,
+                    "requires": {
+                        "locate-path": "^6.0.0",
+                        "path-exists": "^4.0.0"
+                    }
+                },
+                "fsevents": {
+                    "version": "2.1.3",
+                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+                    "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+                    "dev": true,
+                    "optional": true
+                },
+                "get-caller-file": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+                    "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+                    "dev": true
+                },
+                "glob-parent": {
+                    "version": "5.1.1",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+                    "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+                    "dev": true,
+                    "requires": {
+                        "is-glob": "^4.0.1"
+                    }
+                },
+                "is-binary-path": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+                    "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+                    "dev": true,
+                    "requires": {
+                        "binary-extensions": "^2.0.0"
+                    }
+                },
+                "is-number": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+                    "dev": true
+                },
+                "locate-path": {
+                    "version": "6.0.0",
+                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+                    "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+                    "dev": true,
+                    "requires": {
+                        "p-locate": "^5.0.0"
+                    }
+                },
+                "p-limit": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+                    "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+                    "dev": true,
+                    "requires": {
+                        "yocto-queue": "^0.1.0"
+                    }
+                },
+                "p-locate": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+                    "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+                    "dev": true,
+                    "requires": {
+                        "p-limit": "^3.0.2"
+                    }
+                },
+                "p-try": {
+                    "version": "2.2.0",
+                    "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+                    "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+                    "dev": true
+                },
+                "path-exists": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+                    "dev": true
+                },
+                "readdirp": {
+                    "version": "3.5.0",
+                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+                    "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+                    "dev": true,
+                    "requires": {
+                        "picomatch": "^2.2.1"
+                    }
+                },
+                "require-main-filename": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+                    "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+                    "dev": true
+                },
+                "strip-ansi": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^4.1.0"
+                    }
+                },
+                "to-regex-range": {
+                    "version": "5.0.1",
+                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+                    "dev": true,
+                    "requires": {
+                        "is-number": "^7.0.0"
+                    }
+                },
+                "which": {
+                    "version": "2.0.2",
+                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+                    "dev": true,
+                    "requires": {
+                        "isexe": "^2.0.0"
+                    }
+                },
+                "which-module": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+                    "dev": true
+                },
+                "wrap-ansi": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+                    "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^3.2.0",
+                        "string-width": "^3.0.0",
+                        "strip-ansi": "^5.0.0"
+                    }
+                },
+                "y18n": {
+                    "version": "4.0.1",
+                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+                    "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+                    "dev": true
+                },
+                "yargs": {
+                    "version": "13.3.2",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+                    "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+                    "dev": true,
+                    "requires": {
+                        "cliui": "^5.0.0",
+                        "find-up": "^3.0.0",
+                        "get-caller-file": "^2.0.1",
+                        "require-directory": "^2.1.1",
+                        "require-main-filename": "^2.0.0",
+                        "set-blocking": "^2.0.0",
+                        "string-width": "^3.0.0",
+                        "which-module": "^2.0.0",
+                        "y18n": "^4.0.0",
+                        "yargs-parser": "^13.1.2"
+                    },
+                    "dependencies": {
+                        "find-up": {
+                            "version": "3.0.0",
+                            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+                            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+                            "dev": true,
+                            "requires": {
+                                "locate-path": "^3.0.0"
+                            }
+                        },
+                        "locate-path": {
+                            "version": "3.0.0",
+                            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+                            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+                            "dev": true,
+                            "requires": {
+                                "p-locate": "^3.0.0",
+                                "path-exists": "^3.0.0"
+                            }
+                        },
+                        "p-limit": {
+                            "version": "2.3.0",
+                            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+                            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+                            "dev": true,
+                            "requires": {
+                                "p-try": "^2.0.0"
+                            }
+                        },
+                        "p-locate": {
+                            "version": "3.0.0",
+                            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+                            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+                            "dev": true,
+                            "requires": {
+                                "p-limit": "^2.0.0"
+                            }
+                        },
+                        "path-exists": {
+                            "version": "3.0.0",
+                            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+                            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+                            "dev": true
+                        }
+                    }
+                },
+                "yargs-parser": {
+                    "version": "13.1.2",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+                    "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^5.0.0",
+                        "decamelize": "^1.2.0"
+                    }
+                }
+            }
+        },
+        "mocha-fivemat-progress-reporter": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/mocha-fivemat-progress-reporter/-/mocha-fivemat-progress-reporter-0.1.0.tgz",
+            "integrity": "sha1-zK/w4ckc9Vf+d+B535lUuRt0d1Y=",
+            "dev": true
+        },
+        "module-deps": {
+            "version": "6.2.3",
+            "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz",
+            "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==",
+            "dev": true,
+            "requires": {
+                "JSONStream": "^1.0.3",
+                "browser-resolve": "^2.0.0",
+                "cached-path-relative": "^1.0.2",
+                "concat-stream": "~1.6.0",
+                "defined": "^1.0.0",
+                "detective": "^5.2.0",
+                "duplexer2": "^0.1.2",
+                "inherits": "^2.0.1",
+                "parents": "^1.0.0",
+                "readable-stream": "^2.0.2",
+                "resolve": "^1.4.0",
+                "stream-combiner2": "^1.1.1",
+                "subarg": "^1.0.0",
+                "through2": "^2.0.0",
+                "xtend": "^4.0.0"
+            },
+            "dependencies": {
+                "browser-resolve": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+                    "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
+                    "dev": true,
+                    "requires": {
+                        "resolve": "^1.17.0"
+                    }
+                },
+                "is-core-module": {
+                    "version": "2.2.0",
+                    "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+                    "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+                    "dev": true,
+                    "requires": {
+                        "has": "^1.0.3"
+                    }
+                },
+                "resolve": {
+                    "version": "1.19.0",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+                    "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+                    "dev": true,
+                    "requires": {
+                        "is-core-module": "^2.1.0",
+                        "path-parse": "^1.0.6"
+                    }
+                },
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
+        },
+        "mute-stdout": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+            "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+            "dev": true
+        },
+        "nan": {
+            "version": "2.14.1",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+            "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+            "dev": true,
+            "optional": true
+        },
+        "nanoid": {
+            "version": "3.1.12",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
+            "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==",
+            "dev": true
+        },
+        "nanomatch": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+            "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+            "dev": true,
+            "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "fragment-cache": "^0.2.1",
+                "is-windows": "^1.0.2",
+                "kind-of": "^6.0.2",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            }
+        },
+        "natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+            "dev": true
+        },
+        "neo-async": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+            "dev": true
+        },
+        "next-tick": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+            "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+            "dev": true
+        },
+        "nice-try": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+            "dev": true
+        },
+        "node-fetch": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+            "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+            "dev": true
+        },
+        "nopt": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+            "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+            "dev": true,
+            "requires": {
+                "abbrev": "1"
+            }
+        },
+        "normalize-package-data": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+            "dev": true,
+            "requires": {
+                "hosted-git-info": "^2.1.4",
+                "resolve": "^1.10.0",
+                "semver": "2 || 3 || 4 || 5",
+                "validate-npm-package-license": "^3.0.1"
+            },
+            "dependencies": {
+                "resolve": {
+                    "version": "1.17.0",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+                    "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+                    "dev": true,
+                    "requires": {
+                        "path-parse": "^1.0.6"
+                    }
+                },
+                "semver": {
+                    "version": "5.7.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "dev": true
+                }
+            }
+        },
+        "normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true
+        },
+        "now-and-later": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+            "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+            "dev": true,
+            "requires": {
+                "once": "^1.3.2"
+            }
+        },
+        "npm-run-path": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+            "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+            "dev": true,
+            "requires": {
+                "path-key": "^2.0.0"
+            }
+        },
+        "number-is-nan": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+            "dev": true
+        },
+        "object-assign": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+            "dev": true
+        },
+        "object-copy": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+            "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+            "dev": true,
+            "requires": {
+                "copy-descriptor": "^0.1.0",
+                "define-property": "^0.2.5",
+                "kind-of": "^3.0.3"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "object-inspect": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+            "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+        },
+        "object-keys": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+        },
+        "object-visit": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+            "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+            "dev": true,
+            "requires": {
+                "isobject": "^3.0.0"
+            }
+        },
+        "object.assign": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+            "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.2",
+                "function-bind": "^1.1.1",
+                "has-symbols": "^1.0.0",
+                "object-keys": "^1.0.11"
+            }
+        },
+        "object.defaults": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+            "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+            "dev": true,
+            "requires": {
+                "array-each": "^1.0.1",
+                "array-slice": "^1.0.0",
+                "for-own": "^1.0.0",
+                "isobject": "^3.0.0"
+            }
+        },
+        "object.map": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+            "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+            "dev": true,
+            "requires": {
+                "for-own": "^1.0.0",
+                "make-iterator": "^1.0.0"
+            }
+        },
+        "object.pick": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+            "dev": true,
+            "requires": {
+                "isobject": "^3.0.1"
+            }
+        },
+        "object.reduce": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+            "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+            "dev": true,
+            "requires": {
+                "for-own": "^1.0.0",
+                "make-iterator": "^1.0.0"
+            }
+        },
+        "object.values": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+            "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0-next.1",
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3"
+            }
+        },
+        "once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
+            "requires": {
+                "wrappy": "1"
+            }
+        },
+        "optionator": {
+            "version": "0.8.3",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+            "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+            "dev": true,
+            "requires": {
+                "deep-is": "~0.1.3",
+                "fast-levenshtein": "~2.0.6",
+                "levn": "~0.3.0",
+                "prelude-ls": "~1.1.2",
+                "type-check": "~0.3.2",
+                "word-wrap": "~1.2.3"
+            }
+        },
+        "ordered-read-streams": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+            "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+            "dev": true,
+            "requires": {
+                "readable-stream": "^2.0.1"
+            }
+        },
+        "os-browserify": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+            "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+            "dev": true
+        },
+        "os-locale": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+            "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+            "dev": true,
+            "requires": {
+                "lcid": "^1.0.0"
+            }
+        },
+        "p-defer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+            "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+            "dev": true
+        },
+        "p-finally": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+            "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+            "dev": true
+        },
+        "p-is-promise": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+            "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+            "dev": true
+        },
+        "p-limit": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+            "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+            "dev": true,
+            "requires": {
+                "p-try": "^1.0.0"
+            }
+        },
+        "p-locate": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+            "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+            "dev": true,
+            "requires": {
+                "p-limit": "^1.1.0"
+            }
+        },
+        "p-map": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+            "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+            "dev": true,
+            "requires": {
+                "aggregate-error": "^3.0.0"
+            }
+        },
+        "p-try": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+            "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+            "dev": true
+        },
+        "pako": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+            "dev": true
+        },
+        "parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "requires": {
+                "callsites": "^3.0.0"
+            }
+        },
+        "parents": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+            "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
+            "dev": true,
+            "requires": {
+                "path-platform": "~0.11.15"
+            }
+        },
+        "parse-asn1": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+            "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+            "dev": true,
+            "requires": {
+                "asn1.js": "^5.2.0",
+                "browserify-aes": "^1.0.0",
+                "evp_bytestokey": "^1.0.0",
+                "pbkdf2": "^3.0.3",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "parse-filepath": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+            "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+            "dev": true,
+            "requires": {
+                "is-absolute": "^1.0.0",
+                "map-cache": "^0.2.0",
+                "path-root": "^0.1.1"
+            }
+        },
+        "parse-json": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+            "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+            "dev": true,
+            "requires": {
+                "error-ex": "^1.2.0"
+            }
+        },
+        "parse-node-version": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+            "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+            "dev": true
+        },
+        "parse-passwd": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+            "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+            "dev": true
+        },
+        "pascalcase": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+            "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+            "dev": true
+        },
+        "path-browserify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+            "dev": true
+        },
+        "path-dirname": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+            "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+            "dev": true
+        },
+        "path-exists": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+            "dev": true
+        },
+        "path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true
+        },
+        "path-key": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+            "dev": true
+        },
+        "path-parse": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+            "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+            "dev": true
+        },
+        "path-platform": {
+            "version": "0.11.15",
+            "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+            "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
+            "dev": true
+        },
+        "path-root": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+            "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+            "dev": true,
+            "requires": {
+                "path-root-regex": "^0.1.0"
+            }
+        },
+        "path-root-regex": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+            "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+            "dev": true
+        },
+        "path-type": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+            "dev": true
+        },
+        "pathval": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+            "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+            "dev": true
+        },
+        "pbkdf2": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+            "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+            "dev": true,
+            "requires": {
+                "create-hash": "^1.1.2",
+                "create-hmac": "^1.1.4",
+                "ripemd160": "^2.0.1",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "picomatch": {
+            "version": "2.2.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+            "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+            "dev": true
+        },
+        "pify": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+            "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+            "dev": true
+        },
+        "pinkie": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+            "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+            "dev": true
+        },
+        "pinkie-promise": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+            "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+            "dev": true,
+            "requires": {
+                "pinkie": "^2.0.0"
+            }
+        },
+        "pkg-dir": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+            "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+            "dev": true,
+            "requires": {
+                "find-up": "^2.1.0"
+            }
+        },
+        "plugin-error": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+            "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+            "dev": true,
+            "requires": {
+                "ansi-colors": "^1.0.1",
+                "arr-diff": "^4.0.0",
+                "arr-union": "^3.1.0",
+                "extend-shallow": "^3.0.2"
+            }
+        },
+        "plur": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+            "integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+            "dev": true,
+            "requires": {
+                "irregular-plurals": "^3.2.0"
+            }
+        },
+        "posix-character-classes": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+            "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+            "dev": true
+        },
+        "postcss": {
+            "version": "7.0.35",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+            "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.4.2",
+                "source-map": "^0.6.1",
+                "supports-color": "^6.1.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "^1.9.0"
+                    }
+                },
+                "chalk": {
+                    "version": "2.4.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^3.2.1",
+                        "escape-string-regexp": "^1.0.5",
+                        "supports-color": "^5.3.0"
+                    },
+                    "dependencies": {
+                        "supports-color": {
+                            "version": "5.5.0",
+                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                            "dev": true,
+                            "requires": {
+                                "has-flag": "^3.0.0"
+                            }
+                        }
+                    }
+                },
+                "color-convert": {
+                    "version": "1.9.3",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+                    "dev": true,
+                    "requires": {
+                        "color-name": "1.1.3"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+                    "dev": true
+                },
+                "has-flag": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "6.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                }
+            }
+        },
+        "prelude-ls": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+            "dev": true
+        },
+        "pretty-hrtime": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+            "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+            "dev": true
+        },
+        "prex": {
+            "version": "0.4.7",
+            "resolved": "https://registry.npmjs.org/prex/-/prex-0.4.7.tgz",
+            "integrity": "sha512-ulhl3iyjmAW/GroRQJN4CG+pC6KJ+W+deNRBkEShQwe16wLP9k92+x6RmLJuLiVSGkbxhnAqHpGdJJCh3bRpUQ==",
+            "dev": true,
+            "requires": {
+                "@esfx/cancelable": "^1.0.0-pre.13",
+                "@esfx/disposable": "^1.0.0-pre.13"
+            }
+        },
+        "process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+            "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+            "dev": true
+        },
+        "process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true
+        },
+        "progress": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+            "dev": true
+        },
+        "public-encrypt": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+            "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "browserify-rsa": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "parse-asn1": "^5.0.0",
+                "randombytes": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "pump": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+            "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+            "dev": true,
+            "requires": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+            }
+        },
+        "pumpify": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+            "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+            "dev": true,
+            "requires": {
+                "duplexify": "^3.6.0",
+                "inherits": "^2.0.3",
+                "pump": "^2.0.0"
+            }
+        },
+        "punycode": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+            "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+            "dev": true
+        },
+        "q": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+            "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+            "dev": true
+        },
+        "qs": {
+            "version": "6.9.4",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+            "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
+            "dev": true
+        },
+        "querystring": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+            "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+            "dev": true
+        },
+        "querystring-es3": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+            "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+            "dev": true
+        },
+        "randombytes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "randomfill": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+            "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+            "dev": true,
+            "requires": {
+                "randombytes": "^2.0.5",
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "read-only-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
+            "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
+            "dev": true,
+            "requires": {
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "read-pkg": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+            "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+            "dev": true,
+            "requires": {
+                "load-json-file": "^2.0.0",
+                "normalize-package-data": "^2.3.2",
+                "path-type": "^2.0.0"
+            },
+            "dependencies": {
+                "path-type": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+                    "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+                    "dev": true,
+                    "requires": {
+                        "pify": "^2.0.0"
+                    }
+                }
+            }
+        },
+        "read-pkg-up": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+            "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+            "dev": true,
+            "requires": {
+                "find-up": "^2.0.0",
+                "read-pkg": "^2.0.0"
+            }
+        },
+        "readable-stream": {
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+            "dev": true,
+            "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "readdirp": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+            "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.1.11",
+                "micromatch": "^3.1.10",
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "rechoir": {
+            "version": "0.6.2",
+            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+            "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+            "dev": true,
+            "requires": {
+                "resolve": "^1.1.6"
+            }
+        },
+        "regex-not": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+            "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^3.0.2",
+                "safe-regex": "^1.1.0"
+            }
+        },
+        "regexpp": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+            "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+            "dev": true
+        },
+        "regextras": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
+            "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+            "dev": true
+        },
+        "remove-bom-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+            "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+            "dev": true,
+            "requires": {
+                "is-buffer": "^1.1.5",
+                "is-utf8": "^0.2.1"
+            }
+        },
+        "remove-bom-stream": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+            "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+            "dev": true,
+            "requires": {
+                "remove-bom-buffer": "^3.0.0",
+                "safe-buffer": "^5.1.0",
+                "through2": "^2.0.3"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "remove-internal": {
+            "version": "2.9.3",
+            "resolved": "https://registry.npmjs.org/remove-internal/-/remove-internal-2.9.3.tgz",
+            "integrity": "sha512-mUMTsHx6SAFWUXYqkOsR1BlVRQJW/oQdmFFDyVVuPLri6MLpeqtwt15TyYG55GcyysMVpul8nYGxIRyGjuEJxA==",
+            "dev": true,
+            "requires": {
+                "mkdirp": "^0.5.1",
+                "typescript": "^2.9.1",
+                "yargs": "^11.0.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+                    "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+                    "dev": true
+                },
+                "camelcase": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+                    "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+                    "dev": true
+                },
+                "cliui": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+                    "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+                    "dev": true,
+                    "requires": {
+                        "string-width": "^2.1.1",
+                        "strip-ansi": "^4.0.0",
+                        "wrap-ansi": "^2.0.0"
+                    }
+                },
+                "invert-kv": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+                    "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+                    "dev": true
+                },
+                "is-fullwidth-code-point": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+                    "dev": true
+                },
+                "lcid": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+                    "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+                    "dev": true,
+                    "requires": {
+                        "invert-kv": "^2.0.0"
+                    }
+                },
+                "mkdirp": {
+                    "version": "0.5.5",
+                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+                    "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+                    "dev": true,
+                    "requires": {
+                        "minimist": "^1.2.5"
+                    }
+                },
+                "os-locale": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+                    "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+                    "dev": true,
+                    "requires": {
+                        "execa": "^1.0.0",
+                        "lcid": "^2.0.0",
+                        "mem": "^4.0.0"
+                    }
+                },
+                "string-width": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+                    "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+                    "dev": true,
+                    "requires": {
+                        "is-fullwidth-code-point": "^2.0.0",
+                        "strip-ansi": "^4.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^3.0.0"
+                    }
+                },
+                "typescript": {
+                    "version": "2.9.2",
+                    "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+                    "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+                    "dev": true
+                },
+                "which-module": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+                    "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+                    "dev": true
+                },
+                "yargs": {
+                    "version": "11.1.1",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+                    "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+                    "dev": true,
+                    "requires": {
+                        "cliui": "^4.0.0",
+                        "decamelize": "^1.1.1",
+                        "find-up": "^2.1.0",
+                        "get-caller-file": "^1.0.1",
+                        "os-locale": "^3.1.0",
+                        "require-directory": "^2.1.1",
+                        "require-main-filename": "^1.0.1",
+                        "set-blocking": "^2.0.0",
+                        "string-width": "^2.0.0",
+                        "which-module": "^2.0.0",
+                        "y18n": "^3.2.1",
+                        "yargs-parser": "^9.0.2"
+                    }
+                },
+                "yargs-parser": {
+                    "version": "9.0.2",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+                    "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^4.1.0"
+                    }
+                }
+            }
+        },
+        "remove-trailing-separator": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+            "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+            "dev": true
+        },
+        "repeat-element": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+            "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+            "dev": true
+        },
+        "repeat-string": {
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+            "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+            "dev": true
+        },
+        "replace-ext": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+            "dev": true
+        },
+        "replace-homedir": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+            "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+            "dev": true,
+            "requires": {
+                "homedir-polyfill": "^1.0.1",
+                "is-absolute": "^1.0.0",
+                "remove-trailing-separator": "^1.1.0"
+            }
+        },
+        "require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+            "dev": true
+        },
+        "require-main-filename": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+            "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+            "dev": true
+        },
+        "resolve": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+            "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+            "dev": true
+        },
+        "resolve-dir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+            "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+            "dev": true,
+            "requires": {
+                "expand-tilde": "^2.0.0",
+                "global-modules": "^1.0.0"
+            }
+        },
+        "resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true
+        },
+        "resolve-options": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+            "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+            "dev": true,
+            "requires": {
+                "value-or-function": "^3.0.0"
+            }
+        },
+        "resolve-url": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+            "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+            "dev": true
+        },
+        "ret": {
+            "version": "0.1.15",
+            "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+            "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+            "dev": true
+        },
+        "reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "dev": true
+        },
+        "rimraf": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
+            "requires": {
+                "glob": "^7.1.3"
+            }
+        },
+        "ripemd160": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+            "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+            "dev": true,
+            "requires": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1"
+            }
+        },
+        "run-parallel": {
+            "version": "1.1.9",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+            "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+            "dev": true
+        },
+        "safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "safe-regex": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+            "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+            "dev": true,
+            "requires": {
+                "ret": "~0.1.10"
+            }
+        },
+        "safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "sax": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+            "dev": true
+        },
+        "semver": {
+            "version": "7.3.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+            "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+            "dev": true
+        },
+        "semver-greatest-satisfied-range": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+            "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+            "dev": true,
+            "requires": {
+                "sver-compat": "^1.5.0"
+            }
+        },
+        "serialize-javascript": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+            "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+            "dev": true,
+            "requires": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+            "dev": true
+        },
+        "set-value": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+            "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-extendable": "^0.1.1",
+                "is-plain-object": "^2.0.3",
+                "split-string": "^3.0.1"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                },
+                "is-plain-object": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+                    "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+                    "dev": true,
+                    "requires": {
+                        "isobject": "^3.0.1"
+                    }
+                }
+            }
+        },
+        "sha.js": {
+            "version": "2.4.11",
+            "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+            "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "shasum-object": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz",
+            "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==",
+            "dev": true,
+            "requires": {
+                "fast-safe-stringify": "^2.0.7"
+            }
+        },
+        "shebang-command": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+            "dev": true,
+            "requires": {
+                "shebang-regex": "^1.0.0"
+            }
+        },
+        "shebang-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+            "dev": true
+        },
+        "shell-quote": {
+            "version": "1.7.2",
+            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+            "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+            "dev": true
+        },
+        "signal-exit": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+            "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+            "dev": true
+        },
+        "simple-concat": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+            "dev": true
+        },
+        "slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true
+        },
+        "slice-ansi": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+            "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^3.2.0",
+                "astral-regex": "^1.0.0",
+                "is-fullwidth-code-point": "^2.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "^1.9.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "1.9.3",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+                    "dev": true,
+                    "requires": {
+                        "color-name": "1.1.3"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+                    "dev": true
+                }
+            }
+        },
+        "snapdragon": {
+            "version": "0.8.2",
+            "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+            "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+            "dev": true,
+            "requires": {
+                "base": "^0.11.1",
+                "debug": "^2.2.0",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "map-cache": "^0.2.2",
+                "source-map": "^0.5.6",
+                "source-map-resolve": "^0.5.0",
+                "use": "^3.1.0"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "snapdragon-node": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+            "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+            "dev": true,
+            "requires": {
+                "define-property": "^1.0.0",
+                "isobject": "^3.0.0",
+                "snapdragon-util": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "snapdragon-util": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+            "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.2.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "source-map": {
+            "version": "0.5.7",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+            "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+            "dev": true
+        },
+        "source-map-resolve": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+            "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+            "dev": true,
+            "requires": {
+                "atob": "^2.1.2",
+                "decode-uri-component": "^0.2.0",
+                "resolve-url": "^0.2.1",
+                "source-map-url": "^0.4.0",
+                "urix": "^0.1.0"
+            }
+        },
+        "source-map-support": {
+            "version": "0.5.19",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+            "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+            "dev": true,
+            "requires": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                }
+            }
+        },
+        "source-map-url": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+            "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+            "dev": true
+        },
+        "sparkles": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+            "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+            "dev": true
+        },
+        "spdx-correct": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+            "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+            "dev": true,
+            "requires": {
+                "spdx-expression-parse": "^3.0.0",
+                "spdx-license-ids": "^3.0.0"
+            }
+        },
+        "spdx-exceptions": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+            "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+            "dev": true
+        },
+        "spdx-expression-parse": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+            "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+            "dev": true,
+            "requires": {
+                "spdx-exceptions": "^2.1.0",
+                "spdx-license-ids": "^3.0.0"
+            }
+        },
+        "spdx-license-ids": {
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+            "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+            "dev": true
+        },
+        "split-string": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+            "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^3.0.0"
+            }
+        },
+        "sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+            "dev": true
+        },
+        "stack-trace": {
+            "version": "0.0.10",
+            "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+            "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+            "dev": true
+        },
+        "static-extend": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+            "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+            "dev": true,
+            "requires": {
+                "define-property": "^0.2.5",
+                "object-copy": "^0.1.0"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "stream-browserify": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+            "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+            "dev": true,
+            "requires": {
+                "inherits": "~2.0.4",
+                "readable-stream": "^3.5.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "stream-combiner2": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+            "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
+            "dev": true,
+            "requires": {
+                "duplexer2": "~0.1.0",
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "stream-exhaust": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+            "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+            "dev": true
+        },
+        "stream-http": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz",
+            "integrity": "sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==",
+            "dev": true,
+            "requires": {
+                "builtin-status-codes": "^3.0.0",
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.6.0",
+                "xtend": "^4.0.2"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "stream-shift": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+            "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+            "dev": true
+        },
+        "stream-splicer": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
+            "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "streamqueue": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/streamqueue/-/streamqueue-0.0.6.tgz",
+            "integrity": "sha1-ZvX17JTpuK8knkrsLdH3Qb/pTeM=",
+            "dev": true,
+            "requires": {
+                "readable-stream": "^1.0.26-2"
+            },
+            "dependencies": {
+                "isarray": {
+                    "version": "0.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+                    "dev": true
+                },
+                "readable-stream": {
+                    "version": "1.1.14",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+                    "dev": true,
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.1",
+                        "isarray": "0.0.1",
+                        "string_decoder": "~0.10.x"
+                    }
+                },
+                "string_decoder": {
+                    "version": "0.10.31",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+                    "dev": true
+                }
+            }
+        },
+        "string-width": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+            "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+            "dev": true,
+            "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+                    "dev": true
+                },
+                "strip-ansi": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^4.1.0"
+                    }
+                }
+            }
+        },
+        "string.prototype.trimend": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
+            "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.18.0-next.1"
+            },
+            "dependencies": {
+                "es-abstract": {
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+                    "requires": {
+                        "es-to-primitive": "^1.2.1",
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.1",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
+                        "object-keys": "^1.1.1",
+                        "object.assign": "^4.1.1",
+                        "string.prototype.trimend": "^1.0.1",
+                        "string.prototype.trimstart": "^1.0.1"
+                    }
+                },
+                "object.assign": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+                    "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+                    "requires": {
+                        "define-properties": "^1.1.3",
+                        "es-abstract": "^1.18.0-next.0",
+                        "has-symbols": "^1.0.1",
+                        "object-keys": "^1.1.1"
+                    }
+                }
+            }
+        },
+        "string.prototype.trimstart": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
+            "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.18.0-next.1"
+            },
+            "dependencies": {
+                "es-abstract": {
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+                    "requires": {
+                        "es-to-primitive": "^1.2.1",
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.1",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
+                        "object-keys": "^1.1.1",
+                        "object.assign": "^4.1.1",
+                        "string.prototype.trimend": "^1.0.1",
+                        "string.prototype.trimstart": "^1.0.1"
+                    }
+                },
+                "object.assign": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+                    "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+                    "requires": {
+                        "define-properties": "^1.1.3",
+                        "es-abstract": "^1.18.0-next.0",
+                        "has-symbols": "^1.0.1",
+                        "object-keys": "^1.1.1"
+                    }
+                }
+            }
+        },
+        "string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "strip-ansi": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+            "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+            "dev": true,
+            "requires": {
+                "ansi-regex": "^5.0.0"
+            }
+        },
+        "strip-bom": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+            "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+            "dev": true
+        },
+        "strip-bom-string": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+            "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
+            "dev": true
+        },
+        "strip-eof": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+            "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+            "dev": true
+        },
+        "strip-json-comments": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+            "dev": true
+        },
+        "subarg": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+            "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
+            "dev": true,
+            "requires": {
+                "minimist": "^1.1.0"
+            }
+        },
+        "supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "requires": {
+                "has-flag": "^4.0.0"
+            }
+        },
+        "sver-compat": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+            "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+            "dev": true,
+            "requires": {
+                "es6-iterator": "^2.0.1",
+                "es6-symbol": "^3.1.1"
+            }
+        },
+        "syntax-error": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+            "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+            "dev": true,
+            "requires": {
+                "acorn-node": "^1.2.0"
+            }
+        },
+        "table": {
+            "version": "5.4.6",
+            "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+            "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+            "dev": true,
+            "requires": {
+                "ajv": "^6.10.2",
+                "lodash": "^4.17.14",
+                "slice-ansi": "^2.1.0",
+                "string-width": "^3.0.0"
+            }
+        },
+        "text-table": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+            "dev": true
+        },
+        "through": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+            "dev": true
+        },
+        "through2": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+            "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+            "dev": true,
+            "requires": {
+                "readable-stream": "3"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "through2-filter": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+            "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+            "dev": true,
+            "requires": {
+                "through2": "~2.0.0",
+                "xtend": "~4.0.0"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "time-stamp": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+            "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+            "dev": true
+        },
+        "timers-browserify": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+            "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
+            "dev": true,
+            "requires": {
+                "process": "~0.11.0"
+            }
+        },
+        "timers-ext": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+            "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+            "dev": true,
+            "requires": {
+                "es5-ext": "~0.10.46",
+                "next-tick": "1"
+            }
+        },
+        "to-absolute-glob": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+            "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+            "dev": true,
+            "requires": {
+                "is-absolute": "^1.0.0",
+                "is-negated-glob": "^1.0.0"
+            }
+        },
+        "to-object-path": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+            "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "to-regex": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+            "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+            "dev": true,
+            "requires": {
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "regex-not": "^1.0.2",
+                "safe-regex": "^1.1.0"
+            }
+        },
+        "to-regex-range": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+            "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+            "dev": true,
+            "requires": {
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1"
+            }
+        },
+        "to-through": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+            "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+            "dev": true,
+            "requires": {
+                "through2": "^2.0.3"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "travis-fold": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/travis-fold/-/travis-fold-0.1.2.tgz",
+            "integrity": "sha1-/sAF+dyqJZo/lFnOWmkGq6TFRdo=",
+            "dev": true
+        },
+        "tsconfig-paths": {
+            "version": "3.9.0",
+            "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+            "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+            "dev": true,
+            "requires": {
+                "@types/json5": "^0.0.29",
+                "json5": "^1.0.1",
+                "minimist": "^1.2.0",
+                "strip-bom": "^3.0.0"
+            }
+        },
+        "tslib": {
+            "version": "1.13.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+            "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+            "dev": true
+        },
+        "tsutils": {
+            "version": "3.17.1",
+            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+            "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+            "dev": true,
+            "requires": {
+                "tslib": "^1.8.1"
+            }
+        },
+        "tty-browserify": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+            "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
+            "dev": true
+        },
+        "tunnel": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+            "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+            "dev": true
+        },
+        "type": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+            "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+            "dev": true
+        },
+        "type-check": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+            "dev": true,
+            "requires": {
+                "prelude-ls": "~1.1.2"
+            }
+        },
+        "type-detect": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+            "dev": true
+        },
+        "type-fest": {
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+            "dev": true
+        },
+        "typed-rest-client": {
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.7.3.tgz",
+            "integrity": "sha512-CwTpx/TkRHGZoHkJhBcp4X8K3/WtlzSHVQR0OIFnt10j4tgy4ypgq/SrrgVpA1s6tAL49Q6J3R5C0Cgfh2ddqA==",
+            "dev": true,
+            "requires": {
+                "qs": "^6.9.1",
+                "tunnel": "0.0.6",
+                "underscore": "1.8.3"
+            }
+        },
+        "typedarray": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+            "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+            "dev": true
+        },
+        "typescript": {
+            "version": "4.0.0-dev.20200803",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.0-dev.20200803.tgz",
+            "integrity": "sha512-f/jDkFqCs0gbUd5MCUijO9u3AOMx1x1HdRDDHSidlc6uPVEkRduxjeTFhIXbGutO7ivzv+aC2sxH+1FQwsyBcg==",
+            "dev": true
+        },
+        "uglify-js": {
+            "version": "3.12.1",
+            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz",
+            "integrity": "sha512-o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ==",
+            "dev": true,
+            "optional": true
+        },
+        "umd": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
+            "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
+            "dev": true
+        },
+        "unc-path-regex": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+            "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+            "dev": true
+        },
+        "undeclared-identifiers": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz",
+            "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==",
+            "dev": true,
+            "requires": {
+                "acorn-node": "^1.3.0",
+                "dash-ast": "^1.0.0",
+                "get-assigned-identifiers": "^1.2.0",
+                "simple-concat": "^1.0.0",
+                "xtend": "^4.0.1"
+            }
+        },
+        "underscore": {
+            "version": "1.8.3",
+            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+            "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
+            "dev": true
+        },
+        "undertaker": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+            "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+            "dev": true,
+            "requires": {
+                "arr-flatten": "^1.0.1",
+                "arr-map": "^2.0.0",
+                "bach": "^1.0.0",
+                "collection-map": "^1.0.0",
+                "es6-weak-map": "^2.0.1",
+                "fast-levenshtein": "^1.0.0",
+                "last-run": "^1.1.0",
+                "object.defaults": "^1.0.0",
+                "object.reduce": "^1.0.0",
+                "undertaker-registry": "^1.0.0"
+            },
+            "dependencies": {
+                "fast-levenshtein": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+                    "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
+                    "dev": true
+                }
+            }
+        },
+        "undertaker-registry": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+            "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+            "dev": true
+        },
+        "union-value": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+            "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+            "dev": true,
+            "requires": {
+                "arr-union": "^3.1.0",
+                "get-value": "^2.0.6",
+                "is-extendable": "^0.1.1",
+                "set-value": "^2.0.1"
+            }
+        },
+        "unique-stream": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+            "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+            "dev": true,
+            "requires": {
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "through2-filter": "^3.0.0"
+            }
+        },
+        "universal-user-agent": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+            "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
+            "dev": true
+        },
+        "universalify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+            "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+            "dev": true
+        },
+        "unset-value": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+            "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+            "dev": true,
+            "requires": {
+                "has-value": "^0.3.1",
+                "isobject": "^3.0.0"
+            },
+            "dependencies": {
+                "has-value": {
+                    "version": "0.3.1",
+                    "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+                    "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+                    "dev": true,
+                    "requires": {
+                        "get-value": "^2.0.3",
+                        "has-values": "^0.1.4",
+                        "isobject": "^2.0.0"
+                    },
+                    "dependencies": {
+                        "isobject": {
+                            "version": "2.1.0",
+                            "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+                            "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+                            "dev": true,
+                            "requires": {
+                                "isarray": "1.0.0"
+                            }
+                        }
+                    }
+                },
+                "has-values": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+                    "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+                    "dev": true
+                }
+            }
+        },
+        "upath": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+            "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+            "dev": true
+        },
+        "uri-js": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+            "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+            "dev": true,
+            "requires": {
+                "punycode": "^2.1.0"
+            },
+            "dependencies": {
+                "punycode": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+                    "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+                    "dev": true
+                }
+            }
+        },
+        "urix": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+            "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+            "dev": true
+        },
+        "url": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+            "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+            "dev": true,
+            "requires": {
+                "punycode": "1.3.2",
+                "querystring": "0.2.0"
+            },
+            "dependencies": {
+                "punycode": {
+                    "version": "1.3.2",
+                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                    "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+                    "dev": true
+                }
+            }
+        },
+        "use": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+            "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+            "dev": true
+        },
+        "util": {
+            "version": "0.12.3",
+            "resolved": "https://registry.npmjs.org/util/-/util-0.12.3.tgz",
+            "integrity": "sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.3",
+                "is-arguments": "^1.0.4",
+                "is-generator-function": "^1.0.7",
+                "is-typed-array": "^1.1.3",
+                "safe-buffer": "^5.1.2",
+                "which-typed-array": "^1.1.2"
+            }
+        },
+        "util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+            "dev": true
+        },
+        "v8-compile-cache": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
+            "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
+            "dev": true
+        },
+        "v8flags": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+            "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+            "dev": true,
+            "requires": {
+                "homedir-polyfill": "^1.0.1"
+            }
+        },
+        "validate-npm-package-license": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+            "dev": true,
+            "requires": {
+                "spdx-correct": "^3.0.0",
+                "spdx-expression-parse": "^3.0.0"
+            }
+        },
+        "value-or-function": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+            "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+            "dev": true
+        },
+        "vinyl": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+            "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+            "dev": true,
+            "requires": {
+                "clone": "^2.1.1",
+                "clone-buffer": "^1.0.0",
+                "clone-stats": "^1.0.0",
+                "cloneable-readable": "^1.0.0",
+                "remove-trailing-separator": "^1.0.1",
+                "replace-ext": "^1.0.0"
+            }
+        },
+        "vinyl-fs": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+            "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+            "dev": true,
+            "requires": {
+                "fs-mkdirp-stream": "^1.0.0",
+                "glob-stream": "^6.1.0",
+                "graceful-fs": "^4.0.0",
+                "is-valid-glob": "^1.0.0",
+                "lazystream": "^1.0.0",
+                "lead": "^1.0.0",
+                "object.assign": "^4.0.4",
+                "pumpify": "^1.3.5",
+                "readable-stream": "^2.3.3",
+                "remove-bom-buffer": "^3.0.0",
+                "remove-bom-stream": "^1.2.0",
+                "resolve-options": "^1.1.0",
+                "through2": "^2.0.0",
+                "to-through": "^2.0.0",
+                "value-or-function": "^3.0.0",
+                "vinyl": "^2.0.0",
+                "vinyl-sourcemap": "^1.1.0"
+            },
+            "dependencies": {
+                "through2": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "readable-stream": "~2.3.6",
+                        "xtend": "~4.0.1"
+                    }
+                }
+            }
+        },
+        "vinyl-sourcemap": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+            "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+            "dev": true,
+            "requires": {
+                "append-buffer": "^1.0.2",
+                "convert-source-map": "^1.5.0",
+                "graceful-fs": "^4.1.6",
+                "normalize-path": "^2.1.1",
+                "now-and-later": "^2.0.0",
+                "remove-bom-buffer": "^3.0.0",
+                "vinyl": "^2.0.0"
+            },
+            "dependencies": {
+                "normalize-path": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+                    "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+                    "dev": true,
+                    "requires": {
+                        "remove-trailing-separator": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "vinyl-sourcemaps-apply": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
+            "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
+            "dev": true,
+            "requires": {
+                "source-map": "^0.5.1"
+            }
+        },
+        "vm-browserify": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+            "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+            "dev": true
+        },
+        "which": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "dev": true,
+            "requires": {
+                "isexe": "^2.0.0"
+            }
+        },
+        "which-module": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+            "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+            "dev": true
+        },
+        "which-typed-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.2.tgz",
+            "integrity": "sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==",
+            "dev": true,
+            "requires": {
+                "available-typed-arrays": "^1.0.2",
+                "es-abstract": "^1.17.5",
+                "foreach": "^2.0.5",
+                "function-bind": "^1.1.1",
+                "has-symbols": "^1.0.1",
+                "is-typed-array": "^1.1.3"
+            }
+        },
+        "wide-align": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+            "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+            "dev": true,
+            "requires": {
+                "string-width": "^1.0.2 || 2"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+                    "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+                    "dev": true
+                },
+                "string-width": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+                    "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+                    "dev": true,
+                    "requires": {
+                        "is-fullwidth-code-point": "^2.0.0",
+                        "strip-ansi": "^4.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^3.0.0"
+                    }
+                }
+            }
+        },
+        "word-wrap": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "dev": true
+        },
+        "wordwrap": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+            "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+            "dev": true
+        },
+        "workerpool": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz",
+            "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==",
+            "dev": true
+        },
+        "wrap-ansi": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+            "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+            "dev": true,
+            "requires": {
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                    "dev": true
+                },
+                "is-fullwidth-code-point": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+                    "dev": true,
+                    "requires": {
+                        "number-is-nan": "^1.0.0"
+                    }
+                },
+                "string-width": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                    "dev": true,
+                    "requires": {
+                        "code-point-at": "^1.0.0",
+                        "is-fullwidth-code-point": "^1.0.0",
+                        "strip-ansi": "^3.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^2.0.0"
+                    }
+                }
+            }
+        },
+        "wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true
+        },
+        "write": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+            "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+            "dev": true,
+            "requires": {
+                "mkdirp": "^0.5.1"
+            },
+            "dependencies": {
+                "mkdirp": {
+                    "version": "0.5.5",
+                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+                    "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+                    "dev": true,
+                    "requires": {
+                        "minimist": "^1.2.5"
+                    }
+                }
+            }
+        },
+        "xml2js": {
+            "version": "0.4.23",
+            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+            "dev": true,
+            "requires": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            }
+        },
+        "xmlbuilder": {
+            "version": "11.0.1",
+            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+            "dev": true
+        },
+        "xtend": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+            "dev": true
+        },
+        "y18n": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+            "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+            "dev": true
+        },
+        "yargs": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
+            "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
+            "dev": true,
+            "requires": {
+                "camelcase": "^3.0.0",
+                "cliui": "^3.2.0",
+                "decamelize": "^1.1.1",
+                "get-caller-file": "^1.0.1",
+                "os-locale": "^1.4.0",
+                "read-pkg-up": "^1.0.1",
+                "require-directory": "^2.1.1",
+                "require-main-filename": "^1.0.1",
+                "set-blocking": "^2.0.0",
+                "string-width": "^1.0.2",
+                "which-module": "^1.0.0",
+                "y18n": "^3.2.1",
+                "yargs-parser": "5.0.0-security.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                    "dev": true
+                },
+                "find-up": {
+                    "version": "1.1.2",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+                    "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+                    "dev": true,
+                    "requires": {
+                        "path-exists": "^2.0.0",
+                        "pinkie-promise": "^2.0.0"
+                    }
+                },
+                "is-fullwidth-code-point": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+                    "dev": true,
+                    "requires": {
+                        "number-is-nan": "^1.0.0"
+                    }
+                },
+                "load-json-file": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+                    "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+                    "dev": true,
+                    "requires": {
+                        "graceful-fs": "^4.1.2",
+                        "parse-json": "^2.2.0",
+                        "pify": "^2.0.0",
+                        "pinkie-promise": "^2.0.0",
+                        "strip-bom": "^2.0.0"
+                    }
+                },
+                "path-exists": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+                    "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+                    "dev": true,
+                    "requires": {
+                        "pinkie-promise": "^2.0.0"
+                    }
+                },
+                "path-type": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+                    "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+                    "dev": true,
+                    "requires": {
+                        "graceful-fs": "^4.1.2",
+                        "pify": "^2.0.0",
+                        "pinkie-promise": "^2.0.0"
+                    }
+                },
+                "read-pkg": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                    "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+                    "dev": true,
+                    "requires": {
+                        "load-json-file": "^1.0.0",
+                        "normalize-package-data": "^2.3.2",
+                        "path-type": "^1.0.0"
+                    }
+                },
+                "read-pkg-up": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                    "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+                    "dev": true,
+                    "requires": {
+                        "find-up": "^1.0.0",
+                        "read-pkg": "^1.0.0"
+                    }
+                },
+                "string-width": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                    "dev": true,
+                    "requires": {
+                        "code-point-at": "^1.0.0",
+                        "is-fullwidth-code-point": "^1.0.0",
+                        "strip-ansi": "^3.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^2.0.0"
+                    }
+                },
+                "strip-bom": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                    "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+                    "dev": true,
+                    "requires": {
+                        "is-utf8": "^0.2.0"
+                    }
+                }
+            }
+        },
+        "yargs-parser": {
+            "version": "5.0.0-security.0",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
+            "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
+            "dev": true,
+            "requires": {
+                "camelcase": "^3.0.0",
+                "object.assign": "^4.1.0"
+            }
+        },
+        "yargs-unparser": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+            "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+            "dev": true,
+            "requires": {
+                "camelcase": "^6.0.0",
+                "decamelize": "^4.0.0",
+                "flat": "^5.0.2",
+                "is-plain-obj": "^2.1.0"
+            },
+            "dependencies": {
+                "camelcase": {
+                    "version": "6.2.0",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+                    "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+                    "dev": true
+                },
+                "decamelize": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+                    "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+                    "dev": true
+                }
+            }
+        },
+        "yocto-queue": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+            "dev": true
+        }
+    }
+}
diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts
index d383a713231..5be89d6037c 100644
--- a/src/compiler/factory/emitHelpers.ts
+++ b/src/compiler/factory/emitHelpers.ts
@@ -917,4 +917,4 @@ namespace ts {
                 return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
             })(name => super[name], (name, value) => super[name] = value);`
     };
-}
+}
\ No newline at end of file

From 943b350f8d5f61874a4cafb1bac86433e8f9c743 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@codecademy.com>
Date: Tue, 1 Dec 2020 19:03:49 -0500
Subject: [PATCH 6/6] Used String on base class per suggestion

---
 src/compiler/factory/emitHelpers.ts                  |  2 +-
 ...straintsClassHeritageListMemberTypeAnnotations.js |  2 +-
 ...sWithInaccessibleTypeInTypeParameterConstraint.js |  2 +-
 .../baselines/reference/abstractClassInLocalScope.js |  2 +-
 .../reference/abstractClassInLocalScopeIsAbstract.js |  2 +-
 tests/baselines/reference/abstractProperty.js        |  2 +-
 .../reference/abstractPropertyInConstructor.js       |  2 +-
 .../baselines/reference/abstractPropertyNegative.js  |  2 +-
 .../reference/accessOverriddenBaseClassMember1.js    |  2 +-
 .../reference/accessorsOverrideProperty7.js          |  2 +-
 .../accessors_spec_section-4.5_inference.js          |  2 +-
 .../reference/aliasUsageInAccessorsOfClass.js        |  2 +-
 tests/baselines/reference/aliasUsageInArray.js       |  2 +-
 .../reference/aliasUsageInFunctionExpression.js      |  2 +-
 .../reference/aliasUsageInGenericFunction.js         |  2 +-
 .../reference/aliasUsageInIndexerOfClass.js          |  2 +-
 .../baselines/reference/aliasUsageInObjectLiteral.js |  2 +-
 .../baselines/reference/aliasUsageInOrExpression.js  |  2 +-
 .../aliasUsageInTypeArgumentOfExtendsClause.js       |  4 ++--
 .../baselines/reference/aliasUsageInVarAssignment.js |  2 +-
 .../reference/ambiguousOverloadResolution.js         |  2 +-
 .../reference/amdDeclarationEmitNoExtraDeclare.js    |  2 +-
 .../reference/anonClassDeclarationEmitIsAnon.js      |  4 ++--
 ...onymousClassDeclarationDoesntPrintWithReadonly.js |  2 +-
 tests/baselines/reference/apparentTypeSubtyping.js   |  2 +-
 tests/baselines/reference/apparentTypeSupertype.js   |  2 +-
 tests/baselines/reference/arrayAssignmentTest1.js    |  2 +-
 tests/baselines/reference/arrayAssignmentTest2.js    |  2 +-
 tests/baselines/reference/arrayBestCommonTypes.js    |  2 +-
 .../baselines/reference/arrayLiteralTypeInference.js |  2 +-
 tests/baselines/reference/arrayLiterals.js           |  2 +-
 .../reference/arrayLiteralsWithRecursiveGenerics.js  |  2 +-
 .../arrayOfSubtypeIsAssignableToReadonlyArray.js     |  2 +-
 tests/baselines/reference/arrowFunctionContexts.js   |  2 +-
 .../baselines/reference/assertionTypePredicates1.js  |  2 +-
 .../reference/assignmentCompatWithCallSignatures3.js |  2 +-
 .../reference/assignmentCompatWithCallSignatures4.js |  2 +-
 .../reference/assignmentCompatWithCallSignatures5.js |  2 +-
 .../reference/assignmentCompatWithCallSignatures6.js |  2 +-
 .../assignmentCompatWithConstructSignatures3.js      |  2 +-
 .../assignmentCompatWithConstructSignatures4.js      |  2 +-
 .../assignmentCompatWithConstructSignatures5.js      |  2 +-
 .../assignmentCompatWithConstructSignatures6.js      |  2 +-
 .../reference/assignmentCompatWithNumericIndexer.js  |  2 +-
 .../reference/assignmentCompatWithNumericIndexer3.js |  2 +-
 .../reference/assignmentCompatWithObjectMembers4.js  |  2 +-
 .../assignmentCompatWithObjectMembersOptionality.js  |  2 +-
 .../assignmentCompatWithObjectMembersOptionality2.js |  2 +-
 .../reference/assignmentCompatWithStringIndexer.js   |  2 +-
 .../baselines/reference/assignmentCompatability45.js |  2 +-
 tests/baselines/reference/assignmentLHSIsValue.js    |  2 +-
 .../baselines/reference/asyncImportedPromise_es5.js  |  2 +-
 tests/baselines/reference/autolift4.js               |  2 +-
 tests/baselines/reference/baseCheck.js               |  2 +-
 .../reference/baseClassImprovedMismatchErrors.js     |  2 +-
 .../baselines/reference/baseConstraintOfDecorator.js |  2 +-
 .../reference/baseExpressionTypeParameters.js        |  2 +-
 .../reference/baseIndexSignatureResolution.js        |  2 +-
 tests/baselines/reference/baseTypeOrderChecking.js   |  2 +-
 .../reference/baseTypeWrappingInstantiationChain.js  |  2 +-
 tests/baselines/reference/bases.js                   |  2 +-
 .../bestCommonTypeOfConditionalExpressions.js        |  2 +-
 .../bestCommonTypeOfConditionalExpressions2.js       |  2 +-
 tests/baselines/reference/bestCommonTypeOfTuple2.js  |  2 +-
 .../reference/callChainWithSuper(target=es5).js      |  2 +-
 .../callSignatureAssignabilityInInheritance2.js      |  2 +-
 .../callSignatureAssignabilityInInheritance3.js      |  2 +-
 .../callSignatureAssignabilityInInheritance4.js      |  2 +-
 .../callSignatureAssignabilityInInheritance5.js      |  2 +-
 .../callSignatureAssignabilityInInheritance6.js      |  2 +-
 tests/baselines/reference/callWithSpread.js          |  2 +-
 .../captureSuperPropertyAccessInSuperCall01.js       |  2 +-
 tests/baselines/reference/captureThisInSuperCall.js  |  2 +-
 tests/baselines/reference/castingTuple.js            |  2 +-
 tests/baselines/reference/chainedAssignment3.js      |  2 +-
 ...thTypeParameterConstrainedToOtherTypeParameter.js |  2 +-
 tests/baselines/reference/checkForObjectTooStrict.js |  2 +-
 .../reference/checkJsxChildrenCanBeTupleType.js      |  2 +-
 .../reference/checkJsxChildrenProperty12.js          |  2 +-
 .../reference/checkJsxChildrenProperty13.js          |  2 +-
 .../reference/checkJsxChildrenProperty14.js          |  2 +-
 .../baselines/reference/checkJsxChildrenProperty3.js |  2 +-
 .../baselines/reference/checkJsxChildrenProperty4.js |  2 +-
 .../baselines/reference/checkJsxChildrenProperty5.js |  2 +-
 .../baselines/reference/checkJsxChildrenProperty6.js |  2 +-
 .../baselines/reference/checkJsxChildrenProperty7.js |  2 +-
 .../baselines/reference/checkJsxChildrenProperty8.js |  2 +-
 .../checkJsxIntersectionElementPropsType.js          |  2 +-
 .../checkJsxSubtleSkipContextSensitiveBug.js         |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing1.js  |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing2.js  |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing3.js  |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing4.js  |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing5.js  |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing6.js  |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing7.js  |  2 +-
 .../reference/checkSuperCallBeforeThisAccessing8.js  |  2 +-
 .../circularConstraintYieldsAppropriateError.js      |  2 +-
 tests/baselines/reference/circularImportAlias.js     |  2 +-
 .../reference/circularTypeofWithFunctionModule.js    |  2 +-
 .../classAbstractConstructorAssignability.js         |  2 +-
 .../baselines/reference/classAbstractCrashedOnce.js  |  2 +-
 tests/baselines/reference/classAbstractExtends.js    |  2 +-
 .../reference/classAbstractFactoryFunction.js        |  2 +-
 tests/baselines/reference/classAbstractGeneric.js    |  2 +-
 tests/baselines/reference/classAbstractInAModule.js  |  2 +-
 .../baselines/reference/classAbstractInheritance.js  |  2 +-
 .../reference/classAbstractInstantiations1.js        |  2 +-
 .../reference/classAbstractInstantiations2.js        |  2 +-
 .../reference/classAbstractOverrideWithAbstract.js   |  2 +-
 tests/baselines/reference/classAbstractSuperCalls.js |  2 +-
 .../reference/classAbstractUsingAbstractMethod1.js   |  2 +-
 .../reference/classAbstractUsingAbstractMethods2.js  |  2 +-
 .../reference/classConstructorAccessibility2.js      |  2 +-
 .../reference/classConstructorAccessibility4.js      |  2 +-
 .../reference/classConstructorAccessibility5.js      |  2 +-
 .../classConstructorParametersAccessibility.js       |  2 +-
 .../classConstructorParametersAccessibility2.js      |  2 +-
 .../classConstructorParametersAccessibility3.js      |  2 +-
 ...classDeclarationMergedInModuleWithContinuation.js |  2 +-
 .../reference/classDeclaredBeforeClassFactory.js     |  2 +-
 .../reference/classDoesNotDependOnBaseTypes.js       |  2 +-
 tests/baselines/reference/classExpression2.js        |  2 +-
 tests/baselines/reference/classExpression3.js        |  2 +-
 .../classExpressionExtendingAbstractClass.js         |  2 +-
 .../classExpressionInClassStaticDeclarations.js      |  2 +-
 .../baselines/reference/classExtendingBuiltinType.js |  2 +-
 tests/baselines/reference/classExtendingClass.js     |  2 +-
 .../reference/classExtendingClassLikeType.js         |  2 +-
 .../reference/classExtendingNonConstructor.js        |  2 +-
 tests/baselines/reference/classExtendingNull.js      |  2 +-
 tests/baselines/reference/classExtendingPrimitive.js |  2 +-
 .../baselines/reference/classExtendingPrimitive2.js  |  2 +-
 .../reference/classExtendingQualifiedName.js         |  2 +-
 .../reference/classExtendingQualifiedName2.js        |  2 +-
 tests/baselines/reference/classExtendsAcrossFiles.js |  4 ++--
 ...useClassMergedWithModuleNotReferingConstructor.js |  2 +-
 ...classExtendsClauseClassNotReferringConstructor.js |  2 +-
 .../reference/classExtendsEveryObjectType.js         |  2 +-
 .../reference/classExtendsEveryObjectType2.js        |  2 +-
 tests/baselines/reference/classExtendsInterface.js   |  2 +-
 .../reference/classExtendsInterfaceInExpression.js   |  2 +-
 .../reference/classExtendsInterfaceInModule.js       |  2 +-
 .../baselines/reference/classExtendsInterface_not.js |  2 +-
 tests/baselines/reference/classExtendsItself.js      |  2 +-
 .../reference/classExtendsItselfIndirectly.js        |  2 +-
 .../reference/classExtendsItselfIndirectly2.js       |  2 +-
 .../reference/classExtendsItselfIndirectly3.js       | 12 ++++++------
 .../reference/classExtendsMultipleBaseClasses.js     |  2 +-
 tests/baselines/reference/classExtendsNull.js        |  2 +-
 .../classExtendsShadowedConstructorFunction.js       |  2 +-
 .../classExtendsValidConstructorFunction.js          |  2 +-
 .../baselines/reference/classExtensionNameOutput.js  |  2 +-
 .../reference/classHeritageWithTrailingSeparator.js  |  2 +-
 tests/baselines/reference/classImplementsClass2.js   |  2 +-
 tests/baselines/reference/classImplementsClass3.js   |  2 +-
 tests/baselines/reference/classImplementsClass4.js   |  2 +-
 tests/baselines/reference/classImplementsClass5.js   |  2 +-
 tests/baselines/reference/classImplementsClass6.js   |  2 +-
 tests/baselines/reference/classIndexer3.js           |  2 +-
 tests/baselines/reference/classInheritence.js        |  2 +-
 .../baselines/reference/classIsSubtypeOfBaseType.js  |  2 +-
 .../classMergedWithInterfaceMultipleBasesNoError.js  |  2 +-
 tests/baselines/reference/classOrder2.js             |  2 +-
 tests/baselines/reference/classOrderBug.js           |  2 +-
 tests/baselines/reference/classSideInheritance1.js   |  2 +-
 tests/baselines/reference/classSideInheritance2.js   |  2 +-
 tests/baselines/reference/classSideInheritance3.js   |  2 +-
 tests/baselines/reference/classUpdateTests.js        |  2 +-
 .../reference/classUsedBeforeInitializedVariables.js |  2 +-
 .../reference/classWithBaseClassButNoConstructor.js  |  2 +-
 tests/baselines/reference/classWithConstructors.js   |  2 +-
 .../reference/classWithProtectedProperty.js          |  2 +-
 tests/baselines/reference/classWithStaticMembers.js  |  2 +-
 tests/baselines/reference/classdecl.js               |  2 +-
 .../reference/cloduleGenericOnSelfMember.js          |  2 +-
 tests/baselines/reference/clodulesDerivedClasses.js  |  2 +-
 .../collisionSuperAndLocalFunctionInAccessors.js     |  2 +-
 .../collisionSuperAndLocalFunctionInConstructor.js   |  2 +-
 .../collisionSuperAndLocalFunctionInMethod.js        |  2 +-
 .../collisionSuperAndLocalFunctionInProperty.js      |  2 +-
 .../collisionSuperAndLocalVarInAccessors.js          |  2 +-
 .../collisionSuperAndLocalVarInConstructor.js        |  2 +-
 .../reference/collisionSuperAndLocalVarInMethod.js   |  2 +-
 .../reference/collisionSuperAndLocalVarInProperty.js |  2 +-
 .../reference/collisionSuperAndNameResolution.js     |  2 +-
 .../reference/collisionSuperAndParameter.js          |  2 +-
 .../reference/collisionSuperAndParameter1.js         |  2 +-
 ...isionSuperAndPropertyNameAsConstuctorParameter.js |  2 +-
 ...onThisExpressionAndLocalVarWithSuperExperssion.js |  2 +-
 tests/baselines/reference/commentsInheritance.js     |  2 +-
 .../comparisonOperatorWithIdenticalObjects.js        |  2 +-
 ...eratorWithNoRelationshipObjectsOnCallSignature.js |  2 +-
 ...ithNoRelationshipObjectsOnConstructorSignature.js |  2 +-
 ...ratorWithNoRelationshipObjectsOnIndexSignature.js |  2 +-
 ...RelationshipObjectsOnInstantiatedCallSignature.js |  2 +-
 ...nshipObjectsOnInstantiatedConstructorSignature.js |  2 +-
 ...arisonOperatorWithSubtypeObjectOnCallSignature.js |  2 +-
 ...peratorWithSubtypeObjectOnConstructorSignature.js |  2 +-
 ...risonOperatorWithSubtypeObjectOnIndexSignature.js |  2 +-
 ...orWithSubtypeObjectOnInstantiatedCallSignature.js |  2 +-
 ...ubtypeObjectOnInstantiatedConstructorSignature.js |  2 +-
 .../comparisonOperatorWithSubtypeObjectOnProperty.js |  2 +-
 .../baselines/reference/complexClassRelationships.js |  2 +-
 .../complicatedGenericRecursiveBaseClassReference.js |  2 +-
 .../reference/compoundAssignmentLHSIsValue.js        |  2 +-
 .../compoundExponentiationAssignmentLHSIsValue.js    |  2 +-
 .../reference/computedPropertyNames24_ES5.js         |  2 +-
 .../reference/computedPropertyNames25_ES5.js         |  2 +-
 .../reference/computedPropertyNames26_ES5.js         |  2 +-
 .../reference/computedPropertyNames27_ES5.js         |  2 +-
 .../reference/computedPropertyNames28_ES5.js         |  2 +-
 .../reference/computedPropertyNames30_ES5.js         |  2 +-
 .../reference/computedPropertyNames31_ES5.js         |  2 +-
 .../reference/computedPropertyNames43_ES5.js         |  2 +-
 .../reference/computedPropertyNames44_ES5.js         |  2 +-
 .../reference/computedPropertyNames45_ES5.js         |  2 +-
 .../reference/conditionalOperatorWithIdenticalBCT.js |  2 +-
 .../conditionalOperatorWithoutIdenticalBCT.js        |  2 +-
 .../baselines/reference/constantOverloadFunction.js  |  2 +-
 .../constantOverloadFunctionNoSubtypeError.js        |  2 +-
 .../constraintCheckInGenericBaseTypeReference.js     |  2 +-
 .../constructSignatureAssignabilityInInheritance2.js |  2 +-
 .../constructSignatureAssignabilityInInheritance3.js |  2 +-
 .../constructSignatureAssignabilityInInheritance4.js |  2 +-
 .../constructSignatureAssignabilityInInheritance5.js |  2 +-
 .../constructSignatureAssignabilityInInheritance6.js |  2 +-
 tests/baselines/reference/constructorArgs.js         |  2 +-
 .../constructorFunctionTypeIsAssignableToBaseType.js |  2 +-
 ...constructorFunctionTypeIsAssignableToBaseType2.js |  2 +-
 .../reference/constructorHasPrototypeProperty.js     |  2 +-
 tests/baselines/reference/constructorOverloads2.js   |  2 +-
 tests/baselines/reference/constructorOverloads3.js   |  2 +-
 .../reference/constructorWithCapturedSuper.js        |  2 +-
 .../constructorWithIncompleteTypeAnnotation.js       |  2 +-
 .../reference/contextualTypingArrayOfLambdas.js      |  2 +-
 .../contextualTypingOfConditionalExpression.js       |  2 +-
 .../contextualTypingOfConditionalExpression2.js      |  2 +-
 .../reference/controlFlowSuperPropertyAccess.js      |  2 +-
 ...ashInsourcePropertyIsRelatableToTargetProperty.js |  2 +-
 .../baselines/reference/declFileClassExtendsNull.js  |  2 +-
 .../declFileForFunctionTypeAsTypeParameter.js        |  2 +-
 .../declFileGenericClassWithGenericExtendedClass.js  |  2 +-
 tests/baselines/reference/declFileGenericType.js     |  2 +-
 tests/baselines/reference/declFileGenericType2.js    |  2 +-
 ...ameConflictingWithClassReferredByExtendsClause.js |  2 +-
 ...thExtendsClauseThatHasItsContainerNameConflict.js |  2 +-
 .../reference/declarationEmitExpressionInExtends.js  |  2 +-
 .../reference/declarationEmitExpressionInExtends2.js |  2 +-
 .../reference/declarationEmitExpressionInExtends3.js |  2 +-
 .../reference/declarationEmitExpressionInExtends4.js |  2 +-
 .../reference/declarationEmitExpressionInExtends5.js |  2 +-
 .../reference/declarationEmitExpressionInExtends6.js |  2 +-
 .../reference/declarationEmitExpressionInExtends7.js |  2 +-
 ...EmitForDefaultExportClassExtendingExpression01.js |  2 +-
 .../declarationEmitLocalClassDeclarationMixin.js     |  2 +-
 .../reference/declarationEmitNameConflicts3.js       |  2 +-
 .../declarationEmitPrivateNameCausesError.js         |  2 +-
 ...tionEmitPrivateSymbolCausesVarDeclarationEmit2.js |  2 +-
 .../reference/declarationEmitProtectedMembers.js     |  2 +-
 .../reference/declarationEmitThisPredicates01.js     |  2 +-
 ...declarationEmitThisPredicatesWithPrivateName01.js |  2 +-
 .../reference/declarationNoDanglingGenerics.js       |  2 +-
 .../declarationsForFileShadowingGlobalNoError.js     |  2 +-
 tests/baselines/reference/declareDottedExtend.js     |  2 +-
 tests/baselines/reference/decoratorOnClass9.js       |  2 +-
 .../reference/decoratorOnClassConstructor2.js        |  2 +-
 .../reference/decoratorOnClassConstructor3.js        |  2 +-
 .../reference/decoratorOnClassConstructor4.js        |  2 +-
 .../baselines/reference/decoratorOnClassMethod12.js  |  2 +-
 .../defaultPropsEmptyCurlyBecomesAnyForJs.js         |  4 ++--
 .../reference/defineProperty(target=es5).js          |  2 +-
 .../derivedClassConstructorWithExplicitReturns01.js  |  2 +-
 ...rivedClassConstructorWithExplicitReturns01.js.map |  2 +-
 ...assConstructorWithExplicitReturns01.sourcemap.txt |  2 +-
 .../derivedClassConstructorWithoutSuperCall.js       |  2 +-
 ...derivedClassFunctionOverridesBaseClassAccessor.js |  2 +-
 .../derivedClassIncludesInheritedMembers.js          |  2 +-
 ...ssOverridesIndexersWithAssignmentCompatibility.js |  2 +-
 .../derivedClassOverridesPrivateFunction1.js         |  2 +-
 .../reference/derivedClassOverridesPrivates.js       |  2 +-
 .../derivedClassOverridesProtectedMembers.js         |  2 +-
 .../derivedClassOverridesProtectedMembers2.js        |  2 +-
 .../derivedClassOverridesProtectedMembers3.js        |  2 +-
 .../derivedClassOverridesProtectedMembers4.js        |  2 +-
 .../reference/derivedClassOverridesPublicMembers.js  |  2 +-
 .../reference/derivedClassOverridesWithoutSubtype.js |  2 +-
 .../reference/derivedClassParameterProperties.js     |  2 +-
 .../derivedClassSuperCallsInNonConstructorMembers.js |  2 +-
 .../reference/derivedClassSuperCallsWithThisArg.js   |  2 +-
 .../baselines/reference/derivedClassTransitivity.js  |  2 +-
 .../baselines/reference/derivedClassTransitivity2.js |  2 +-
 .../baselines/reference/derivedClassTransitivity3.js |  2 +-
 .../baselines/reference/derivedClassTransitivity4.js |  2 +-
 tests/baselines/reference/derivedClassWithAny.js     |  2 +-
 ...sWithPrivateInstanceShadowingProtectedInstance.js |  2 +-
 ...lassWithPrivateInstanceShadowingPublicInstance.js |  2 +-
 ...ClassWithPrivateStaticShadowingProtectedStatic.js |  2 +-
 ...vedClassWithPrivateStaticShadowingPublicStatic.js |  2 +-
 .../derivedClassWithoutExplicitConstructor.js        |  2 +-
 .../derivedClassWithoutExplicitConstructor2.js       |  2 +-
 .../derivedClassWithoutExplicitConstructor3.js       |  2 +-
 tests/baselines/reference/derivedClasses.js          |  2 +-
 .../reference/derivedGenericClassWithAny.js          |  2 +-
 ...peAccessesHiddenBaseCallViaSuperPropertyAccess.js |  2 +-
 .../derivedTypeDoesNotRequireExtendsClause.js        |  2 +-
 .../derivedUninitializedPropertyDeclaration.js       |  2 +-
 .../reference/destructuringParameterDeclaration5.js  |  2 +-
 .../doubleMixinConditionalTypeBaseClassWorks.js      |  2 +-
 .../reference/emitBundleWithPrologueDirectives1.js   |  2 +-
 tests/baselines/reference/emitBundleWithShebang1.js  |  2 +-
 tests/baselines/reference/emitBundleWithShebang2.js  |  2 +-
 .../emitBundleWithShebangAndPrologueDirectives1.js   |  2 +-
 .../emitBundleWithShebangAndPrologueDirectives2.js   |  2 +-
 ...DeclarationWithPropertyAccessInHeritageClause1.js |  2 +-
 .../emitClassExpressionInDeclarationFile.js          |  2 +-
 .../emitClassExpressionInDeclarationFile2.js         |  2 +-
 ...perCallBeforeEmitParameterPropertyDeclaration1.js |  2 +-
 .../emitSuperCallBeforeEmitPropertyDeclaration1.js   |  2 +-
 ...rtyDeclarationAndParameterPropertyDeclaration1.js |  2 +-
 .../baselines/reference/emitThisInSuperMethodCall.js |  2 +-
 .../emitter.asyncGenerators.classMethods.es5.js      |  2 +-
 tests/baselines/reference/emptyModuleName.js         |  2 +-
 .../errorForwardReferenceForwadingConstructor.js     |  2 +-
 tests/baselines/reference/errorSuperCalls.js         |  2 +-
 .../baselines/reference/errorSuperPropertyAccess.js  |  2 +-
 .../reference/errorsInGenericTypeReference.js        |  2 +-
 tests/baselines/reference/es6ClassSuperCodegenBug.js |  2 +-
 tests/baselines/reference/es6ClassTest.js            |  2 +-
 tests/baselines/reference/es6ClassTest2.js           |  2 +-
 tests/baselines/reference/es6ClassTest7.js           |  2 +-
 .../reference/exportAssignmentOfGenericType1.js      |  2 +-
 .../reference/exportClassExtendingIntersection.js    |  4 ++--
 .../reference/exportDeclarationInInternalModule.js   |  2 +-
 .../reference/exportDefaultAbstractClass.js          |  4 ++--
 tests/baselines/reference/extBaseClass1.js           |  2 +-
 tests/baselines/reference/extBaseClass2.js           |  2 +-
 .../reference/extendAndImplementTheSameBaseType.js   |  2 +-
 .../reference/extendAndImplementTheSameBaseType2.js  |  2 +-
 .../reference/extendBaseClassBeforeItsDeclared.js    |  2 +-
 .../reference/extendClassExpressionFromModule.js     |  2 +-
 .../reference/extendConstructSignatureInInterface.js |  2 +-
 tests/baselines/reference/extendFromAny.js           |  2 +-
 tests/baselines/reference/extendNonClassSymbol1.js   |  2 +-
 tests/baselines/reference/extendNonClassSymbol2.js   |  2 +-
 .../reference/extendPrivateConstructorClass.js       |  2 +-
 .../extendingClassFromAliasAndUsageInIndexer.js      |  4 ++--
 tests/baselines/reference/extendsClause.js           |  2 +-
 .../baselines/reference/extendsClauseAlreadySeen.js  |  2 +-
 .../baselines/reference/extendsClauseAlreadySeen2.js |  2 +-
 tests/baselines/reference/extendsUntypedModule.js    |  2 +-
 tests/baselines/reference/fluentClasses.js           |  2 +-
 tests/baselines/reference/for-inStatements.js        |  2 +-
 tests/baselines/reference/for-inStatementsInvalid.js |  2 +-
 .../reference/forStatementsMultipleInvalidDecl.js    |  2 +-
 .../reference/functionImplementationErrors.js        |  2 +-
 tests/baselines/reference/functionImplementations.js |  2 +-
 .../reference/functionSubtypingOfVarArgs.js          |  2 +-
 .../reference/functionSubtypingOfVarArgs2.js         |  2 +-
 .../baselines/reference/generatedContextualTyping.js |  2 +-
 .../reference/genericBaseClassLiteralProperty.js     |  2 +-
 .../reference/genericBaseClassLiteralProperty2.js    |  2 +-
 ...enericCallWithConstraintsTypeArgumentInference.js |  2 +-
 .../reference/genericCallWithObjectTypeArgs2.js      |  2 +-
 .../genericCallWithObjectTypeArgsAndConstraints2.js  |  2 +-
 .../genericCallWithObjectTypeArgsAndConstraints3.js  |  2 +-
 .../reference/genericCallbacksAndClassHierarchy.js   |  2 +-
 .../reference/genericClassExpressionInFunction.js    |  2 +-
 ...ricClassInheritsConstructorFromNonGenericClass.js |  2 +-
 .../genericClassPropertyInheritanceSpecialization.js |  2 +-
 .../baselines/reference/genericClassStaticMethod.js  |  2 +-
 tests/baselines/reference/genericClasses3.js         |  2 +-
 .../genericConstraintOnExtendedBuiltinTypes.js       |  2 +-
 .../genericConstraintOnExtendedBuiltinTypes2.js      |  2 +-
 .../genericDerivedTypeWithSpecializedBase.js         |  2 +-
 .../genericDerivedTypeWithSpecializedBase2.js        |  2 +-
 .../reference/genericInheritedDefaultConstructors.js |  2 +-
 .../baselines/reference/genericPrototypeProperty2.js |  2 +-
 .../baselines/reference/genericPrototypeProperty3.js |  2 +-
 .../genericRecursiveImplicitConstructorErrors2.js    |  2 +-
 .../genericRecursiveImplicitConstructorErrors3.js    |  2 +-
 tests/baselines/reference/genericTypeAssertions2.js  |  2 +-
 tests/baselines/reference/genericTypeAssertions4.js  |  2 +-
 tests/baselines/reference/genericTypeAssertions6.js  |  2 +-
 tests/baselines/reference/genericTypeConstraints.js  |  2 +-
 .../genericTypeReferenceWithoutTypeArgument.js       |  2 +-
 .../genericTypeReferenceWithoutTypeArgument2.js      |  2 +-
 .../genericWithIndexerOfTypeParameterType2.js        |  2 +-
 .../reference/heterogeneousArrayLiterals.js          |  2 +-
 tests/baselines/reference/ifDoWhileStatements.js     |  2 +-
 .../reference/illegalSuperCallsInConstructor.js      |  2 +-
 .../reference/implementClausePrecedingExtends.js     |  2 +-
 ...ementingAnInterfaceExtendingClassWithPrivates2.js |  2 +-
 ...mentingAnInterfaceExtendingClassWithProtecteds.js |  2 +-
 tests/baselines/reference/importAsBaseClass.js       |  2 +-
 tests/baselines/reference/importHelpers.js           |  2 +-
 tests/baselines/reference/importHelpersNoHelpers.js  |  2 +-
 tests/baselines/reference/importHelpersNoModule.js   |  2 +-
 .../reference/importNotElidedWhenNotFound.js         |  2 +-
 tests/baselines/reference/importShadowsGlobalName.js |  2 +-
 .../baselines/reference/importUsedInExtendsList1.js  |  2 +-
 ...AccessKeyofNestedSimplifiedSubstituteUnwrapped.js |  2 +-
 tests/baselines/reference/indexedAccessRelation.js   |  2 +-
 .../reference/indexedAccessTypeConstraints.js        |  2 +-
 tests/baselines/reference/indexerConstraints2.js     |  2 +-
 tests/baselines/reference/indirectSelfReference.js   |  2 +-
 .../reference/indirectSelfReferenceGeneric.js        |  2 +-
 .../infinitelyExpandingTypesNonGenericBase.js        |  2 +-
 .../reference/inheritFromGenericTypeParameter.js     |  2 +-
 ...inheritSameNamePrivatePropertiesFromSameOrigin.js |  2 +-
 tests/baselines/reference/inheritance.js             |  2 +-
 tests/baselines/reference/inheritance1.js            |  2 +-
 .../inheritanceGrandParentPrivateMemberCollision.js  |  2 +-
 ...ndParentPrivateMemberCollisionWithPublicMember.js |  2 +-
 ...ndParentPublicMemberCollisionWithPrivateMember.js |  2 +-
 .../inheritanceMemberAccessorOverridingAccessor.js   |  2 +-
 .../inheritanceMemberAccessorOverridingMethod.js     |  2 +-
 .../inheritanceMemberAccessorOverridingProperty.js   |  2 +-
 .../inheritanceMemberFuncOverridingAccessor.js       |  2 +-
 .../inheritanceMemberFuncOverridingMethod.js         |  2 +-
 .../inheritanceMemberFuncOverridingProperty.js       |  2 +-
 .../inheritanceMemberPropertyOverridingAccessor.js   |  2 +-
 .../inheritanceMemberPropertyOverridingMethod.js     |  2 +-
 .../inheritanceMemberPropertyOverridingProperty.js   |  2 +-
 .../inheritanceOfGenericConstructorMethod1.js        |  2 +-
 .../inheritanceOfGenericConstructorMethod2.js        |  2 +-
 .../inheritanceStaticAccessorOverridingAccessor.js   |  2 +-
 .../inheritanceStaticAccessorOverridingMethod.js     |  2 +-
 .../inheritanceStaticAccessorOverridingProperty.js   |  2 +-
 .../inheritanceStaticFuncOverridingAccessor.js       |  2 +-
 ...eritanceStaticFuncOverridingAccessorOfFuncType.js |  2 +-
 .../inheritanceStaticFuncOverridingMethod.js         |  2 +-
 .../inheritanceStaticFuncOverridingProperty.js       |  2 +-
 ...eritanceStaticFuncOverridingPropertyOfFuncType.js |  2 +-
 ...itanceStaticFunctionOverridingInstanceProperty.js |  2 +-
 .../reference/inheritanceStaticMembersCompatible.js  |  2 +-
 .../inheritanceStaticMembersIncompatible.js          |  2 +-
 .../inheritanceStaticPropertyOverridingAccessor.js   |  2 +-
 .../inheritanceStaticPropertyOverridingMethod.js     |  2 +-
 .../inheritanceStaticPropertyOverridingProperty.js   |  2 +-
 .../reference/inheritedConstructorWithRestParams.js  |  2 +-
 .../reference/inheritedConstructorWithRestParams2.js |  2 +-
 .../reference/inheritedModuleMembersForClodule.js    |  2 +-
 .../reference/initializerWithThisPropertyAccess.js   |  2 +-
 tests/baselines/reference/instanceOfAssignability.js |  2 +-
 .../instancePropertiesInheritedIntoClassType.js      |  2 +-
 tests/baselines/reference/instanceSubtypeCheck2.js   |  2 +-
 .../instanceofWithStructurallyIdenticalTypes.js      |  2 +-
 .../instantiatedReturnTypeContravariance.js          |  2 +-
 tests/baselines/reference/interfaceClassMerging.js   |  2 +-
 tests/baselines/reference/interfaceClassMerging2.js  |  2 +-
 tests/baselines/reference/interfaceExtendsClass1.js  |  2 +-
 .../reference/interfaceExtendsClassWithPrivate1.js   |  2 +-
 .../reference/interfaceExtendsClassWithPrivate2.js   |  2 +-
 .../reference/interfaceExtendsObjectIntersection.js  |  2 +-
 .../interfaceExtendsObjectIntersectionErrors.js      |  2 +-
 .../baselines/reference/interfaceImplementation8.js  |  2 +-
 .../invalidModuleWithStatementsOfEveryKind.js        |  2 +-
 .../reference/invalidMultipleVariableDeclarations.js |  2 +-
 tests/baselines/reference/invalidReturnStatements.js |  2 +-
 .../reference/isolatedModulesImportExportElision.js  |  2 +-
 .../jsDeclarationsClassExtendsVisibility.js          |  2 +-
 tests/baselines/reference/jsDeclarationsClasses.js   |  2 +-
 .../baselines/reference/jsDeclarationsClassesErr.js  |  2 +-
 tests/baselines/reference/jsDeclarationsDefault.js   |  2 +-
 .../reference/jsDeclarationsExportedClassAliases.js  |  2 +-
 tests/baselines/reference/jsDeclarationsThisTypes.js |  2 +-
 .../jsNoImplicitAnyNoCascadingReferenceErrors.js     |  2 +-
 tests/baselines/reference/jsdocTypeTagCast.js        |  2 +-
 .../reference/jsxCallbackWithDestructuring.js        |  2 +-
 ...ngleChildConfusableWithMultipleChildrenNoError.js |  2 +-
 tests/baselines/reference/jsxHasLiteralType.js       |  2 +-
 tests/baselines/reference/jsxInExtendsClause.js      |  2 +-
 tests/baselines/reference/jsxViaImport.2.js          |  2 +-
 tests/baselines/reference/jsxViaImport.js            |  2 +-
 tests/baselines/reference/keyofAndIndexedAccess.js   |  2 +-
 tests/baselines/reference/lambdaArgCrash.js          |  2 +-
 tests/baselines/reference/lift.js                    |  2 +-
 tests/baselines/reference/localTypes1.js             |  2 +-
 tests/baselines/reference/m7Bugs.js                  |  2 +-
 .../reference/mappedTypePartialConstraints.js        |  2 +-
 tests/baselines/reference/mergedDeclarations5.js     |  2 +-
 tests/baselines/reference/mergedDeclarations6.js     |  2 +-
 .../reference/mergedInheritedClassInterface.js       |  2 +-
 .../mergedInheritedMembersSatisfyAbstractBase.js     |  2 +-
 .../mergedInterfacesWithInheritedPrivates2.js        |  2 +-
 .../mergedInterfacesWithInheritedPrivates3.js        |  2 +-
 .../reference/missingPropertiesOfClassExpression.js  |  2 +-
 tests/baselines/reference/mixinAccessModifiers.js    |  2 +-
 tests/baselines/reference/mixinClassesAnnotated.js   |  2 +-
 tests/baselines/reference/mixinClassesAnonymous.js   |  2 +-
 tests/baselines/reference/mixinClassesMembers.js     |  2 +-
 .../reference/mixinIntersectionIsValidbaseType.js    |  2 +-
 .../baselines/reference/mixinPrivateAndProtected.js  |  2 +-
 .../reference/mixingApparentTypeOverrides.js         |  2 +-
 tests/baselines/reference/moduleAsBaseType.js        |  2 +-
 .../moduleImportedForTypeArgumentPosition.js         |  2 +-
 tests/baselines/reference/moduleNoneOutFile.js       |  2 +-
 .../reference/moduleWithStatementsOfEveryKind.js     |  2 +-
 tests/baselines/reference/multipleInheritance.js     |  2 +-
 .../reference/mutuallyRecursiveGenericBaseTypes2.js  |  2 +-
 .../reference/mutuallyRecursiveInference.js          |  2 +-
 tests/baselines/reference/narrowingOfDottedNames.js  |  2 +-
 .../baselines/reference/neverReturningFunctions1.js  |  2 +-
 tests/baselines/reference/newTarget.es5.js           |  2 +-
 tests/baselines/reference/noCrashOnMixin.js          |  2 +-
 .../reference/noImplicitAnyMissingGetAccessor.js     |  2 +-
 .../reference/noImplicitAnyMissingSetAccessor.js     |  2 +-
 .../nonGenericClassExtendingGenericClassWithAny.js   |  2 +-
 .../numericIndexerConstrainsPropertyDeclarations2.js |  2 +-
 .../baselines/reference/numericIndexerConstraint3.js |  2 +-
 .../baselines/reference/numericIndexerConstraint4.js |  2 +-
 tests/baselines/reference/numericIndexerTyping2.js   |  2 +-
 .../objectCreationOfElementAccessExpression.js       |  2 +-
 .../objectTypeHidingMembersOfExtendedObject.js       |  2 +-
 .../objectTypesIdentityWithNumericIndexers1.js       |  2 +-
 .../objectTypesIdentityWithNumericIndexers2.js       |  2 +-
 .../objectTypesIdentityWithNumericIndexers3.js       |  2 +-
 .../reference/objectTypesIdentityWithPrivates.js     |  2 +-
 .../reference/objectTypesIdentityWithPrivates2.js    |  2 +-
 .../reference/objectTypesIdentityWithPrivates3.js    |  2 +-
 .../objectTypesIdentityWithStringIndexers.js         |  2 +-
 .../objectTypesIdentityWithStringIndexers2.js        |  2 +-
 .../reference/optionalConstructorArgInSuper.js       |  2 +-
 tests/baselines/reference/optionalMethods.js         |  2 +-
 tests/baselines/reference/optionalParamArgsTest.js   |  2 +-
 tests/baselines/reference/optionalParamInOverride.js |  2 +-
 .../baselines/reference/optionalParameterProperty.js |  2 +-
 tests/baselines/reference/outModuleConcatAmd.js      |  2 +-
 tests/baselines/reference/outModuleConcatAmd.js.map  |  2 +-
 .../reference/outModuleConcatAmd.sourcemap.txt       |  2 +-
 tests/baselines/reference/outModuleConcatSystem.js   |  2 +-
 .../baselines/reference/outModuleConcatSystem.js.map |  2 +-
 .../reference/outModuleConcatSystem.sourcemap.txt    |  2 +-
 .../baselines/reference/outModuleTripleSlashRefs.js  |  2 +-
 .../reference/outModuleTripleSlashRefs.js.map        |  2 +-
 .../reference/outModuleTripleSlashRefs.sourcemap.txt |  2 +-
 tests/baselines/reference/overload1.js               |  2 +-
 .../reference/overloadOnConstConstraintChecks1.js    |  2 +-
 .../reference/overloadOnConstConstraintChecks2.js    |  2 +-
 .../reference/overloadOnConstConstraintChecks3.js    |  2 +-
 .../reference/overloadOnConstConstraintChecks4.js    |  2 +-
 .../reference/overloadOnConstantsInvalidOverload1.js |  2 +-
 tests/baselines/reference/overloadResolution.js      |  2 +-
 .../reference/overloadResolutionClassConstructors.js |  2 +-
 .../reference/overloadResolutionConstructors.js      |  2 +-
 tests/baselines/reference/overloadingOnConstants1.js |  2 +-
 tests/baselines/reference/overloadingOnConstants2.js |  2 +-
 .../reference/overrideBaseIntersectionMethod.js      |  2 +-
 .../reference/overridingPrivateStaticMembers.js      |  2 +-
 .../reference/parseErrorInHeritageClause1.js         |  2 +-
 tests/baselines/reference/parser509630.js            |  2 +-
 tests/baselines/reference/parserAstSpans1.js         |  2 +-
 tests/baselines/reference/parserClassDeclaration1.js |  2 +-
 tests/baselines/reference/parserClassDeclaration3.js |  2 +-
 tests/baselines/reference/parserClassDeclaration4.js |  2 +-
 tests/baselines/reference/parserClassDeclaration5.js |  2 +-
 tests/baselines/reference/parserClassDeclaration6.js |  2 +-
 ...parserErrorRecovery_ExtendsOrImplementsClause2.js |  2 +-
 ...parserErrorRecovery_ExtendsOrImplementsClause4.js |  2 +-
 ...parserErrorRecovery_ExtendsOrImplementsClause5.js |  2 +-
 .../reference/parserGenericsInTypeContexts1.js       |  2 +-
 .../reference/parserGenericsInTypeContexts2.js       |  2 +-
 tests/baselines/reference/parserRealSource10.js      |  2 +-
 tests/baselines/reference/parserRealSource11.js      |  2 +-
 tests/baselines/reference/parserharness.js           |  2 +-
 .../partiallyAnnotatedFunctionInferenceError.js      |  2 +-
 ...llyAnnotatedFunctionInferenceWithTypeParameter.js |  2 +-
 tests/baselines/reference/primitiveMembers.js        |  2 +-
 tests/baselines/reference/privacyClass.js            |  2 +-
 .../reference/privacyClassExtendsClauseDeclFile.js   |  4 ++--
 tests/baselines/reference/privacyGloClass.js         |  2 +-
 .../baselines/reference/privateAccessInSubclass1.js  |  2 +-
 .../reference/privateInstanceMemberAccessibility.js  |  2 +-
 ...eProtectedMembersAreNotAccessibleDestructuring.js |  2 +-
 .../reference/privateStaticMemberAccessibility.js    |  2 +-
 .../privateStaticNotAccessibleInClodule2.js          |  2 +-
 .../amd/testGlo.js                                   |  2 +-
 .../node/testGlo.js                                  |  2 +-
 .../reference/project/prologueEmit/amd/out.js        |  2 +-
 .../reference/project/prologueEmit/node/out.js       |  2 +-
 .../quotesInFileAndDirectoryNames/amd/m'ain.js       |  2 +-
 .../quotesInFileAndDirectoryNames/node/m'ain.js      |  2 +-
 tests/baselines/reference/propertiesAndIndexers.js   |  2 +-
 tests/baselines/reference/propertyAccess.js          |  2 +-
 .../propertyAccessOnTypeParameterWithConstraints2.js |  2 +-
 .../propertyAccessOnTypeParameterWithConstraints3.js |  2 +-
 .../propertyAccessOnTypeParameterWithConstraints5.js |  2 +-
 .../reference/propertyOverridesAccessors4.js         |  2 +-
 .../reference/propertyOverridingPrototype.js         |  2 +-
 ...tedClassPropertyAccessibleWithinNestedSubclass.js |  2 +-
 ...edClassPropertyAccessibleWithinNestedSubclass1.js |  2 +-
 ...protectedClassPropertyAccessibleWithinSubclass.js |  2 +-
 ...rotectedClassPropertyAccessibleWithinSubclass2.js |  2 +-
 ...rotectedClassPropertyAccessibleWithinSubclass3.js |  2 +-
 .../protectedInstanceMemberAccessibility.js          |  2 +-
 tests/baselines/reference/protectedMembers.js        |  2 +-
 ...tedStaticClassPropertyAccessibleWithinSubclass.js |  2 +-
 ...edStaticClassPropertyAccessibleWithinSubclass2.js |  2 +-
 ...name-resolution-does-not-affect-class-heritage.js |  2 +-
 .../reference/reactDefaultPropsInferenceSuccess.js   |  2 +-
 tests/baselines/reference/reactHOCSpreadprops.js     |  2 +-
 .../reference/reactReadonlyHOCAssignabilityReal.js   |  2 +-
 ...eactReduxLikeDeferredInferenceAllowsAssignment.js |  2 +-
 .../readonlyAssignmentInSubclassOfClassExpression.js |  2 +-
 .../reference/readonlyConstructorAssignment.js       |  2 +-
 tests/baselines/reference/recursiveBaseCheck3.js     |  2 +-
 tests/baselines/reference/recursiveBaseCheck4.js     |  2 +-
 tests/baselines/reference/recursiveBaseCheck6.js     |  2 +-
 .../reference/recursiveBaseConstructorCreation1.js   |  2 +-
 ...siveClassInstantiationsWithDefaultConstructors.js |  2 +-
 .../reference/recursiveClassReferenceTest.js         |  2 +-
 .../reference/recursiveClassReferenceTest.js.map     |  2 +-
 .../recursiveClassReferenceTest.sourcemap.txt        |  2 +-
 .../reference/recursiveComplicatedClasses.js         |  2 +-
 .../recursivelySpecializedConstructorDeclaration.js  |  2 +-
 tests/baselines/reference/reexportClassDefinition.js |  2 +-
 .../baselines/reference/reexportDefaultIsCallable.js |  2 +-
 tests/baselines/reference/reexportedMissingAlias.js  |  2 +-
 ...olvingClassDeclarationWhenInBaseTypeResolution.js |  2 +-
 tests/baselines/reference/returnInConstructor1.js    |  2 +-
 tests/baselines/reference/returnStatements.js        |  2 +-
 ...urnTypePredicateIsInstantiateInContextOfTarget.js |  2 +-
 .../scopeCheckExtendedClassInsidePublicMethod2.js    |  2 +-
 .../scopeCheckExtendedClassInsideStaticMethod1.js    |  2 +-
 tests/baselines/reference/scopeTests.js              |  2 +-
 tests/baselines/reference/shadowPrivateMembers.js    |  2 +-
 ...ionClassWithDefaultConstructorAndExtendsClause.js |  2 +-
 ...lassWithDefaultConstructorAndExtendsClause.js.map |  2 +-
 ...hDefaultConstructorAndExtendsClause.sourcemap.txt |  2 +-
 .../reference/specializedInheritedConstructors1.js   |  2 +-
 .../specializedOverloadWithRestParameters.js         |  2 +-
 .../reference/spellingSuggestionJSXAttribute.js      |  2 +-
 tests/baselines/reference/staticFactory1.js          |  2 +-
 tests/baselines/reference/staticInheritance.js       |  2 +-
 .../reference/staticMemberAccessOffDerivedType1.js   |  2 +-
 .../reference/staticMismatchBecauseOfPrototype.js    |  2 +-
 tests/baselines/reference/staticPropSuper.js         |  2 +-
 tests/baselines/reference/strictModeInConstructor.js |  2 +-
 tests/baselines/reference/strictModeReservedWord.js  |  2 +-
 .../strictModeReservedWordInClassDeclaration.js      |  2 +-
 .../stringIndexerConstrainsPropertyDeclarations2.js  |  2 +-
 .../subSubClassCanAccessProtectedConstructor.js      |  2 +-
 tests/baselines/reference/subtypesOfTypeParameter.js |  2 +-
 .../subtypesOfTypeParameterWithConstraints.js        |  2 +-
 .../subtypesOfTypeParameterWithConstraints4.js       |  2 +-
 ...ubtypesOfTypeParameterWithRecursiveConstraints.js |  2 +-
 tests/baselines/reference/subtypingTransitivity.js   |  2 +-
 .../reference/subtypingWithCallSignatures2.js        |  2 +-
 .../reference/subtypingWithCallSignatures3.js        |  2 +-
 .../reference/subtypingWithCallSignatures4.js        |  2 +-
 .../reference/subtypingWithConstructSignatures2.js   |  2 +-
 .../reference/subtypingWithConstructSignatures3.js   |  2 +-
 .../reference/subtypingWithConstructSignatures4.js   |  2 +-
 .../reference/subtypingWithConstructSignatures5.js   |  2 +-
 .../reference/subtypingWithConstructSignatures6.js   |  2 +-
 .../reference/subtypingWithNumericIndexer.js         |  2 +-
 .../reference/subtypingWithNumericIndexer3.js        |  2 +-
 .../reference/subtypingWithNumericIndexer4.js        |  2 +-
 .../reference/subtypingWithObjectMembers.js          |  2 +-
 .../reference/subtypingWithObjectMembers4.js         |  2 +-
 .../subtypingWithObjectMembersAccessibility.js       |  2 +-
 .../subtypingWithObjectMembersAccessibility2.js      |  2 +-
 .../reference/subtypingWithStringIndexer.js          |  2 +-
 .../reference/subtypingWithStringIndexer3.js         |  2 +-
 .../reference/subtypingWithStringIndexer4.js         |  2 +-
 tests/baselines/reference/super.js                   |  2 +-
 tests/baselines/reference/super1.js                  |  2 +-
 tests/baselines/reference/super2.js                  |  2 +-
 tests/baselines/reference/superAccess.js             |  2 +-
 tests/baselines/reference/superAccess2.js            |  2 +-
 tests/baselines/reference/superAccessCastedCall.js   |  2 +-
 tests/baselines/reference/superAccessInFatArrow1.js  |  2 +-
 tests/baselines/reference/superCallArgsMustMatch.js  |  2 +-
 tests/baselines/reference/superCallAssignResult.js   |  2 +-
 .../reference/superCallBeforeThisAccessing1.js       |  2 +-
 .../reference/superCallBeforeThisAccessing2.js       |  2 +-
 .../reference/superCallBeforeThisAccessing3.js       |  2 +-
 .../reference/superCallBeforeThisAccessing4.js       |  2 +-
 .../reference/superCallBeforeThisAccessing5.js       |  2 +-
 .../reference/superCallBeforeThisAccessing6.js       |  2 +-
 .../reference/superCallBeforeThisAccessing7.js       |  2 +-
 .../reference/superCallBeforeThisAccessing8.js       |  2 +-
 .../superCallFromClassThatDerivesFromGenericType1.js |  2 +-
 .../superCallFromClassThatDerivesFromGenericType2.js |  2 +-
 ...ericTypeButWithIncorrectNumberOfTypeArguments1.js |  2 +-
 ...tDerivesFromGenericTypeButWithNoTypeArguments1.js |  2 +-
 ...ThatDerivesNonGenericTypeButWithTypeArguments1.js |  2 +-
 .../reference/superCallInNonStaticMethod.js          |  2 +-
 tests/baselines/reference/superCallInStaticMethod.js |  2 +-
 .../reference/superCallInsideClassDeclaration.js     |  2 +-
 .../reference/superCallInsideClassExpression.js      |  2 +-
 .../superCallInsideObjectLiteralExpression.js        |  2 +-
 .../reference/superCallOutsideConstructor.js         |  2 +-
 .../reference/superCallParameterContextualTyping1.js |  2 +-
 .../reference/superCallParameterContextualTyping2.js |  2 +-
 .../reference/superCallParameterContextualTyping3.js |  2 +-
 .../reference/superCallWithCommentEmit01.js          |  2 +-
 .../reference/superCallWithMissingBaseClass.js       |  2 +-
 tests/baselines/reference/superCalls.js              |  2 +-
 tests/baselines/reference/superCallsInConstructor.js |  2 +-
 tests/baselines/reference/superElementAccess.js      |  2 +-
 tests/baselines/reference/superErrors.js             |  2 +-
 .../reference/superHasMethodsFromMergedInterface.js  |  2 +-
 tests/baselines/reference/superInCatchBlock1.js      |  2 +-
 .../baselines/reference/superInConstructorParam1.js  |  2 +-
 tests/baselines/reference/superInLambdas.js          |  2 +-
 .../baselines/reference/superInObjectLiterals_ES5.js |  2 +-
 tests/baselines/reference/superNewCall1.js           |  2 +-
 tests/baselines/reference/superNoModifiersCrash.js   |  2 +-
 tests/baselines/reference/superPropertyAccess.js     |  2 +-
 tests/baselines/reference/superPropertyAccess1.js    |  2 +-
 tests/baselines/reference/superPropertyAccess2.js    |  2 +-
 ...ertyAccessInComputedPropertiesOfNestedType_ES5.js |  2 +-
 .../reference/superPropertyAccessInSuperCall01.js    |  2 +-
 .../reference/superPropertyAccessNoError.js          |  2 +-
 tests/baselines/reference/superPropertyAccess_ES5.js |  2 +-
 ...superPropertyElementNoUnusedLexicalThisCapture.js |  2 +-
 .../superPropertyInConstructorBeforeSuperCall.js     |  2 +-
 .../baselines/reference/superSymbolIndexedAccess5.js |  2 +-
 .../baselines/reference/superSymbolIndexedAccess6.js |  2 +-
 .../reference/superWithGenericSpecialization.js      |  2 +-
 tests/baselines/reference/superWithGenerics.js       |  2 +-
 tests/baselines/reference/superWithTypeArgument.js   |  2 +-
 tests/baselines/reference/superWithTypeArgument2.js  |  2 +-
 tests/baselines/reference/superWithTypeArgument3.js  |  2 +-
 ...uper_inside-object-literal-getters-and-setters.js |  2 +-
 tests/baselines/reference/switchStatements.js        |  2 +-
 .../reference/systemModuleWithSuperClass.js          |  2 +-
 tests/baselines/reference/targetTypeBaseCalls.js     |  2 +-
 ...thisConditionalOnMethodReturnOfGenericInstance.js |  2 +-
 tests/baselines/reference/thisInInvalidContexts.js   |  2 +-
 .../reference/thisInInvalidContextsExternalModule.js |  2 +-
 tests/baselines/reference/thisInSuperCall.js         |  2 +-
 tests/baselines/reference/thisInSuperCall1.js        |  2 +-
 tests/baselines/reference/thisInSuperCall2.js        |  2 +-
 tests/baselines/reference/thisInSuperCall3.js        |  2 +-
 .../thisIndexOnExistingReadonlyFieldIsNotNever.js    |  2 +-
 tests/baselines/reference/thisTypeInFunctions.js     |  2 +-
 tests/baselines/reference/thisTypeInFunctions3.js    |  2 +-
 .../baselines/reference/tsxAttributeResolution15.js  |  2 +-
 .../baselines/reference/tsxAttributeResolution16.js  |  2 +-
 .../tsxCorrectlyParseLessThanComparison1.js          |  2 +-
 .../reference/tsxDefaultAttributesResolution1.js     |  2 +-
 .../reference/tsxDefaultAttributesResolution2.js     |  2 +-
 .../reference/tsxDefaultAttributesResolution3.js     |  2 +-
 tests/baselines/reference/tsxDynamicTagName5.js      |  2 +-
 tests/baselines/reference/tsxDynamicTagName7.js      |  2 +-
 tests/baselines/reference/tsxDynamicTagName8.js      |  2 +-
 tests/baselines/reference/tsxDynamicTagName9.js      |  2 +-
 tests/baselines/reference/tsxExternalModuleEmit1.js  |  4 ++--
 .../baselines/reference/tsxFragmentChildrenCheck.js  |  2 +-
 .../baselines/reference/tsxGenericAttributesType3.js |  2 +-
 .../baselines/reference/tsxGenericAttributesType4.js |  2 +-
 .../baselines/reference/tsxGenericAttributesType5.js |  2 +-
 .../baselines/reference/tsxGenericAttributesType6.js |  2 +-
 .../baselines/reference/tsxGenericAttributesType9.js |  2 +-
 .../reference/tsxLibraryManagedAttributes.js         |  2 +-
 .../reference/tsxNotUsingApparentTypeOfSFC.js        |  2 +-
 .../reference/tsxSpreadAttributesResolution1.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution10.js     |  2 +-
 .../reference/tsxSpreadAttributesResolution11.js     |  2 +-
 .../reference/tsxSpreadAttributesResolution12.js     |  2 +-
 .../reference/tsxSpreadAttributesResolution17.js     |  2 +-
 .../reference/tsxSpreadAttributesResolution2.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution3.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution4.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution5.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution6.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution7.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution8.js      |  2 +-
 .../reference/tsxSpreadAttributesResolution9.js      |  2 +-
 .../reference/tsxSpreadDoesNotReportExcessProps.js   |  2 +-
 .../reference/tsxStatelessFunctionComponents2.js     |  2 +-
 tests/baselines/reference/tsxUnionElementType3.js    |  2 +-
 tests/baselines/reference/tsxUnionElementType4.js    |  2 +-
 tests/baselines/reference/tsxUnionTypeComponent1.js  |  2 +-
 .../reference/typeAliasFunctionTypeSharedSymbol.js   |  2 +-
 tests/baselines/reference/typeAssertions.js          |  2 +-
 .../reference/typeGuardConstructorDerivedClass.js    |  2 +-
 tests/baselines/reference/typeGuardFunction.js       |  2 +-
 tests/baselines/reference/typeGuardFunctionErrors.js |  2 +-
 .../baselines/reference/typeGuardFunctionGenerics.js |  2 +-
 .../reference/typeGuardFunctionOfFormThis.js         |  2 +-
 .../reference/typeGuardFunctionOfFormThisErrors.js   |  2 +-
 .../baselines/reference/typeGuardOfFormInstanceOf.js |  2 +-
 tests/baselines/reference/typeGuardOfFormIsType.js   |  2 +-
 .../baselines/reference/typeGuardOfFormThisMember.js |  2 +-
 .../reference/typeGuardOfFormThisMemberErrors.js     |  2 +-
 tests/baselines/reference/typeMatch2.js              |  2 +-
 tests/baselines/reference/typeOfSuperCall.js         |  2 +-
 .../baselines/reference/typeParameterAsBaseClass.js  |  2 +-
 tests/baselines/reference/typeParameterAsBaseType.js |  2 +-
 .../reference/typeParameterExtendingUnion1.js        |  2 +-
 .../reference/typeParameterExtendingUnion2.js        |  2 +-
 tests/baselines/reference/typeRelationships.js       |  2 +-
 tests/baselines/reference/typeValueConflict1.js      |  2 +-
 tests/baselines/reference/typeValueConflict2.js      |  2 +-
 tests/baselines/reference/typeVariableTypeGuards.js  |  2 +-
 tests/baselines/reference/typeofClass2.js            |  2 +-
 .../reference/typesWithSpecializedCallSignatures.js  |  2 +-
 .../typesWithSpecializedConstructSignatures.js       |  2 +-
 tests/baselines/reference/undeclaredBase.js          |  2 +-
 .../reference/undefinedIsSubtypeOfEverything.js      |  2 +-
 tests/baselines/reference/underscoreMapFirst.js      |  2 +-
 .../reference/underscoreThisInDerivedClass01.js      |  2 +-
 .../reference/underscoreThisInDerivedClass02.js      |  2 +-
 tests/baselines/reference/unionTypeEquivalence.js    |  2 +-
 .../baselines/reference/unionTypeFromArrayLiteral.js |  2 +-
 tests/baselines/reference/unionTypesAssignability.js |  2 +-
 tests/baselines/reference/unknownSymbols1.js         |  2 +-
 .../baselines/reference/unspecializedConstraints.js  |  2 +-
 .../untypedFunctionCallsWithTypeParameters1.js       |  2 +-
 .../baselines/reference/unusedClassesinNamespace4.js |  2 +-
 .../reference/unusedIdentifiersConsolidated1.js      |  2 +-
 .../reference/unusedInvalidTypeArguments.js          |  4 ++--
 .../reference/useBeforeDeclaration_superClass.js     |  2 +-
 tests/baselines/reference/validUseOfThisInSuper.js   |  2 +-
 .../baselines/reference/varArgsOnConstructorTypes.js |  2 +-
 ...oblingAndZeroOrderIndexSignatureRelationsAlign.js |  2 +-
 ...blingAndZeroOrderIndexSignatureRelationsAlign2.js |  2 +-
 821 files changed, 836 insertions(+), 836 deletions(-)

diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts
index 5be89d6037c..615365700ba 100644
--- a/src/compiler/factory/emitHelpers.ts
+++ b/src/compiler/factory/emitHelpers.ts
@@ -586,7 +586,7 @@ namespace ts {
 
                 return function (d, b) {
                     if (typeof b !== "function" && b !== null)
-                        throw new TypeError("Class extends value " + b + " is not a constructor or null");
+                        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
                     extendStatics(d, b);
                     function __() { this.constructor = d; }
                     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
index 373ab2e49e6..55effcf4cfd 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 55f5ba41342..761537e7d5b 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1961da178f8..b7409b6f9aa 100644
--- a/tests/baselines/reference/abstractClassInLocalScope.js
+++ b/tests/baselines/reference/abstractClassInLocalScope.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 903e616ea8e..eda0c54ae06 100644
--- a/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
+++ b/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 208e71df108..bfa80a63061 100644
--- a/tests/baselines/reference/abstractProperty.js
+++ b/tests/baselines/reference/abstractProperty.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 97f5d226809..9048a5b9c41 100644
--- a/tests/baselines/reference/abstractPropertyInConstructor.js
+++ b/tests/baselines/reference/abstractPropertyInConstructor.js
@@ -81,7 +81,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 82458f567a4..b8c3e46a5ca 100644
--- a/tests/baselines/reference/abstractPropertyNegative.js
+++ b/tests/baselines/reference/abstractPropertyNegative.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7e15396f5f9..b235ca25929 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.js
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b0c3dd08333..a879d2fe6eb 100644
--- a/tests/baselines/reference/accessorsOverrideProperty7.js
+++ b/tests/baselines/reference/accessorsOverrideProperty7.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f97c88f8c9a..68e78690218 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_inference.js
+++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 971437084ec..8c4dca47611 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -48,7 +48,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6b07e7d6f08..bbb7e86ab56 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bea7ebd12f3..efaf376f2f4 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d13da668fcb..20652656ff9 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5eacb0ed2e0..eb646ed9de3 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b8527b88cc0..7e320d34d32 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2b9096ff8df..6c112e123f3 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 103df5a8e12..55e75348a54 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " 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,7 +73,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9bcca900ee5..ec66d870783 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 77b338b80d3..640be084fba 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.js
+++ b/tests/baselines/reference/ambiguousOverloadResolution.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 009fbb6d2a9..294bbd4ab01 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fa22603f4f4..44642171aa7 100644
--- a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
+++ b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -87,7 +87,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3a7da9c6c12..43e41eb005a 100644
--- a/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
+++ b/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 101eaa38c10..7aa0f6e3746 100644
--- a/tests/baselines/reference/apparentTypeSubtyping.js
+++ b/tests/baselines/reference/apparentTypeSubtyping.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4af2f2830ab..213b16448fe 100644
--- a/tests/baselines/reference/apparentTypeSupertype.js
+++ b/tests/baselines/reference/apparentTypeSupertype.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 016bc9b4f59..5ceebf7c0a1 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.js
+++ b/tests/baselines/reference/arrayAssignmentTest1.js
@@ -95,7 +95,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 29b480e8a0c..536a61692ec 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.js
+++ b/tests/baselines/reference/arrayAssignmentTest2.js
@@ -69,7 +69,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c6aebba4033..7acf6feb591 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.js
+++ b/tests/baselines/reference/arrayBestCommonTypes.js
@@ -117,7 +117,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 542d33ec6c7..54b98a664ad 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.js
+++ b/tests/baselines/reference/arrayLiteralTypeInference.js
@@ -61,7 +61,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2376e23c91d..3dd1cae6fb9 100644
--- a/tests/baselines/reference/arrayLiterals.js
+++ b/tests/baselines/reference/arrayLiterals.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e8fdea90523..eababb4f69b 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d51e6e3c5e9..6659f282039 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e2d5e59f8a1..c5dc6e40536 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -105,7 +105,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d1d6136b050..94342d03fa0 100644
--- a/tests/baselines/reference/assertionTypePredicates1.js
+++ b/tests/baselines/reference/assertionTypePredicates1.js
@@ -207,7 +207,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ce316b25df1..0d6d3148641 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
@@ -110,7 +110,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3bba71a9bf0..5b61596e2a5 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
@@ -109,7 +109,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b70d356505c..abef6b1be0c 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
@@ -76,7 +76,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8acb660e04d..4ba96ed8cbd 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ce145fbfca0..1814f6defc3 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
@@ -110,7 +110,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 de967dc9a66..82f9ebff3d2 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
@@ -109,7 +109,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 43b34ec637c..79cfd8d5ef5 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
@@ -76,7 +76,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7032ad6dd36..dcfb70a5ba5 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6b1a66288b5..0cb37a80555 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e3a4991d7fb..74f35977d68 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
@@ -51,7 +51,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 82e08cc256f..0144f8f75c6 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
@@ -102,7 +102,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a4c33837516..8b7df99a6da 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
@@ -99,7 +99,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4887b9ec8ac..37208dc26cb 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -102,7 +102,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 903f2440ab7..fbff31831dc 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
@@ -64,7 +64,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatability45.js b/tests/baselines/reference/assignmentCompatability45.js
index cdcc198a71a..f5ac5b1f4ce 100644
--- a/tests/baselines/reference/assignmentCompatability45.js
+++ b/tests/baselines/reference/assignmentCompatability45.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 85781f7b635..bd6a4277393 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.js
+++ b/tests/baselines/reference/assignmentLHSIsValue.js
@@ -80,7 +80,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 dcd36c98e06..79a1ea3f13f 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4c0647a6d94..4c71eadc31d 100644
--- a/tests/baselines/reference/autolift4.js
+++ b/tests/baselines/reference/autolift4.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8dd450cfc8e..9071dd0f110 100644
--- a/tests/baselines/reference/baseCheck.js
+++ b/tests/baselines/reference/baseCheck.js
@@ -39,7 +39,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ce5cf846579..150fe523894 100644
--- a/tests/baselines/reference/baseClassImprovedMismatchErrors.js
+++ b/tests/baselines/reference/baseClassImprovedMismatchErrors.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e9ae92c6982..ccef3f8eb11 100644
--- a/tests/baselines/reference/baseConstraintOfDecorator.js
+++ b/tests/baselines/reference/baseConstraintOfDecorator.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 18d41fa10a9..05a0a66ee01 100644
--- a/tests/baselines/reference/baseExpressionTypeParameters.js
+++ b/tests/baselines/reference/baseExpressionTypeParameters.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7e0cea2a8d8..c84d8fbdd9d 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.js
+++ b/tests/baselines/reference/baseIndexSignatureResolution.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9387bad96a6..bff2425c0e6 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.js
+++ b/tests/baselines/reference/baseTypeOrderChecking.js
@@ -46,7 +46,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d3226af8097..7ad2c839fb0 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9faf8cc1434..892e9ea51cc 100644
--- a/tests/baselines/reference/bases.js
+++ b/tests/baselines/reference/bases.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f10bb558e98..a02fe1b325c 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b02731523a9..920b58ebf5d 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7a784b49010..9dbd3996640 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.js
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3db30c004ee..e609c2a5258 100644
--- a/tests/baselines/reference/callChainWithSuper(target=es5).js
+++ b/tests/baselines/reference/callChainWithSuper(target=es5).js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 858b9804a89..9b34bf876d9 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
@@ -80,7 +80,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 414734abadc..5f2236525ca 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
@@ -125,7 +125,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4c38cd4fe15..7623aecc041 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
@@ -60,7 +60,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d2ba268802f..91bea277090 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
@@ -60,7 +60,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a4a90e13dfd..3cff80c2eaf 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
@@ -63,7 +63,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 df77122d8f1..76499473fe9 100644
--- a/tests/baselines/reference/callWithSpread.js
+++ b/tests/baselines/reference/callWithSpread.js
@@ -68,7 +68,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 73275d16b1d..d6769feee3b 100644
--- a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 dd3d8a7b385..0a9219eeb0d 100644
--- a/tests/baselines/reference/captureThisInSuperCall.js
+++ b/tests/baselines/reference/captureThisInSuperCall.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f6dad45744f..85ed6ff3757 100644
--- a/tests/baselines/reference/castingTuple.js
+++ b/tests/baselines/reference/castingTuple.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 60c39b02b67..5b642013c61 100644
--- a/tests/baselines/reference/chainedAssignment3.js
+++ b/tests/baselines/reference/chainedAssignment3.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9382089cdf0..cf4c1258205 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a459aa05f19..3410b421a78 100644
--- a/tests/baselines/reference/checkForObjectTooStrict.js
+++ b/tests/baselines/reference/checkForObjectTooStrict.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 932160a63b8..daa40116061 100644
--- a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
+++ b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 81b3e4eef61..1de09112a05 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 aa849b99bfc..713821e6488 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 72c2d6263fe..bd28c6bedde 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2d50fb4c4ab..d283c08720c 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b83f4386131..f6607354f32 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.js
@@ -55,7 +55,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f2847960620..22e1b4a6b4f 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0c89b6470ec..e1f0b791486 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 967462e3444..bbcec201a14 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.js
@@ -39,7 +39,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b974a118eae..95a4a682084 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.js
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 65a86958b2f..5d53a8bb9d7 100644
--- a/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
+++ b/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3f4fa645e08..2b3e3d3f0ab 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6dbefb4b44e..8e48c763b6c 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 91053546083..b478f2dc191 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 15b5540eadb..754e211003f 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5afae9117c6..e02ba44d4aa 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e02554bbebf..3b08094cc99 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fb5098faaba..6e72af77e93 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0e34f844006..a4cab440d0c 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3ebc10ee75c..06bc7633a0a 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c1741e1f761..3c5fe378e46 100644
--- a/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
+++ b/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bc3fdccb60a..ba1b00b8297 100644
--- a/tests/baselines/reference/circularImportAlias.js
+++ b/tests/baselines/reference/circularImportAlias.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 700bbbff5f6..f7126a3a09a 100644
--- a/tests/baselines/reference/circularTypeofWithFunctionModule.js
+++ b/tests/baselines/reference/circularTypeofWithFunctionModule.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 147f831643f..fb5b44c10b0 100644
--- a/tests/baselines/reference/classAbstractConstructorAssignability.js
+++ b/tests/baselines/reference/classAbstractConstructorAssignability.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 12eb6db011a..784fd48907a 100644
--- a/tests/baselines/reference/classAbstractCrashedOnce.js
+++ b/tests/baselines/reference/classAbstractCrashedOnce.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 79355b315d6..504cac06107 100644
--- a/tests/baselines/reference/classAbstractExtends.js
+++ b/tests/baselines/reference/classAbstractExtends.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 876bfabc8f1..d1625cdbbe9 100644
--- a/tests/baselines/reference/classAbstractFactoryFunction.js
+++ b/tests/baselines/reference/classAbstractFactoryFunction.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a9ed141b30a..f194bf984ca 100644
--- a/tests/baselines/reference/classAbstractGeneric.js
+++ b/tests/baselines/reference/classAbstractGeneric.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b0788776a39..61f3ce5957c 100644
--- a/tests/baselines/reference/classAbstractInAModule.js
+++ b/tests/baselines/reference/classAbstractInAModule.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 01d60b000b6..cf5bd8a54fc 100644
--- a/tests/baselines/reference/classAbstractInheritance.js
+++ b/tests/baselines/reference/classAbstractInheritance.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0d68fae919d..26420822a7c 100644
--- a/tests/baselines/reference/classAbstractInstantiations1.js
+++ b/tests/baselines/reference/classAbstractInstantiations1.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 663eb0550b8..a58c091c9cf 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.js
+++ b/tests/baselines/reference/classAbstractInstantiations2.js
@@ -61,7 +61,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ac5d7e07797..9f6c2d1af17 100644
--- a/tests/baselines/reference/classAbstractOverrideWithAbstract.js
+++ b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8e83fbab21f..7b9c8ac974a 100644
--- a/tests/baselines/reference/classAbstractSuperCalls.js
+++ b/tests/baselines/reference/classAbstractSuperCalls.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b836f9768cf..43f2b74970b 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1ebf5d9c94f..811664feb23 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7e8636936dc..c10d2fb4973 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.js
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -55,7 +55,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6274cdd2944..8bb28a797fa 100644
--- a/tests/baselines/reference/classConstructorAccessibility4.js
+++ b/tests/baselines/reference/classConstructorAccessibility4.js
@@ -39,7 +39,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 040bdd8845d..5a75fc563f0 100644
--- a/tests/baselines/reference/classConstructorAccessibility5.js
+++ b/tests/baselines/reference/classConstructorAccessibility5.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5f4289ca159..5e796799257 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e98f336276e..e8bb42cb203 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bd64b53295b..084cea6e5ee 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 873b41dd11d..ba1ae0592d8 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 36999475116..d262c1b752e 100644
--- a/tests/baselines/reference/classDeclaredBeforeClassFactory.js
+++ b/tests/baselines/reference/classDeclaredBeforeClassFactory.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f4e416627b9..8c9fca0d0da 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 23a51d03eae..4f7785edebe 100644
--- a/tests/baselines/reference/classExpression2.js
+++ b/tests/baselines/reference/classExpression2.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bd3a1901c65..ece66c77207 100644
--- a/tests/baselines/reference/classExpression3.js
+++ b/tests/baselines/reference/classExpression3.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e2e3151bceb..02cb8e55f8d 100644
--- a/tests/baselines/reference/classExpressionExtendingAbstractClass.js
+++ b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e4eea509a94..b74a5ec980b 100644
--- a/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
+++ b/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 af8ca7d1720..7b537891585 100644
--- a/tests/baselines/reference/classExtendingBuiltinType.js
+++ b/tests/baselines/reference/classExtendingBuiltinType.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a941bd9307f..2fdca4cd77e 100644
--- a/tests/baselines/reference/classExtendingClass.js
+++ b/tests/baselines/reference/classExtendingClass.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c95b81c6a5c..a1b1cfcf442 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.js
+++ b/tests/baselines/reference/classExtendingClassLikeType.js
@@ -68,7 +68,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 20fc6d8ceaa..cc02fbf9515 100644
--- a/tests/baselines/reference/classExtendingNonConstructor.js
+++ b/tests/baselines/reference/classExtendingNonConstructor.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cd9253b3aeb..297c3cc4af2 100644
--- a/tests/baselines/reference/classExtendingNull.js
+++ b/tests/baselines/reference/classExtendingNull.js
@@ -14,7 +14,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 81e889608f5..33c735c0433 100644
--- a/tests/baselines/reference/classExtendingPrimitive.js
+++ b/tests/baselines/reference/classExtendingPrimitive.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 89739497759..87c55fcde67 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.js
+++ b/tests/baselines/reference/classExtendingPrimitive2.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6f316086184..2a635217ef5 100644
--- a/tests/baselines/reference/classExtendingQualifiedName.js
+++ b/tests/baselines/reference/classExtendingQualifiedName.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c2051375a8c..0376c1f9eff 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.js
+++ b/tests/baselines/reference/classExtendingQualifiedName2.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e732af1af7e..50eb950b125 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -67,7 +67,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5998184a3fe..b90ed093be4 100644
--- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ca46070851d..6959a4dd45f 100644
--- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f807d20772b..f37b66a33f1 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c5c2825520a..ff02c07199d 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e7801c8afcb..7782734f044 100644
--- a/tests/baselines/reference/classExtendsInterface.js
+++ b/tests/baselines/reference/classExtendsInterface.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 17d02b1c564..ced8a12c2c5 100644
--- a/tests/baselines/reference/classExtendsInterfaceInExpression.js
+++ b/tests/baselines/reference/classExtendsInterfaceInExpression.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4f9ebe56520..694fb1e5eeb 100644
--- a/tests/baselines/reference/classExtendsInterfaceInModule.js
+++ b/tests/baselines/reference/classExtendsInterfaceInModule.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b6e195b4c61..cbf68886653 100644
--- a/tests/baselines/reference/classExtendsInterface_not.js
+++ b/tests/baselines/reference/classExtendsInterface_not.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d9735e43979..8fe6494d87a 100644
--- a/tests/baselines/reference/classExtendsItself.js
+++ b/tests/baselines/reference/classExtendsItself.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0eab948de57..51bd087c961 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ecc72b73209..e63e1c4e669 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 62b80271bf9..d758317216a 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly3.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly3.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -51,7 +51,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -74,7 +74,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -97,7 +97,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -120,7 +120,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -143,7 +143,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 206c2e2ed7e..b4b4c9f050e 100644
--- a/tests/baselines/reference/classExtendsMultipleBaseClasses.js
+++ b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0989a8500c2..29143e609de 100644
--- a/tests/baselines/reference/classExtendsNull.js
+++ b/tests/baselines/reference/classExtendsNull.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f1a49a291f0..39d80a02ebf 100644
--- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c9f6c1e52ed..ab94df21904 100644
--- a/tests/baselines/reference/classExtendsValidConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 62448761e0e..cd271ce1558 100644
--- a/tests/baselines/reference/classExtensionNameOutput.js
+++ b/tests/baselines/reference/classExtensionNameOutput.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 67aba9149fb..421cbb597fd 100644
--- a/tests/baselines/reference/classHeritageWithTrailingSeparator.js
+++ b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 450eaaa9d93..654ddbe2ad5 100644
--- a/tests/baselines/reference/classImplementsClass2.js
+++ b/tests/baselines/reference/classImplementsClass2.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a24dad9d3d2..dd07ce8475f 100644
--- a/tests/baselines/reference/classImplementsClass3.js
+++ b/tests/baselines/reference/classImplementsClass3.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8d862f5315b..6e046f61c1f 100644
--- a/tests/baselines/reference/classImplementsClass4.js
+++ b/tests/baselines/reference/classImplementsClass4.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 66c97868f4e..2436fb13d1b 100644
--- a/tests/baselines/reference/classImplementsClass5.js
+++ b/tests/baselines/reference/classImplementsClass5.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d02176d3ea5..074285cbfc3 100644
--- a/tests/baselines/reference/classImplementsClass6.js
+++ b/tests/baselines/reference/classImplementsClass6.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5c77e13c852..89644c06ab1 100644
--- a/tests/baselines/reference/classIndexer3.js
+++ b/tests/baselines/reference/classIndexer3.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d57209f2515..f1e192eacba 100644
--- a/tests/baselines/reference/classInheritence.js
+++ b/tests/baselines/reference/classInheritence.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 803b3de02c7..49c00727dd1 100644
--- a/tests/baselines/reference/classIsSubtypeOfBaseType.js
+++ b/tests/baselines/reference/classIsSubtypeOfBaseType.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4ce65fd5851..2f716f57471 100644
--- a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
+++ b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 67d359ee82b..0958ba05804 100644
--- a/tests/baselines/reference/classOrder2.js
+++ b/tests/baselines/reference/classOrder2.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a8f293557c8..c8ebae095b3 100644
--- a/tests/baselines/reference/classOrderBug.js
+++ b/tests/baselines/reference/classOrderBug.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9d71a72d97a..17148bb7a95 100644
--- a/tests/baselines/reference/classSideInheritance1.js
+++ b/tests/baselines/reference/classSideInheritance1.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fa79163af85..b179eb5f4a5 100644
--- a/tests/baselines/reference/classSideInheritance2.js
+++ b/tests/baselines/reference/classSideInheritance2.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0109919f2f8..8f4ba095e58 100644
--- a/tests/baselines/reference/classSideInheritance3.js
+++ b/tests/baselines/reference/classSideInheritance3.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 26e34fb112e..325f4ef87f1 100644
--- a/tests/baselines/reference/classUpdateTests.js
+++ b/tests/baselines/reference/classUpdateTests.js
@@ -123,7 +123,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 24ee778dc22..a1ed369e006 100644
--- a/tests/baselines/reference/classUsedBeforeInitializedVariables.js
+++ b/tests/baselines/reference/classUsedBeforeInitializedVariables.js
@@ -49,7 +49,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c4e8c8d56d1..6b9f38fcaf6 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e9a9cb6757f..7515d4d7c57 100644
--- a/tests/baselines/reference/classWithConstructors.js
+++ b/tests/baselines/reference/classWithConstructors.js
@@ -59,7 +59,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7af38c5b861..a6e62dc9f01 100644
--- a/tests/baselines/reference/classWithProtectedProperty.js
+++ b/tests/baselines/reference/classWithProtectedProperty.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7630a57a9aa..60d1e25fddb 100644
--- a/tests/baselines/reference/classWithStaticMembers.js
+++ b/tests/baselines/reference/classWithStaticMembers.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 00824cd82d3..6e099c8259d 100644
--- a/tests/baselines/reference/classdecl.js
+++ b/tests/baselines/reference/classdecl.js
@@ -103,7 +103,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7b27bf4d580..d52bd60040e 100644
--- a/tests/baselines/reference/cloduleGenericOnSelfMember.js
+++ b/tests/baselines/reference/cloduleGenericOnSelfMember.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 96290f04b30..71ff4ebf97b 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.js
+++ b/tests/baselines/reference/clodulesDerivedClasses.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7dcd93e361d..1a294ce82e9 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
@@ -49,7 +49,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4e2778339aa..7ff2f108136 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 18211e644bb..767b5675463 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 08ab9c92ad2..af10dd2888d 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 eeff6498bd3..9d887a3c6b0 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6074516308c..ab75b992a35 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c41005749ce..3a7c9a02343 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cdc0374f379..b705994fde5 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 939ef284814..3ea28a1f5e6 100644
--- a/tests/baselines/reference/collisionSuperAndNameResolution.js
+++ b/tests/baselines/reference/collisionSuperAndNameResolution.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fde0a9eb753..bf76b22bf76 100644
--- a/tests/baselines/reference/collisionSuperAndParameter.js
+++ b/tests/baselines/reference/collisionSuperAndParameter.js
@@ -72,7 +72,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d3976dbb317..e3bba7373ec 100644
--- a/tests/baselines/reference/collisionSuperAndParameter1.js
+++ b/tests/baselines/reference/collisionSuperAndParameter1.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9cdf1cb5f58..64e1984d765 100644
--- a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
+++ b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7b4d60044b0..9bfbebe744d 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a0461a6b511..680bde58458 100644
--- a/tests/baselines/reference/commentsInheritance.js
+++ b/tests/baselines/reference/commentsInheritance.js
@@ -160,7 +160,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 87bce84aa36..221033e66ef 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
@@ -204,7 +204,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 666161f8e69..ae4d33a1a17 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
@@ -178,7 +178,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ea62863352c..093c8c1d71e 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
@@ -178,7 +178,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3c9d3ea735b..eb7379a333c 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
@@ -121,7 +121,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e5ee99d19dc..f6cd096535e 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
@@ -159,7 +159,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 afe75ad6caa..7bcec9ae6f5 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
@@ -159,7 +159,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 19d07e6d99c..4c054b65b72 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
@@ -269,7 +269,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d5370debbf2..cfbc8f495dd 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
@@ -231,7 +231,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 40564e4d744..03e833d110e 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
@@ -117,7 +117,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 37e732e46f1..fbeec6df436 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
@@ -174,7 +174,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fb87193233a..57a1e031e84 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
@@ -174,7 +174,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 34cb66b326d..c8d386214cd 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
@@ -88,7 +88,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2370e821b03..dc4523ad5c8 100644
--- a/tests/baselines/reference/complexClassRelationships.js
+++ b/tests/baselines/reference/complexClassRelationships.js
@@ -57,7 +57,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 73b7252c072..fcedab41cbd 100644
--- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
+++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bec091f051d..5b1eb15b843 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
@@ -132,7 +132,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cdb34c5ee4e..8cc2cbeb536 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
@@ -95,7 +95,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4f34bc01fb6..4c842f821d3 100644
--- a/tests/baselines/reference/computedPropertyNames24_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames24_ES5.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5a7b371f690..de34640c6a3 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 783449c4ce6..ba138f013a8 100644
--- a/tests/baselines/reference/computedPropertyNames26_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames26_ES5.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8b2a3481287..84767b42cdd 100644
--- a/tests/baselines/reference/computedPropertyNames27_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames27_ES5.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0d6ade33e2e..a0dcfb81869 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 46e0ed661e7..018f6b476f4 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5769ea8da59..7d0dec677b0 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c169dbdf01b..5a2de17ee68 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3fc6470f30a..cacef27b8ce 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 63834728b30..93cf0845b7a 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 05a6234c2ae..c1aecba919f 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
@@ -57,7 +57,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5800bd3f948..1d020d9166b 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e9c93ba94ac..cf88c026410 100644
--- a/tests/baselines/reference/constantOverloadFunction.js
+++ b/tests/baselines/reference/constantOverloadFunction.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7dd6c3dd94f..6bb5d0af5de 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6850b2f6d50..e6878720de2 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5ebd6d155a4..ada39f3f9e2 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
@@ -80,7 +80,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 db8524c47ad..c1a9ebdea28 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
@@ -123,7 +123,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 40ae0487aed..342ea52bcab 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
@@ -70,7 +70,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 72ca7fc7fce..8642e368c15 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
@@ -60,7 +60,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0924ea3dad0..8b9bf7d8b8d 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
@@ -63,7 +63,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 280ebfbc2aa..a8576fe5439 100644
--- a/tests/baselines/reference/constructorArgs.js
+++ b/tests/baselines/reference/constructorArgs.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 619196f47ce..c2e34c68237 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 24c50179116..73bc4c75358 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2106105c959..e17c9345128 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.js
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 69429e55c15..5332b0142ca 100644
--- a/tests/baselines/reference/constructorOverloads2.js
+++ b/tests/baselines/reference/constructorOverloads2.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8f43da3e0c2..89f0a6f73b5 100644
--- a/tests/baselines/reference/constructorOverloads3.js
+++ b/tests/baselines/reference/constructorOverloads3.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 532a7ebb253..044501e1975 100644
--- a/tests/baselines/reference/constructorWithCapturedSuper.js
+++ b/tests/baselines/reference/constructorWithCapturedSuper.js
@@ -62,7 +62,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bc37676199e..fe12b04b767 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -289,7 +289,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d4c18ba0632..2376fff2a06 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 529a0703440..7eac420d411 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4a92b8e6eab..6b6f6179e7b 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0bca2532a38..eb039c1f544 100644
--- a/tests/baselines/reference/controlFlowSuperPropertyAccess.js
+++ b/tests/baselines/reference/controlFlowSuperPropertyAccess.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3ba5954d9b0..be20d993a31 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fdcfe42ed8d..da20c4fefb8 100644
--- a/tests/baselines/reference/declFileClassExtendsNull.js
+++ b/tests/baselines/reference/declFileClassExtendsNull.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 38965ab374e..b5d23b79e1c 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6420c3ab174..8ce0064c558 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 02318a3cb23..438d10acf9a 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4e15750e1b5..d1b5e33467b 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -51,7 +51,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2a4f6d65b75..724b0f441ec 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 717bd80d86c..8691e8ee389 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6039ef89742..f123b412040 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2efebaa73fe..ba7a4d8a89b 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends2.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b661e78966b..70a154d8bd8 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f311efeae4f..192edd90b07 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends4.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends4.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cdd34152a7a..cd154354979 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends5.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends6.js b/tests/baselines/reference/declarationEmitExpressionInExtends6.js
index 02237fc2de2..3e6f13b3887 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends6.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends6.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends7.js b/tests/baselines/reference/declarationEmitExpressionInExtends7.js
index 00e2f1d60d0..3a6851d22ec 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends7.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends7.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cab100e9a90..a3f266144d9 100644
--- a/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
+++ b/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bbc7810d6c3..73399ba507a 100644
--- a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
+++ b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a927622a6e0..5156eed0ebb 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts3.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts3.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 72fe4a5926c..dba646cbec7 100644
--- a/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
+++ b/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 542c6ad2b52..34ef82c76da 100644
--- a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
+++ b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
@@ -49,7 +49,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d3654814d24..c02ef5cde77 100644
--- a/tests/baselines/reference/declarationEmitProtectedMembers.js
+++ b/tests/baselines/reference/declarationEmitProtectedMembers.js
@@ -59,7 +59,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 43f15dd913e..25e8633e754 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0270f274050..e3bab86e686 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c319c172242..4b97a3abe0b 100644
--- a/tests/baselines/reference/declarationNoDanglingGenerics.js
+++ b/tests/baselines/reference/declarationNoDanglingGenerics.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 62a40f448a5..71e15057754 100644
--- a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
+++ b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8b0e8371014..9131d6b43a9 100644
--- a/tests/baselines/reference/declareDottedExtend.js
+++ b/tests/baselines/reference/declareDottedExtend.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 61fcde366ad..4ea1fb1a45c 100644
--- a/tests/baselines/reference/decoratorOnClass9.js
+++ b/tests/baselines/reference/decoratorOnClass9.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8d879ac6d10..23dbbf69036 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9235dda6b70..ff584adb5f0 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f161bb3b502..97a50118e40 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor4.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 69dc39fe999..25a9ebbe791 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3f3574de55e..fd11b56931e 100644
--- a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
+++ b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -64,7 +64,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8c1aec4632d..e41532241ef 100644
--- a/tests/baselines/reference/defineProperty(target=es5).js
+++ b/tests/baselines/reference/defineProperty(target=es5).js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c00df9ef94b..41948be42df 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b2a49cc3a3d..28e6e1052de 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map
@@ -1,3 +1,3 @@
 //// [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"}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBiICsgIiBpcyBub3QgYSBjb25zdHJ1Y3RvciBvciBudWxsIik7DQogICAgICAgIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgICAgIGZ1bmN0aW9uIF9fKCkgeyB0aGlzLmNvbnN0cnVjdG9yID0gZDsgfQ0KICAgICAgICBkLnByb3RvdHlwZSA9IGIgPT09IG51bGwgPyBPYmplY3QuY3JlYXRlKGIpIDogKF9fLnByb3RvdHlwZSA9IGIucHJvdG90eXBlLCBuZXcgX18oKSk7DQogICAgfTsNCn0pKCk7DQp2YXIgQyA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICBmdW5jdGlvbiBDKHZhbHVlKSB7DQogICAgICAgIHRoaXMuY1Byb3AgPSAxMDsNCiAgICAgICAgcmV0dXJuIHsNCiAgICAgICAgICAgIGNQcm9wOiB2YWx1ZSwNCiAgICAgICAgICAgIGZvbzogZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIHJldHVybiAid2VsbCB0aGlzIGxvb2tzIGtpbmRhIEMtaXNoLiI7DQogICAgICAgICAgICB9DQogICAgICAgIH07DQogICAgfQ0KICAgIEMucHJvdG90eXBlLmZvbyA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuICJ0aGlzIG5ldmVyIGdldHMgdXNlZC4iOyB9Ow0KICAgIHJldHVybiBDOw0KfSgpKTsNCnZhciBEID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKF9zdXBlcikgew0KICAgIF9fZXh0ZW5kcyhELCBfc3VwZXIpOw0KICAgIGZ1bmN0aW9uIEQoYSkgew0KICAgICAgICBpZiAoYSA9PT0gdm9pZCAwKSB7IGEgPSAxMDA7IH0NCiAgICAgICAgdmFyIF90aGlzID0gX3N1cGVyLmNhbGwodGhpcywgYSkgfHwgdGhpczsNCiAgICAgICAgX3RoaXMuZFByb3AgPSBmdW5jdGlvbiAoKSB7IHJldHVybiBfdGhpczsgfTsNCiAgICAgICAgaWYgKE1hdGgucmFuZG9tKCkgPCAwLjUpIHsNCiAgICAgICAgICAgICJZb3Ugd2luISI7DQogICAgICAgICAgICByZXR1cm4gew0KICAgICAgICAgICAgICAgIGNQcm9wOiAxLA0KICAgICAgICAgICAgICAgIGRQcm9wOiBmdW5jdGlvbiAoKSB7IHJldHVybiBfdGhpczsgfSwNCiAgICAgICAgICAgICAgICBmb286IGZ1bmN0aW9uICgpIHsgcmV0dXJuICJZb3Ugd2luISEhISEiOyB9DQogICAgICAgICAgICB9Ow0KICAgICAgICB9DQogICAgICAgIGVsc2UNCiAgICAgICAgICAgIHJldHVybiBudWxsOw0KICAgIH0NCiAgICByZXR1cm4gRDsNCn0oQykpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9ZGVyaXZlZENsYXNzQ29uc3RydWN0b3JXaXRoRXhwbGljaXRSZXR1cm5zMDEuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZlZENsYXNzQ29uc3RydWN0b3JXaXRoRXhwbGljaXRSZXR1cm5zMDEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJkZXJpdmVkQ2xhc3NDb25zdHJ1Y3RvcldpdGhFeHBsaWNpdFJldHVybnMwMS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQTtJQUtJLFdBQVksS0FBYTtRQUp6QixVQUFLLEdBQUcsRUFBRSxDQUFDO1FBS1AsT0FBTztZQUNILEtBQUssRUFBRSxLQUFLO1lBQ1osR0FBRztnQkFDQyxPQUFPLDhCQUE4QixDQUFDO1lBQzFDLENBQUM7U0FDSixDQUFBO0lBQ0wsQ0FBQztJQVRELGVBQUcsR0FBSCxjQUFRLE9BQU8sdUJBQXVCLENBQUMsQ0FBQyxDQUFDO0lBVTdDLFFBQUM7QUFBRCxDQUFDLEFBYkQsSUFhQztBQUVEO0lBQWdCLHFCQUFDO0lBR2IsV0FBWSxDQUFPO1FBQVAsa0JBQUEsRUFBQSxPQUFPO1FBQW5CLFlBQ0ksa0JBQU0sQ0FBQyxDQUFDLFNBWVg7UUFmRCxXQUFLLEdBQUcsY0FBTSxPQUFBLEtBQUksRUFBSixDQUFJLENBQUM7UUFLZixJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxHQUFHLEVBQUU7WUFDckIsVUFBVSxDQUFBO1lBQ1YsT0FBTztnQkFDSCxLQUFLLEVBQUUsQ0FBQztnQkFDUixLQUFLLEVBQUUsY0FBTSxPQUFBLEtBQUksRUFBSixDQUFJO2dCQUNqQixHQUFHLGdCQUFLLE9BQU8sY0FBYyxDQUFBLENBQUMsQ0FBQzthQUNsQyxDQUFDO1NBQ0w7O1lBRUcsT0FBTyxJQUFJLENBQUM7SUFDcEIsQ0FBQztJQUNMLFFBQUM7QUFBRCxDQUFDLEFBakJELENBQWdCLENBQUMsR0FpQmhCIn0=,Y2xhc3MgQyB7CiAgICBjUHJvcCA9IDEwOwoKICAgIGZvbygpIHsgcmV0dXJuICJ0aGlzIG5ldmVyIGdldHMgdXNlZC4iOyB9CgogICAgY29uc3RydWN0b3IodmFsdWU6IG51bWJlcikgewogICAgICAgIHJldHVybiB7CiAgICAgICAgICAgIGNQcm9wOiB2YWx1ZSwKICAgICAgICAgICAgZm9vKCkgewogICAgICAgICAgICAgICAgcmV0dXJuICJ3ZWxsIHRoaXMgbG9va3Mga2luZGEgQy1pc2guIjsKICAgICAgICAgICAgfQogICAgICAgIH0KICAgIH0KfQoKY2xhc3MgRCBleHRlbmRzIEMgewogICAgZFByb3AgPSAoKSA9PiB0aGlzOwoKICAgIGNvbnN0cnVjdG9yKGEgPSAxMDApIHsKICAgICAgICBzdXBlcihhKTsKCiAgICAgICAgaWYgKE1hdGgucmFuZG9tKCkgPCAwLjUpIHsKICAgICAgICAgICAgIllvdSB3aW4hIgogICAgICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgICAgY1Byb3A6IDEsCiAgICAgICAgICAgICAgICBkUHJvcDogKCkgPT4gdGhpcywKICAgICAgICAgICAgICAgIGZvbygpIHsgcmV0dXJuICJZb3Ugd2luISEhISEiIH0KICAgICAgICAgICAgfTsKICAgICAgICB9CiAgICAgICAgZWxzZQogICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgIH0KfQ==
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBTdHJpbmcoYikgKyAiIGlzIG5vdCBhIGNvbnN0cnVjdG9yIG9yIG51bGwiKTsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICAgICAgZnVuY3Rpb24gX18oKSB7IHRoaXMuY29uc3RydWN0b3IgPSBkOyB9DQogICAgICAgIGQucHJvdG90eXBlID0gYiA9PT0gbnVsbCA/IE9iamVjdC5jcmVhdGUoYikgOiAoX18ucHJvdG90eXBlID0gYi5wcm90b3R5cGUsIG5ldyBfXygpKTsNCiAgICB9Ow0KfSkoKTsNCnZhciBDID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEModmFsdWUpIHsNCiAgICAgICAgdGhpcy5jUHJvcCA9IDEwOw0KICAgICAgICByZXR1cm4gew0KICAgICAgICAgICAgY1Byb3A6IHZhbHVlLA0KICAgICAgICAgICAgZm9vOiBmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgcmV0dXJuICJ3ZWxsIHRoaXMgbG9va3Mga2luZGEgQy1pc2guIjsNCiAgICAgICAgICAgIH0NCiAgICAgICAgfTsNCiAgICB9DQogICAgQy5wcm90b3R5cGUuZm9vID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gInRoaXMgbmV2ZXIgZ2V0cyB1c2VkLiI7IH07DQogICAgcmV0dXJuIEM7DQp9KCkpOw0KdmFyIEQgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoX3N1cGVyKSB7DQogICAgX19leHRlbmRzKEQsIF9zdXBlcik7DQogICAgZnVuY3Rpb24gRChhKSB7DQogICAgICAgIGlmIChhID09PSB2b2lkIDApIHsgYSA9IDEwMDsgfQ0KICAgICAgICB2YXIgX3RoaXMgPSBfc3VwZXIuY2FsbCh0aGlzLCBhKSB8fCB0aGlzOw0KICAgICAgICBfdGhpcy5kUHJvcCA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuIF90aGlzOyB9Ow0KICAgICAgICBpZiAoTWF0aC5yYW5kb20oKSA8IDAuNSkgew0KICAgICAgICAgICAgIllvdSB3aW4hIjsNCiAgICAgICAgICAgIHJldHVybiB7DQogICAgICAgICAgICAgICAgY1Byb3A6IDEsDQogICAgICAgICAgICAgICAgZFByb3A6IGZ1bmN0aW9uICgpIHsgcmV0dXJuIF90aGlzOyB9LA0KICAgICAgICAgICAgICAgIGZvbzogZnVuY3Rpb24gKCkgeyByZXR1cm4gIllvdSB3aW4hISEhISI7IH0NCiAgICAgICAgICAgIH07DQogICAgICAgIH0NCiAgICAgICAgZWxzZQ0KICAgICAgICAgICAgcmV0dXJuIG51bGw7DQogICAgfQ0KICAgIHJldHVybiBEOw0KfShDKSk7DQovLyMgc291cmNlTWFwcGluZ1VSTD1kZXJpdmVkQ2xhc3NDb25zdHJ1Y3RvcldpdGhFeHBsaWNpdFJldHVybnMwMS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVyaXZlZENsYXNzQ29uc3RydWN0b3JXaXRoRXhwbGljaXRSZXR1cm5zMDEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJkZXJpdmVkQ2xhc3NDb25zdHJ1Y3RvcldpdGhFeHBsaWNpdFJldHVybnMwMS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQTtJQUtJLFdBQVksS0FBYTtRQUp6QixVQUFLLEdBQUcsRUFBRSxDQUFDO1FBS1AsT0FBTztZQUNILEtBQUssRUFBRSxLQUFLO1lBQ1osR0FBRztnQkFDQyxPQUFPLDhCQUE4QixDQUFDO1lBQzFDLENBQUM7U0FDSixDQUFBO0lBQ0wsQ0FBQztJQVRELGVBQUcsR0FBSCxjQUFRLE9BQU8sdUJBQXVCLENBQUMsQ0FBQyxDQUFDO0lBVTdDLFFBQUM7QUFBRCxDQUFDLEFBYkQsSUFhQztBQUVEO0lBQWdCLHFCQUFDO0lBR2IsV0FBWSxDQUFPO1FBQVAsa0JBQUEsRUFBQSxPQUFPO1FBQW5CLFlBQ0ksa0JBQU0sQ0FBQyxDQUFDLFNBWVg7UUFmRCxXQUFLLEdBQUcsY0FBTSxPQUFBLEtBQUksRUFBSixDQUFJLENBQUM7UUFLZixJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxHQUFHLEVBQUU7WUFDckIsVUFBVSxDQUFBO1lBQ1YsT0FBTztnQkFDSCxLQUFLLEVBQUUsQ0FBQztnQkFDUixLQUFLLEVBQUUsY0FBTSxPQUFBLEtBQUksRUFBSixDQUFJO2dCQUNqQixHQUFHLGdCQUFLLE9BQU8sY0FBYyxDQUFBLENBQUMsQ0FBQzthQUNsQyxDQUFDO1NBQ0w7O1lBRUcsT0FBTyxJQUFJLENBQUM7SUFDcEIsQ0FBQztJQUNMLFFBQUM7QUFBRCxDQUFDLEFBakJELENBQWdCLENBQUMsR0FpQmhCIn0=,Y2xhc3MgQyB7CiAgICBjUHJvcCA9IDEwOwoKICAgIGZvbygpIHsgcmV0dXJuICJ0aGlzIG5ldmVyIGdldHMgdXNlZC4iOyB9CgogICAgY29uc3RydWN0b3IodmFsdWU6IG51bWJlcikgewogICAgICAgIHJldHVybiB7CiAgICAgICAgICAgIGNQcm9wOiB2YWx1ZSwKICAgICAgICAgICAgZm9vKCkgewogICAgICAgICAgICAgICAgcmV0dXJuICJ3ZWxsIHRoaXMgbG9va3Mga2luZGEgQy1pc2guIjsKICAgICAgICAgICAgfQogICAgICAgIH0KICAgIH0KfQoKY2xhc3MgRCBleHRlbmRzIEMgewogICAgZFByb3AgPSAoKSA9PiB0aGlzOwoKICAgIGNvbnN0cnVjdG9yKGEgPSAxMDApIHsKICAgICAgICBzdXBlcihhKTsKCiAgICAgICAgaWYgKE1hdGgucmFuZG9tKCkgPCAwLjUpIHsKICAgICAgICAgICAgIllvdSB3aW4hIgogICAgICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgICAgY1Byb3A6IDEsCiAgICAgICAgICAgICAgICBkUHJvcDogKCkgPT4gdGhpcywKICAgICAgICAgICAgICAgIGZvbygpIHsgcmV0dXJuICJZb3Ugd2luISEhISEiIH0KICAgICAgICAgICAgfTsKICAgICAgICB9CiAgICAgICAgZWxzZQogICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgIH0KfQ==
diff --git a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
index 4b507ae17fe..650fa65c6e0 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 >>>    };
 >>>    return function (d, b) {
 >>>        if (typeof b !== "function" && b !== null)
->>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
index a290dc10d79..d54eba79fe5 100644
--- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
+++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cd863f3a6e5..18ef2852994 100644
--- a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
+++ b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0e964150970..f23ea34e9d3 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c628e5b93ec..97044c2cf46 100644
--- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
+++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b4876793ce1..d1029836207 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5bbf2b0e323..39b0b7a7ce6 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivates.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivates.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e0fd951ea97..812f272f7ad 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 42295dcbf85..dc18ddcc9de 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
@@ -73,7 +73,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8c0c88031ee..7c873b68305 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
@@ -80,7 +80,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 afa25949a02..b416b4d4b32 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7736e3224d4..5c1f5fd42e6 100644
--- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
@@ -72,7 +72,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 30ab22c2617..63c26a17b74 100644
--- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
+++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 818ce5270a8..9003b828f09 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.js
+++ b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -105,7 +105,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 aa46bb100c6..0c1332fa55f 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4e957a3ac7c..239ef1dfc73 100644
--- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
+++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7a663f096cf..15ada828932 100644
--- a/tests/baselines/reference/derivedClassTransitivity.js
+++ b/tests/baselines/reference/derivedClassTransitivity.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 27f393f855e..1b11ba116ab 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.js
+++ b/tests/baselines/reference/derivedClassTransitivity2.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cdb425a7aee..87a60ea9eb5 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.js
+++ b/tests/baselines/reference/derivedClassTransitivity3.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9c33263e9dd..0e2927f9d7b 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.js
+++ b/tests/baselines/reference/derivedClassTransitivity4.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7f09f59a0ce..5027c4ab569 100644
--- a/tests/baselines/reference/derivedClassWithAny.js
+++ b/tests/baselines/reference/derivedClassWithAny.js
@@ -69,7 +69,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5b1ed853130..624c80da0f7 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7920dcea404..14592605fd1 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5a5520fc094..ce01d0cf2d7 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ce7e5e65ed4..8abe846f5a0 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d67d477f3ee..d2fe4f0fe1b 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6a4626de5fe..81e1ea2890a 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 31604716c82..08c795c0a95 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
@@ -57,7 +57,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 74fdca34298..354cf52de56 100644
--- a/tests/baselines/reference/derivedClasses.js
+++ b/tests/baselines/reference/derivedClasses.js
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6d077f58efb..36dcebc3bfc 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.js
+++ b/tests/baselines/reference/derivedGenericClassWithAny.js
@@ -52,7 +52,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f9a96863243..31c5bd44ca4 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 754a86c67b8..e288af23b5f 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 02f3a4c942e..12697fbe2c9 100644
--- a/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
+++ b/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
@@ -93,7 +93,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 48586daa607..9a647ae2bac 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.js
@@ -61,7 +61,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 eb190cf55c8..274a54e327a 100644
--- a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
+++ b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2563326f4dd..4a5b62d3098 100644
--- a/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a7327ab00a8..851fcd51d96 100644
--- a/tests/baselines/reference/emitBundleWithShebang1.js
+++ b/tests/baselines/reference/emitBundleWithShebang1.js
@@ -14,7 +14,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 87042854e1c..98310ca1bb4 100644
--- a/tests/baselines/reference/emitBundleWithShebang2.js
+++ b/tests/baselines/reference/emitBundleWithShebang2.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cf5a44efeb4..0e8b1d7d795 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ab162ffb2dd..4b5ae27b321 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3b9d121bf69..ecb657b01ec 100644
--- a/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
+++ b/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c30581ec62d..7b5cfe4d277 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 be4ca58563b..bcaa79bd05a 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b434881231b..101c5d4b01a 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3a4c7036e1a..1129aabd774 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a2d4531f9b5..b1edc0b516a 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b991b8eae5f..b3c7d5446af 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b58deb10f50..0cafc5a2d88 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -580,7 +580,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4e9f97001b5..951a2881e87 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -14,7 +14,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e55ceacd306..e72adaad379 100644
--- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
+++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 961dbc04438..f479d4f5bbe 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -84,7 +84,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 08915ba7152..25385a65217 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.js
+++ b/tests/baselines/reference/errorSuperPropertyAccess.js
@@ -138,7 +138,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 438748d3231..d753b7da372 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.js
+++ b/tests/baselines/reference/errorsInGenericTypeReference.js
@@ -81,7 +81,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b34ccc9b195..db9e2e604f2 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.js
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a3b3f9e7772..38927650047 100644
--- a/tests/baselines/reference/es6ClassTest.js
+++ b/tests/baselines/reference/es6ClassTest.js
@@ -94,7 +94,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 944aa9827fb..7ec8cd45f52 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -168,7 +168,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 be24a00320d..fea7ae3c0aa 100644
--- a/tests/baselines/reference/es6ClassTest7.js
+++ b/tests/baselines/reference/es6ClassTest7.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8e86f4b9c50..2a28756ad4a 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 73cc43e4841..5345a2f437a 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.js
+++ b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -56,7 +56,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -85,7 +85,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c826682de39..e2c49f6c666 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3a92e550ba0..44fd687bedb 100644
--- a/tests/baselines/reference/exportDefaultAbstractClass.js
+++ b/tests/baselines/reference/exportDefaultAbstractClass.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -55,7 +55,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 63ccc42c750..3db752a4d12 100644
--- a/tests/baselines/reference/extBaseClass1.js
+++ b/tests/baselines/reference/extBaseClass1.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3d06c9cc708..8e9aa4e251f 100644
--- a/tests/baselines/reference/extBaseClass2.js
+++ b/tests/baselines/reference/extBaseClass2.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1e194bda206..b749b1a2011 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f2075cf371c..98ebaba4ad9 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a75ea89463a..87042eec8c6 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 af730630fee..7de9e0d85f5 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ade5a98144d..9df839ed6b8 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.js
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f7a95fd0b1c..a2749b62081 100644
--- a/tests/baselines/reference/extendFromAny.js
+++ b/tests/baselines/reference/extendFromAny.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d2d84bac539..7da12a4b9ab 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.js
+++ b/tests/baselines/reference/extendNonClassSymbol1.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 dd4bfeca0d4..2da14f0d7c6 100644
--- a/tests/baselines/reference/extendNonClassSymbol2.js
+++ b/tests/baselines/reference/extendNonClassSymbol2.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8e9887c3384..4e71265bdb0 100644
--- a/tests/baselines/reference/extendPrivateConstructorClass.js
+++ b/tests/baselines/reference/extendPrivateConstructorClass.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2bffd9887d7..2994d1275f9 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -81,7 +81,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cda88f06712..9e86263351f 100644
--- a/tests/baselines/reference/extendsClause.js
+++ b/tests/baselines/reference/extendsClause.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cfd351e5775..6b51363a818 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9416c5120cd..8e0f9f0dd97 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen2.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 37d446de2e8..e589a79f09e 100644
--- a/tests/baselines/reference/extendsUntypedModule.js
+++ b/tests/baselines/reference/extendsUntypedModule.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b6771263a89..5e09b272ea9 100644
--- a/tests/baselines/reference/fluentClasses.js
+++ b/tests/baselines/reference/fluentClasses.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e8ca89fb97c..98617e70b69 100644
--- a/tests/baselines/reference/for-inStatements.js
+++ b/tests/baselines/reference/for-inStatements.js
@@ -90,7 +90,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d1c4069efa6..b04e6cef42e 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.js
+++ b/tests/baselines/reference/for-inStatementsInvalid.js
@@ -73,7 +73,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 14b63f43441..817bfb1c6b6 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
@@ -63,7 +63,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d40020d4b7b..776ee4beaa4 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -83,7 +83,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 45736caa894..dcba10ad55e 100644
--- a/tests/baselines/reference/functionImplementations.js
+++ b/tests/baselines/reference/functionImplementations.js
@@ -166,7 +166,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8e7df172fad..d0bda73e466 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0be3251495c..c5ed94a82b6 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 05f6725c0fc..a2671ffac61 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -364,7 +364,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 37f1ac9a61c..f7a066d386d 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bad7cf3d700..cffe8c32875 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 73b512627cf..0cf02385c8f 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
@@ -118,7 +118,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d7dc97f5445..790c96f3295 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0ce9eb69d71..77884a557a8 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a55a1ca7aa9..f4408d91881 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
@@ -48,7 +48,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f4fe9159629..8838f3fb5e7 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ad2de4f3eee..3681ce5e209 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.js
+++ b/tests/baselines/reference/genericClassExpressionInFunction.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ba70048b476..642d1e8e755 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 086c8c0b782..bd9c99e5b11 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
@@ -85,7 +85,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1f95e0618b5..679b86bb8f8 100644
--- a/tests/baselines/reference/genericClassStaticMethod.js
+++ b/tests/baselines/reference/genericClassStaticMethod.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7236bb6a24d..1568d1b7fa6 100644
--- a/tests/baselines/reference/genericClasses3.js
+++ b/tests/baselines/reference/genericClasses3.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f3157f3cb92..bafecf8f594 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 04dc9ec6cb7..329b9ac6ec8 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f832c603842..4d62e5ac2de 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7180c24c260..a10ca24da4d 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b34a3faa994..b8050d058f4 100644
--- a/tests/baselines/reference/genericInheritedDefaultConstructors.js
+++ b/tests/baselines/reference/genericInheritedDefaultConstructors.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3398618b903..7d8e28e9752 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.js
+++ b/tests/baselines/reference/genericPrototypeProperty2.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6cedd0ae8e0..057381118cc 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.js
+++ b/tests/baselines/reference/genericPrototypeProperty3.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9ddd37de91f..fdda7a9451e 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ffadbf0b9de..ca7390b85de 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cbd1642461d..6ba593b65b3 100644
--- a/tests/baselines/reference/genericTypeAssertions2.js
+++ b/tests/baselines/reference/genericTypeAssertions2.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2d5abf8aead..1166d354ee7 100644
--- a/tests/baselines/reference/genericTypeAssertions4.js
+++ b/tests/baselines/reference/genericTypeAssertions4.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c83c20be33e..41489f2b1c4 100644
--- a/tests/baselines/reference/genericTypeAssertions6.js
+++ b/tests/baselines/reference/genericTypeAssertions6.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 be437dc34e2..3ca500cf757 100644
--- a/tests/baselines/reference/genericTypeConstraints.js
+++ b/tests/baselines/reference/genericTypeConstraints.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2e1e992ae88..819d550a0fd 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
@@ -49,7 +49,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b1d1c68f8f2..b68aa3e8921 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
@@ -49,7 +49,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b56a488b6d0..b4014a0453b 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8a2f1634646..400633ee4ac 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.js
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.js
@@ -142,7 +142,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b7b7b2f3370..918e327a5ad 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -172,7 +172,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 04eeff360b0..57cde137424 100644
--- a/tests/baselines/reference/illegalSuperCallsInConstructor.js
+++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0fb35f4bfc5..c2403981c78 100644
--- a/tests/baselines/reference/implementClausePrecedingExtends.js
+++ b/tests/baselines/reference/implementClausePrecedingExtends.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 29181ed09da..df4a704dbc3 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
@@ -95,7 +95,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c8d8cb07720..83b634faf55 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
@@ -51,7 +51,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e04df85d885..85ae780472f 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d3f10f9b4a5..edc0aa2c58f 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -96,7 +96,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f23306ddb79..23af5f3ca43 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -90,7 +90,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a7a51764320..b4a8fa89c1e 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -70,7 +70,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 de973cb81be..2b50496e619 100644
--- a/tests/baselines/reference/importNotElidedWhenNotFound.js
+++ b/tests/baselines/reference/importNotElidedWhenNotFound.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 abb34980b8c..f9c67de5b6f 100644
--- a/tests/baselines/reference/importShadowsGlobalName.js
+++ b/tests/baselines/reference/importShadowsGlobalName.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 585d2afdf3a..07d4fd1a752 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c0f6aa06b2c..e8421d04bd3 100644
--- a/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
+++ b/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 86c74b4489d..b46ed4f514e 100644
--- a/tests/baselines/reference/indexedAccessRelation.js
+++ b/tests/baselines/reference/indexedAccessRelation.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 77a30995344..536f23e992a 100644
--- a/tests/baselines/reference/indexedAccessTypeConstraints.js
+++ b/tests/baselines/reference/indexedAccessTypeConstraints.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 73112b0ddbb..ef85b87e217 100644
--- a/tests/baselines/reference/indexerConstraints2.js
+++ b/tests/baselines/reference/indexerConstraints2.js
@@ -91,7 +91,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fe57c9dd858..b9ac329afa1 100644
--- a/tests/baselines/reference/indirectSelfReference.js
+++ b/tests/baselines/reference/indirectSelfReference.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9b810cd41aa..e944106177b 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.js
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 eee36e676b3..dbc97292e99 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a87b0301cba..a356d0aef2a 100644
--- a/tests/baselines/reference/inheritFromGenericTypeParameter.js
+++ b/tests/baselines/reference/inheritFromGenericTypeParameter.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9670de8b53d..8d10276dbb9 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 69864c40079..6c38badaecc 100644
--- a/tests/baselines/reference/inheritance.js
+++ b/tests/baselines/reference/inheritance.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7f5e91cf3fb..f5f008ca7ac 100644
--- a/tests/baselines/reference/inheritance1.js
+++ b/tests/baselines/reference/inheritance1.js
@@ -71,7 +71,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 48a3dfc8b04..7cf8a861017 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 136598e73f9..e84cd5e4cad 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2815582c560..4d7fed1cb5f 100644
--- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8bc9c5428b5..7bcda172d84 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1d9c5d52f77..759d77d86cf 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 23483ed665c..1eabff7e069 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cacdd164f0e..c9238baaeef 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a506c9627ba..b44e3fc9363 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 84a1a518386..37ef5bf0fa2 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f34e831c062..a20d68393f2 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e84edef145e..1ddab5c374c 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 60a61307370..3f0297bd092 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2b7f50e60bb..7f93d588544 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ae2fdf58ec8..b423922099d 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 162a4dd7918..af3103bcfbd 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 adb45d8ad99..cb10205aba0 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 705cfc05c2e..998f0e94fd9 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fd276310558..ed72fb43e95 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0f699b7dda2..375527ece64 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 25361aa989c..3955fd36be4 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8aed2bd7228..f56c52d1e23 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b6fdff2c871..1dd94b8ee3a 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 be14282dfe1..994fe6ea8a6 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e5c90590832..85c15affeeb 100644
--- a/tests/baselines/reference/inheritanceStaticMembersCompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c038668e7ef..501dbf24e79 100644
--- a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 58c178f8255..3f8bca91f66 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 92bada77ca3..4d2fd53742c 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c9583b62250..d299ac0c189 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ef6ef3de745..a3342d8e9f5 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0737dbca477..12feb2b9953 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 92b84b6339d..cb8c1095cd2 100644
--- a/tests/baselines/reference/inheritedModuleMembersForClodule.js
+++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/initializerWithThisPropertyAccess.js b/tests/baselines/reference/initializerWithThisPropertyAccess.js
index 07624070521..57e50494255 100644
--- a/tests/baselines/reference/initializerWithThisPropertyAccess.js
+++ b/tests/baselines/reference/initializerWithThisPropertyAccess.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 92f1ba6d61a..dc4b3a1cbd8 100644
--- a/tests/baselines/reference/instanceOfAssignability.js
+++ b/tests/baselines/reference/instanceOfAssignability.js
@@ -99,7 +99,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ebb0b798834..d50eb464f60 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
@@ -52,7 +52,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2aecc925000..daa73878790 100644
--- a/tests/baselines/reference/instanceSubtypeCheck2.js
+++ b/tests/baselines/reference/instanceSubtypeCheck2.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8ffe100765b..862bb57bc1f 100644
--- a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
@@ -81,7 +81,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7a327d7f1a2..0ac483a9f45 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.js
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 90cd721f741..51bb7a4917a 100644
--- a/tests/baselines/reference/interfaceClassMerging.js
+++ b/tests/baselines/reference/interfaceClassMerging.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 40625482f3e..16c59d89054 100644
--- a/tests/baselines/reference/interfaceClassMerging2.js
+++ b/tests/baselines/reference/interfaceClassMerging2.js
@@ -46,7 +46,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ad5ad8b61f7..6f56a5dad43 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.js
+++ b/tests/baselines/reference/interfaceExtendsClass1.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a50bdacef33..4e2b9fc46b0 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d9d28c8235f..6ba2961af7c 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6ed82696214..3081cb78e50 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersection.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersection.js
@@ -64,7 +64,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 35b7d9a1af8..e5b55cbf55d 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
@@ -58,7 +58,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3e784c4122f..3348c3cad55 100644
--- a/tests/baselines/reference/interfaceImplementation8.js
+++ b/tests/baselines/reference/interfaceImplementation8.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1fb37ae1455..c130ba582f9 100644
--- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
@@ -89,7 +89,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5517958e872..8c7bab44a25 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
@@ -63,7 +63,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e5fca7aa6a2..cc396dd6c52 100644
--- a/tests/baselines/reference/invalidReturnStatements.js
+++ b/tests/baselines/reference/invalidReturnStatements.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8cd3375a119..44e88b45d4a 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 acd05970358..1a5b6599856 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6bb5964ea45..770de04c734 100644
--- a/tests/baselines/reference/jsDeclarationsClasses.js
+++ b/tests/baselines/reference/jsDeclarationsClasses.js
@@ -205,7 +205,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9aa1112aac4..bb3006e9c69 100644
--- a/tests/baselines/reference/jsDeclarationsClassesErr.js
+++ b/tests/baselines/reference/jsDeclarationsClassesErr.js
@@ -83,7 +83,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 615d8f34081..de281eb00e2 100644
--- a/tests/baselines/reference/jsDeclarationsDefault.js
+++ b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -78,7 +78,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsDeclarationsExportedClassAliases.js b/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
index 2b71ba941ed..aaf4bf08165 100644
--- a/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
+++ b/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsDeclarationsThisTypes.js b/tests/baselines/reference/jsDeclarationsThisTypes.js
index 2566eb152b4..c27a7d6f619 100644
--- a/tests/baselines/reference/jsDeclarationsThisTypes.js
+++ b/tests/baselines/reference/jsDeclarationsThisTypes.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 00c78b3d965..90703d54273 100644
--- a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
+++ b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4d5ed0813b3..fce2dca5dc2 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.js
+++ b/tests/baselines/reference/jsdocTypeTagCast.js
@@ -88,7 +88,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0eee52575a2..ee6ba0d4fc4 100644
--- a/tests/baselines/reference/jsxCallbackWithDestructuring.js
+++ b/tests/baselines/reference/jsxCallbackWithDestructuring.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1d611ac1dc2..71248f6683c 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a9a5999b22f..f1b420a6dcf 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 89bc28e8a9b..4c733bba042 100644
--- a/tests/baselines/reference/jsxInExtendsClause.js
+++ b/tests/baselines/reference/jsxInExtendsClause.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f832649cc87..0674c102d3a 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4b7fcd0c659..41f22385324 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 08611267a32..6875b80becc 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -668,7 +668,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 826f4dcd0de..60f147d5d48 100644
--- a/tests/baselines/reference/lambdaArgCrash.js
+++ b/tests/baselines/reference/lambdaArgCrash.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 349f2087fa1..b66838d89b4 100644
--- a/tests/baselines/reference/lift.js
+++ b/tests/baselines/reference/lift.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 435d93587a1..a38b9067148 100644
--- a/tests/baselines/reference/localTypes1.js
+++ b/tests/baselines/reference/localTypes1.js
@@ -150,7 +150,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8ed52869dae..7d25b16ea72 100644
--- a/tests/baselines/reference/m7Bugs.js
+++ b/tests/baselines/reference/m7Bugs.js
@@ -36,7 +36,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 76f13dbdded..6a803b32d90 100644
--- a/tests/baselines/reference/mappedTypePartialConstraints.js
+++ b/tests/baselines/reference/mappedTypePartialConstraints.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8108d5d9522..5c3d3978e82 100644
--- a/tests/baselines/reference/mergedDeclarations5.js
+++ b/tests/baselines/reference/mergedDeclarations5.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ceb77d63c09..623018001f4 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b0e2931bd3e..571792cda8a 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.js
+++ b/tests/baselines/reference/mergedInheritedClassInterface.js
@@ -56,7 +56,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 37e391ac1a8..938fcd7f053 100644
--- a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0cb5678db53..8fdeed6773b 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bb57c9c0d2c..3ca380413e5 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
@@ -48,7 +48,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e18edeb5222..e43e5840b94 100644
--- a/tests/baselines/reference/missingPropertiesOfClassExpression.js
+++ b/tests/baselines/reference/missingPropertiesOfClassExpression.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d0c07329a01..6590df868bd 100644
--- a/tests/baselines/reference/mixinAccessModifiers.js
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -142,7 +142,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 21074f3bf59..7c35b18fec9 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.js
+++ b/tests/baselines/reference/mixinClassesAnnotated.js
@@ -76,7 +76,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9c1309bbe43..79acc96c15f 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.js
+++ b/tests/baselines/reference/mixinClassesAnonymous.js
@@ -75,7 +75,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 dcae4142d4d..e6756d613ca 100644
--- a/tests/baselines/reference/mixinClassesMembers.js
+++ b/tests/baselines/reference/mixinClassesMembers.js
@@ -108,7 +108,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 54c4cd46365..379449a03e3 100644
--- a/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
+++ b/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1f6b2bd33cb..e140dce3b4a 100644
--- a/tests/baselines/reference/mixinPrivateAndProtected.js
+++ b/tests/baselines/reference/mixinPrivateAndProtected.js
@@ -100,7 +100,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a80f2b50688..1193a83d2d5 100644
--- a/tests/baselines/reference/mixingApparentTypeOverrides.js
+++ b/tests/baselines/reference/mixingApparentTypeOverrides.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ef03f45f47b..f7cb4a43eef 100644
--- a/tests/baselines/reference/moduleAsBaseType.js
+++ b/tests/baselines/reference/moduleAsBaseType.js
@@ -14,7 +14,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d100534ee40..69414c4611c 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 42bd9dee193..6bce4c35be1 100644
--- a/tests/baselines/reference/moduleNoneOutFile.js
+++ b/tests/baselines/reference/moduleNoneOutFile.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1722bf12055..d4ca4920f92 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
@@ -68,7 +68,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d12d11dc17d..64c57cf4879 100644
--- a/tests/baselines/reference/multipleInheritance.js
+++ b/tests/baselines/reference/multipleInheritance.js
@@ -48,7 +48,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1c7f1c23c1a..4f994c0bb1f 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f36cfe750bb..089ac798f13 100644
--- a/tests/baselines/reference/mutuallyRecursiveInference.js
+++ b/tests/baselines/reference/mutuallyRecursiveInference.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1a647191c69..da88c7df8eb 100644
--- a/tests/baselines/reference/narrowingOfDottedNames.js
+++ b/tests/baselines/reference/narrowingOfDottedNames.js
@@ -103,7 +103,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a519ba067d0..7a9817644f2 100644
--- a/tests/baselines/reference/neverReturningFunctions1.js
+++ b/tests/baselines/reference/neverReturningFunctions1.js
@@ -274,7 +274,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 743d0a71759..505631318d4 100644
--- a/tests/baselines/reference/newTarget.es5.js
+++ b/tests/baselines/reference/newTarget.es5.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 52fbb2f6bed..67cca17869b 100644
--- a/tests/baselines/reference/noCrashOnMixin.js
+++ b/tests/baselines/reference/noCrashOnMixin.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 83ff977dfda..0a4b61b6c2a 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 47a6044130e..218d0f302bc 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6276ffde42c..9298b8cf772 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6cb6cac4408..1cee4f9a930 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
@@ -56,7 +56,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 32ac660b438..d8d24786283 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.js
+++ b/tests/baselines/reference/numericIndexerConstraint3.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4f19d365a89..649f945bc91 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.js
+++ b/tests/baselines/reference/numericIndexerConstraint4.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c3c39a36033..ce46099fea1 100644
--- a/tests/baselines/reference/numericIndexerTyping2.js
+++ b/tests/baselines/reference/numericIndexerTyping2.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 561f5986e84..d83921a6f55 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.js
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
@@ -65,7 +65,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2ea1f065bcd..d754b0e3650 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
@@ -64,7 +64,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 202a90104b0..7d546605e7e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
@@ -133,7 +133,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e188fa187f9..155ba75442a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
@@ -136,7 +136,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4020b266658..a3ccb7ab4a4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
@@ -133,7 +133,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f60de6f1d25..aac6006dc9d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
@@ -131,7 +131,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ef82ddab192..d77d7f1247b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
@@ -49,7 +49,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9434612b436..597c26ae5b9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 22cf4e470da..c621ba02a67 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
@@ -133,7 +133,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6c18c751bfb..6e7d15a6939 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
@@ -136,7 +136,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 08621aa42c0..a900838c83b 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.js
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 46c3a567cc1..8f79dacc70c 100644
--- a/tests/baselines/reference/optionalMethods.js
+++ b/tests/baselines/reference/optionalMethods.js
@@ -66,7 +66,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fe3cd017e04..03929dc552f 100644
--- a/tests/baselines/reference/optionalParamArgsTest.js
+++ b/tests/baselines/reference/optionalParamArgsTest.js
@@ -134,7 +134,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c1fd13978bf..992a6d7aeab 100644
--- a/tests/baselines/reference/optionalParamInOverride.js
+++ b/tests/baselines/reference/optionalParamInOverride.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 18a92fd7dc0..ac55c93eb63 100644
--- a/tests/baselines/reference/optionalParameterProperty.js
+++ b/tests/baselines/reference/optionalParameterProperty.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e706a657cac..3c08e9ce630 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e28554374d8..0d44d7846ad 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js.map
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -1,3 +1,3 @@
 //// [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"}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBiICsgIiBpcyBub3QgYSBjb25zdHJ1Y3RvciBvciBudWxsIik7DQogICAgICAgIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgICAgIGZ1bmN0aW9uIF9fKCkgeyB0aGlzLmNvbnN0cnVjdG9yID0gZDsgfQ0KICAgICAgICBkLnByb3RvdHlwZSA9IGIgPT09IG51bGwgPyBPYmplY3QuY3JlYXRlKGIpIDogKF9fLnByb3RvdHlwZSA9IGIucHJvdG90eXBlLCBuZXcgX18oKSk7DQogICAgfTsNCn0pKCk7DQpkZWZpbmUoInJlZi9hIiwgWyJyZXF1aXJlIiwgImV4cG9ydHMiXSwgZnVuY3Rpb24gKHJlcXVpcmUsIGV4cG9ydHMpIHsNCiAgICAidXNlIHN0cmljdCI7DQogICAgT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCiAgICBleHBvcnRzLkEgPSB2b2lkIDA7DQogICAgdmFyIEEgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgIGZ1bmN0aW9uIEEoKSB7DQogICAgICAgIH0NCiAgICAgICAgcmV0dXJuIEE7DQogICAgfSgpKTsNCiAgICBleHBvcnRzLkEgPSBBOw0KfSk7DQpkZWZpbmUoImIiLCBbInJlcXVpcmUiLCAiZXhwb3J0cyIsICJyZWYvYSJdLCBmdW5jdGlvbiAocmVxdWlyZSwgZXhwb3J0cywgYV8xKSB7DQogICAgInVzZSBzdHJpY3QiOw0KICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCAiX19lc01vZHVsZSIsIHsgdmFsdWU6IHRydWUgfSk7DQogICAgZXhwb3J0cy5CID0gdm9pZCAwOw0KICAgIHZhciBCID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKF9zdXBlcikgew0KICAgICAgICBfX2V4dGVuZHMoQiwgX3N1cGVyKTsNCiAgICAgICAgZnVuY3Rpb24gQigpIHsNCiAgICAgICAgICAgIHJldHVybiBfc3VwZXIgIT09IG51bGwgJiYgX3N1cGVyLmFwcGx5KHRoaXMsIGFyZ3VtZW50cykgfHwgdGhpczsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gQjsNCiAgICB9KGFfMS5BKSk7DQogICAgZXhwb3J0cy5CID0gQjsNCn0pOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9YWxsLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdHMvY2FzZXMvY29tcGlsZXIvcmVmL2EudHMiLCJ0ZXN0cy9jYXNlcy9jb21waWxlci9iLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFBQTtRQUFBO1FBQWlCLENBQUM7UUFBRCxRQUFDO0lBQUQsQ0FBQyxBQUFsQixJQUFrQjtJQUFMLGNBQUM7Ozs7OztJQ0NkO1FBQXVCLHFCQUFDO1FBQXhCOztRQUEyQixDQUFDO1FBQUQsUUFBQztJQUFELENBQUMsQUFBNUIsQ0FBdUIsS0FBQyxHQUFJO0lBQWYsY0FBQyJ9,ZXhwb3J0IGNsYXNzIEEgeyB9Cg==,aW1wb3J0IHtBfSBmcm9tICIuL3JlZi9hIjsKZXhwb3J0IGNsYXNzIEIgZXh0ZW5kcyBBIHsgfQ==
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBTdHJpbmcoYikgKyAiIGlzIG5vdCBhIGNvbnN0cnVjdG9yIG9yIG51bGwiKTsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICAgICAgZnVuY3Rpb24gX18oKSB7IHRoaXMuY29uc3RydWN0b3IgPSBkOyB9DQogICAgICAgIGQucHJvdG90eXBlID0gYiA9PT0gbnVsbCA/IE9iamVjdC5jcmVhdGUoYikgOiAoX18ucHJvdG90eXBlID0gYi5wcm90b3R5cGUsIG5ldyBfXygpKTsNCiAgICB9Ow0KfSkoKTsNCmRlZmluZSgicmVmL2EiLCBbInJlcXVpcmUiLCAiZXhwb3J0cyJdLCBmdW5jdGlvbiAocmVxdWlyZSwgZXhwb3J0cykgew0KICAgICJ1c2Ugc3RyaWN0IjsNCiAgICBPYmplY3QuZGVmaW5lUHJvcGVydHkoZXhwb3J0cywgIl9fZXNNb2R1bGUiLCB7IHZhbHVlOiB0cnVlIH0pOw0KICAgIGV4cG9ydHMuQSA9IHZvaWQgMDsNCiAgICB2YXIgQSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgZnVuY3Rpb24gQSgpIHsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gQTsNCiAgICB9KCkpOw0KICAgIGV4cG9ydHMuQSA9IEE7DQp9KTsNCmRlZmluZSgiYiIsIFsicmVxdWlyZSIsICJleHBvcnRzIiwgInJlZi9hIl0sIGZ1bmN0aW9uIChyZXF1aXJlLCBleHBvcnRzLCBhXzEpIHsNCiAgICAidXNlIHN0cmljdCI7DQogICAgT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCiAgICBleHBvcnRzLkIgPSB2b2lkIDA7DQogICAgdmFyIEIgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoX3N1cGVyKSB7DQogICAgICAgIF9fZXh0ZW5kcyhCLCBfc3VwZXIpOw0KICAgICAgICBmdW5jdGlvbiBCKCkgew0KICAgICAgICAgICAgcmV0dXJuIF9zdXBlciAhPT0gbnVsbCAmJiBfc3VwZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKSB8fCB0aGlzOw0KICAgICAgICB9DQogICAgICAgIHJldHVybiBCOw0KICAgIH0oYV8xLkEpKTsNCiAgICBleHBvcnRzLkIgPSBCOw0KfSk7DQovLyMgc291cmNlTWFwcGluZ1VSTD1hbGwuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdHMvY2FzZXMvY29tcGlsZXIvcmVmL2EudHMiLCJ0ZXN0cy9jYXNlcy9jb21waWxlci9iLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFBQTtRQUFBO1FBQWlCLENBQUM7UUFBRCxRQUFDO0lBQUQsQ0FBQyxBQUFsQixJQUFrQjtJQUFMLGNBQUM7Ozs7OztJQ0NkO1FBQXVCLHFCQUFDO1FBQXhCOztRQUEyQixDQUFDO1FBQUQsUUFBQztJQUFELENBQUMsQUFBNUIsQ0FBdUIsS0FBQyxHQUFJO0lBQWYsY0FBQyJ9,ZXhwb3J0IGNsYXNzIEEgeyB9Cg==,aW1wb3J0IHtBfSBmcm9tICIuL3JlZi9hIjsKZXhwb3J0IGNsYXNzIEIgZXh0ZW5kcyBBIHsgfQ==
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index 579be6fd37f..3d23b747e62 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    };
 >>>    return function (d, b) {
 >>>        if (typeof b !== "function" && b !== null)
->>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
 >>>        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 b/tests/baselines/reference/outModuleConcatSystem.js
index 8fc78d3f529..ad16bfd075e 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fe73154d7e9..ee2ee739c85 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js.map
+++ b/tests/baselines/reference/outModuleConcatSystem.js.map
@@ -1,3 +1,3 @@
 //// [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"}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBiICsgIiBpcyBub3QgYSBjb25zdHJ1Y3RvciBvciBudWxsIik7DQogICAgICAgIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgICAgIGZ1bmN0aW9uIF9fKCkgeyB0aGlzLmNvbnN0cnVjdG9yID0gZDsgfQ0KICAgICAgICBkLnByb3RvdHlwZSA9IGIgPT09IG51bGwgPyBPYmplY3QuY3JlYXRlKGIpIDogKF9fLnByb3RvdHlwZSA9IGIucHJvdG90eXBlLCBuZXcgX18oKSk7DQogICAgfTsNCn0pKCk7DQpTeXN0ZW0ucmVnaXN0ZXIoInJlZi9hIiwgW10sIGZ1bmN0aW9uIChleHBvcnRzXzEsIGNvbnRleHRfMSkgew0KICAgICJ1c2Ugc3RyaWN0IjsNCiAgICB2YXIgQTsNCiAgICB2YXIgX19tb2R1bGVOYW1lID0gY29udGV4dF8xICYmIGNvbnRleHRfMS5pZDsNCiAgICByZXR1cm4gew0KICAgICAgICBzZXR0ZXJzOiBbXSwNCiAgICAgICAgZXhlY3V0ZTogZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgQSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICBmdW5jdGlvbiBBKCkgew0KICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICByZXR1cm4gQTsNCiAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICBleHBvcnRzXzEoIkEiLCBBKTsNCiAgICAgICAgfQ0KICAgIH07DQp9KTsNClN5c3RlbS5yZWdpc3RlcigiYiIsIFsicmVmL2EiXSwgZnVuY3Rpb24gKGV4cG9ydHNfMiwgY29udGV4dF8yKSB7DQogICAgInVzZSBzdHJpY3QiOw0KICAgIHZhciBhXzEsIEI7DQogICAgdmFyIF9fbW9kdWxlTmFtZSA9IGNvbnRleHRfMiAmJiBjb250ZXh0XzIuaWQ7DQogICAgcmV0dXJuIHsNCiAgICAgICAgc2V0dGVyczogWw0KICAgICAgICAgICAgZnVuY3Rpb24gKGFfMV8xKSB7DQogICAgICAgICAgICAgICAgYV8xID0gYV8xXzE7DQogICAgICAgICAgICB9DQogICAgICAgIF0sDQogICAgICAgIGV4ZWN1dGU6IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgIEIgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoX3N1cGVyKSB7DQogICAgICAgICAgICAgICAgX19leHRlbmRzKEIsIF9zdXBlcik7DQogICAgICAgICAgICAgICAgZnVuY3Rpb24gQigpIHsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIF9zdXBlciAhPT0gbnVsbCAmJiBfc3VwZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKSB8fCB0aGlzOw0KICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICByZXR1cm4gQjsNCiAgICAgICAgICAgIH0oYV8xLkEpKTsNCiAgICAgICAgICAgIGV4cG9ydHNfMigiQiIsIEIpOw0KICAgICAgICB9DQogICAgfTsNCn0pOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9YWxsLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdHMvY2FzZXMvY29tcGlsZXIvcmVmL2EudHMiLCJ0ZXN0cy9jYXNlcy9jb21waWxlci9iLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7WUFBQTtnQkFBQTtnQkFBaUIsQ0FBQztnQkFBRCxRQUFDO1lBQUQsQ0FBQyxBQUFsQixJQUFrQjs7UUFDbEIsQ0FBQzs7Ozs7Ozs7Ozs7Ozs7WUNBRDtnQkFBdUIscUJBQUM7Z0JBQXhCOztnQkFBMkIsQ0FBQztnQkFBRCxRQUFDO1lBQUQsQ0FBQyxBQUE1QixDQUF1QixLQUFDLEdBQUk7O1FBQUEsQ0FBQyJ9,ZXhwb3J0IGNsYXNzIEEgeyB9Cg==,aW1wb3J0IHtBfSBmcm9tICIuL3JlZi9hIjsKZXhwb3J0IGNsYXNzIEIgZXh0ZW5kcyBBIHsgfQ==
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBTdHJpbmcoYikgKyAiIGlzIG5vdCBhIGNvbnN0cnVjdG9yIG9yIG51bGwiKTsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICAgICAgZnVuY3Rpb24gX18oKSB7IHRoaXMuY29uc3RydWN0b3IgPSBkOyB9DQogICAgICAgIGQucHJvdG90eXBlID0gYiA9PT0gbnVsbCA/IE9iamVjdC5jcmVhdGUoYikgOiAoX18ucHJvdG90eXBlID0gYi5wcm90b3R5cGUsIG5ldyBfXygpKTsNCiAgICB9Ow0KfSkoKTsNClN5c3RlbS5yZWdpc3RlcigicmVmL2EiLCBbXSwgZnVuY3Rpb24gKGV4cG9ydHNfMSwgY29udGV4dF8xKSB7DQogICAgInVzZSBzdHJpY3QiOw0KICAgIHZhciBBOw0KICAgIHZhciBfX21vZHVsZU5hbWUgPSBjb250ZXh0XzEgJiYgY29udGV4dF8xLmlkOw0KICAgIHJldHVybiB7DQogICAgICAgIHNldHRlcnM6IFtdLA0KICAgICAgICBleGVjdXRlOiBmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICBBID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIGZ1bmN0aW9uIEEoKSB7DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIHJldHVybiBBOw0KICAgICAgICAgICAgfSgpKTsNCiAgICAgICAgICAgIGV4cG9ydHNfMSgiQSIsIEEpOw0KICAgICAgICB9DQogICAgfTsNCn0pOw0KU3lzdGVtLnJlZ2lzdGVyKCJiIiwgWyJyZWYvYSJdLCBmdW5jdGlvbiAoZXhwb3J0c18yLCBjb250ZXh0XzIpIHsNCiAgICAidXNlIHN0cmljdCI7DQogICAgdmFyIGFfMSwgQjsNCiAgICB2YXIgX19tb2R1bGVOYW1lID0gY29udGV4dF8yICYmIGNvbnRleHRfMi5pZDsNCiAgICByZXR1cm4gew0KICAgICAgICBzZXR0ZXJzOiBbDQogICAgICAgICAgICBmdW5jdGlvbiAoYV8xXzEpIHsNCiAgICAgICAgICAgICAgICBhXzEgPSBhXzFfMTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgXSwNCiAgICAgICAgZXhlY3V0ZTogZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgQiA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uIChfc3VwZXIpIHsNCiAgICAgICAgICAgICAgICBfX2V4dGVuZHMoQiwgX3N1cGVyKTsNCiAgICAgICAgICAgICAgICBmdW5jdGlvbiBCKCkgew0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gX3N1cGVyICE9PSBudWxsICYmIF9zdXBlci5hcHBseSh0aGlzLCBhcmd1bWVudHMpIHx8IHRoaXM7DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIHJldHVybiBCOw0KICAgICAgICAgICAgfShhXzEuQSkpOw0KICAgICAgICAgICAgZXhwb3J0c18yKCJCIiwgQik7DQogICAgICAgIH0NCiAgICB9Ow0KfSk7DQovLyMgc291cmNlTWFwcGluZ1VSTD1hbGwuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdHMvY2FzZXMvY29tcGlsZXIvcmVmL2EudHMiLCJ0ZXN0cy9jYXNlcy9jb21waWxlci9iLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7WUFBQTtnQkFBQTtnQkFBaUIsQ0FBQztnQkFBRCxRQUFDO1lBQUQsQ0FBQyxBQUFsQixJQUFrQjs7UUFDbEIsQ0FBQzs7Ozs7Ozs7Ozs7Ozs7WUNBRDtnQkFBdUIscUJBQUM7Z0JBQXhCOztnQkFBMkIsQ0FBQztnQkFBRCxRQUFDO1lBQUQsQ0FBQyxBQUE1QixDQUF1QixLQUFDLEdBQUk7O1FBQUEsQ0FBQyJ9,ZXhwb3J0IGNsYXNzIEEgeyB9Cg==,aW1wb3J0IHtBfSBmcm9tICIuL3JlZi9hIjsKZXhwb3J0IGNsYXNzIEIgZXh0ZW5kcyBBIHsgfQ==
diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
index 8f094f9ffab..742cccc9f09 100644
--- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    };
 >>>    return function (d, b) {
 >>>        if (typeof b !== "function" && b !== null)
->>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
 >>>        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 b/tests/baselines/reference/outModuleTripleSlashRefs.js
index 1ab5d4fd26f..251e07a5476 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -39,7 +39,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c2aefa1f7f9..61eb1e79dba 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -1,3 +1,3 @@
 //// [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"}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBiICsgIiBpcyBub3QgYSBjb25zdHJ1Y3RvciBvciBudWxsIik7DQogICAgICAgIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgICAgIGZ1bmN0aW9uIF9fKCkgeyB0aGlzLmNvbnN0cnVjdG9yID0gZDsgfQ0KICAgICAgICBkLnByb3RvdHlwZSA9IGIgPT09IG51bGwgPyBPYmplY3QuY3JlYXRlKGIpIDogKF9fLnByb3RvdHlwZSA9IGIucHJvdG90eXBlLCBuZXcgX18oKSk7DQogICAgfTsNCn0pKCk7DQovLy8gPHJlZmVyZW5jZSBwYXRoPSIuL2MuZC50cyIgLz4NCnZhciBGb28gPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gRm9vKCkgew0KICAgIH0NCiAgICByZXR1cm4gRm9vOw0KfSgpKTsNCmRlZmluZSgicmVmL2EiLCBbInJlcXVpcmUiLCAiZXhwb3J0cyJdLCBmdW5jdGlvbiAocmVxdWlyZSwgZXhwb3J0cykgew0KICAgICJ1c2Ugc3RyaWN0IjsNCiAgICBPYmplY3QuZGVmaW5lUHJvcGVydHkoZXhwb3J0cywgIl9fZXNNb2R1bGUiLCB7IHZhbHVlOiB0cnVlIH0pOw0KICAgIGV4cG9ydHMuQSA9IHZvaWQgMDsNCiAgICAvLy8gPHJlZmVyZW5jZSBwYXRoPSIuL2IudHMiIC8+DQogICAgdmFyIEEgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgIGZ1bmN0aW9uIEEoKSB7DQogICAgICAgIH0NCiAgICAgICAgcmV0dXJuIEE7DQogICAgfSgpKTsNCiAgICBleHBvcnRzLkEgPSBBOw0KfSk7DQpkZWZpbmUoImIiLCBbInJlcXVpcmUiLCAiZXhwb3J0cyIsICJyZWYvYSJdLCBmdW5jdGlvbiAocmVxdWlyZSwgZXhwb3J0cywgYV8xKSB7DQogICAgInVzZSBzdHJpY3QiOw0KICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCAiX19lc01vZHVsZSIsIHsgdmFsdWU6IHRydWUgfSk7DQogICAgZXhwb3J0cy5CID0gdm9pZCAwOw0KICAgIHZhciBCID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKF9zdXBlcikgew0KICAgICAgICBfX2V4dGVuZHMoQiwgX3N1cGVyKTsNCiAgICAgICAgZnVuY3Rpb24gQigpIHsNCiAgICAgICAgICAgIHJldHVybiBfc3VwZXIgIT09IG51bGwgJiYgX3N1cGVyLmFwcGx5KHRoaXMsIGFyZ3VtZW50cykgfHwgdGhpczsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gQjsNCiAgICB9KGFfMS5BKSk7DQogICAgZXhwb3J0cy5CID0gQjsNCn0pOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9YWxsLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdHMvY2FzZXMvY29tcGlsZXIvcmVmL2IudHMiLCJ0ZXN0cy9jYXNlcy9jb21waWxlci9yZWYvYS50cyIsInRlc3RzL2Nhc2VzL2NvbXBpbGVyL2IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsaUNBQWlDO0FBQ2pDO0lBQUE7SUFFQSxDQUFDO0lBQUQsVUFBQztBQUFELENBQUMsQUFGRCxJQUVDOzs7OztJQ0hELCtCQUErQjtJQUMvQjtRQUFBO1FBRUEsQ0FBQztRQUFELFFBQUM7SUFBRCxDQUFDLEFBRkQsSUFFQztJQUZZLGNBQUM7Ozs7OztJQ0FkO1FBQXVCLHFCQUFDO1FBQXhCOztRQUEyQixDQUFDO1FBQUQsUUFBQztJQUFELENBQUMsQUFBNUIsQ0FBdUIsS0FBQyxHQUFJO0lBQWYsY0FBQyJ9,Ly8vIDxyZWZlcmVuY2UgcGF0aD0iLi9jLmQudHMiIC8+CmNsYXNzIEZvbyB7CgltZW1iZXI6IEJhcjsKfQpkZWNsYXJlIHZhciBHbG9iYWxGb286IEZvbzsK,Ly8vIDxyZWZlcmVuY2UgcGF0aD0iLi9iLnRzIiAvPgpleHBvcnQgY2xhc3MgQSB7CgltZW1iZXI6IHR5cGVvZiBHbG9iYWxGb287Cn0K,aW1wb3J0IHtBfSBmcm9tICIuL3JlZi9hIjsKZXhwb3J0IGNsYXNzIEIgZXh0ZW5kcyBBIHsgfQo=
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBTdHJpbmcoYikgKyAiIGlzIG5vdCBhIGNvbnN0cnVjdG9yIG9yIG51bGwiKTsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICAgICAgZnVuY3Rpb24gX18oKSB7IHRoaXMuY29uc3RydWN0b3IgPSBkOyB9DQogICAgICAgIGQucHJvdG90eXBlID0gYiA9PT0gbnVsbCA/IE9iamVjdC5jcmVhdGUoYikgOiAoX18ucHJvdG90eXBlID0gYi5wcm90b3R5cGUsIG5ldyBfXygpKTsNCiAgICB9Ow0KfSkoKTsNCi8vLyA8cmVmZXJlbmNlIHBhdGg9Ii4vYy5kLnRzIiAvPg0KdmFyIEZvbyA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICBmdW5jdGlvbiBGb28oKSB7DQogICAgfQ0KICAgIHJldHVybiBGb287DQp9KCkpOw0KZGVmaW5lKCJyZWYvYSIsIFsicmVxdWlyZSIsICJleHBvcnRzIl0sIGZ1bmN0aW9uIChyZXF1aXJlLCBleHBvcnRzKSB7DQogICAgInVzZSBzdHJpY3QiOw0KICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCAiX19lc01vZHVsZSIsIHsgdmFsdWU6IHRydWUgfSk7DQogICAgZXhwb3J0cy5BID0gdm9pZCAwOw0KICAgIC8vLyA8cmVmZXJlbmNlIHBhdGg9Ii4vYi50cyIgLz4NCiAgICB2YXIgQSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgZnVuY3Rpb24gQSgpIHsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gQTsNCiAgICB9KCkpOw0KICAgIGV4cG9ydHMuQSA9IEE7DQp9KTsNCmRlZmluZSgiYiIsIFsicmVxdWlyZSIsICJleHBvcnRzIiwgInJlZi9hIl0sIGZ1bmN0aW9uIChyZXF1aXJlLCBleHBvcnRzLCBhXzEpIHsNCiAgICAidXNlIHN0cmljdCI7DQogICAgT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCiAgICBleHBvcnRzLkIgPSB2b2lkIDA7DQogICAgdmFyIEIgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoX3N1cGVyKSB7DQogICAgICAgIF9fZXh0ZW5kcyhCLCBfc3VwZXIpOw0KICAgICAgICBmdW5jdGlvbiBCKCkgew0KICAgICAgICAgICAgcmV0dXJuIF9zdXBlciAhPT0gbnVsbCAmJiBfc3VwZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKSB8fCB0aGlzOw0KICAgICAgICB9DQogICAgICAgIHJldHVybiBCOw0KICAgIH0oYV8xLkEpKTsNCiAgICBleHBvcnRzLkIgPSBCOw0KfSk7DQovLyMgc291cmNlTWFwcGluZ1VSTD1hbGwuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdHMvY2FzZXMvY29tcGlsZXIvcmVmL2IudHMiLCJ0ZXN0cy9jYXNlcy9jb21waWxlci9yZWYvYS50cyIsInRlc3RzL2Nhc2VzL2NvbXBpbGVyL2IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsaUNBQWlDO0FBQ2pDO0lBQUE7SUFFQSxDQUFDO0lBQUQsVUFBQztBQUFELENBQUMsQUFGRCxJQUVDOzs7OztJQ0hELCtCQUErQjtJQUMvQjtRQUFBO1FBRUEsQ0FBQztRQUFELFFBQUM7SUFBRCxDQUFDLEFBRkQsSUFFQztJQUZZLGNBQUM7Ozs7OztJQ0FkO1FBQXVCLHFCQUFDO1FBQXhCOztRQUEyQixDQUFDO1FBQUQsUUFBQztJQUFELENBQUMsQUFBNUIsQ0FBdUIsS0FBQyxHQUFJO0lBQWYsY0FBQyJ9,Ly8vIDxyZWZlcmVuY2UgcGF0aD0iLi9jLmQudHMiIC8+CmNsYXNzIEZvbyB7CgltZW1iZXI6IEJhcjsKfQpkZWNsYXJlIHZhciBHbG9iYWxGb286IEZvbzsK,Ly8vIDxyZWZlcmVuY2UgcGF0aD0iLi9iLnRzIiAvPgpleHBvcnQgY2xhc3MgQSB7CgltZW1iZXI6IHR5cGVvZiBHbG9iYWxGb287Cn0K,aW1wb3J0IHtBfSBmcm9tICIuL3JlZi9hIjsKZXhwb3J0IGNsYXNzIEIgZXh0ZW5kcyBBIHsgfQo=
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index 7981c2c0a3a..ef9ca5aedb5 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:tests/cases/compiler/ref/b.ts
 >>>    };
 >>>    return function (d, b) {
 >>>        if (typeof b !== "function" && b !== null)
->>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overload1.js b/tests/baselines/reference/overload1.js
index f63632d7cb1..5ef1b7e4ebe 100644
--- a/tests/baselines/reference/overload1.js
+++ b/tests/baselines/reference/overload1.js
@@ -49,7 +49,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 26473d9a913..0fcb978a68c 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9ac367ff8ac..0e089790b49 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4136866eac1..2b880826b41 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c628a378e5b..c17051c895d 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e7ecf762c40..92e07f37ec6 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bcb590fb925..6b6af116539 100644
--- a/tests/baselines/reference/overloadResolution.js
+++ b/tests/baselines/reference/overloadResolution.js
@@ -104,7 +104,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9cf4230fdb7..2b77cca72d1 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.js
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.js
@@ -111,7 +111,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d02b1e0e56d..0f7c728cb21 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.js
+++ b/tests/baselines/reference/overloadResolutionConstructors.js
@@ -112,7 +112,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fec87ae10e5..de845b41744 100644
--- a/tests/baselines/reference/overloadingOnConstants1.js
+++ b/tests/baselines/reference/overloadingOnConstants1.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7da80c9d1d5..195d2fb9904 100644
--- a/tests/baselines/reference/overloadingOnConstants2.js
+++ b/tests/baselines/reference/overloadingOnConstants2.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d4c53c21334..9b9637613ec 100644
--- a/tests/baselines/reference/overrideBaseIntersectionMethod.js
+++ b/tests/baselines/reference/overrideBaseIntersectionMethod.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d77fb030955..42eef2f6b3e 100644
--- a/tests/baselines/reference/overridingPrivateStaticMembers.js
+++ b/tests/baselines/reference/overridingPrivateStaticMembers.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 98f7690c785..ef47ebc1c93 100644
--- a/tests/baselines/reference/parseErrorInHeritageClause1.js
+++ b/tests/baselines/reference/parseErrorInHeritageClause1.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 140c26a7e51..7b5a4476abe 100644
--- a/tests/baselines/reference/parser509630.js
+++ b/tests/baselines/reference/parser509630.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5823666a091..fb23c809bd9 100644
--- a/tests/baselines/reference/parserAstSpans1.js
+++ b/tests/baselines/reference/parserAstSpans1.js
@@ -229,7 +229,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f8e348e1e45..9c030bfba06 100644
--- a/tests/baselines/reference/parserClassDeclaration1.js
+++ b/tests/baselines/reference/parserClassDeclaration1.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 28f1478a80f..4b436ca99f1 100644
--- a/tests/baselines/reference/parserClassDeclaration3.js
+++ b/tests/baselines/reference/parserClassDeclaration3.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6c173dad4d0..709d13d4e11 100644
--- a/tests/baselines/reference/parserClassDeclaration4.js
+++ b/tests/baselines/reference/parserClassDeclaration4.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7f692d5d05a..294eb62f50e 100644
--- a/tests/baselines/reference/parserClassDeclaration5.js
+++ b/tests/baselines/reference/parserClassDeclaration5.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 253965449b1..8cb1b4b3524 100644
--- a/tests/baselines/reference/parserClassDeclaration6.js
+++ b/tests/baselines/reference/parserClassDeclaration6.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6b02763bbee..077d32937cd 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5e9224e3411..ed012cb2248 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cf786745cdb..6c0716f5b54 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a7adf2d634d..91761c04cd4 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5783d85cccf..866d521b56b 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3790dbb63d6..58ac993022b 100644
--- a/tests/baselines/reference/parserRealSource10.js
+++ b/tests/baselines/reference/parserRealSource10.js
@@ -467,7 +467,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 19f0826d5e8..1b6b688ec93 100644
--- a/tests/baselines/reference/parserRealSource11.js
+++ b/tests/baselines/reference/parserRealSource11.js
@@ -2376,7 +2376,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 30c3913b715..6fe11051dc7 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2105,7 +2105,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 76a6a7bc284..8fa3a777db4 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6f7a4b419ee..840d97b10f1 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1e05c095725..71350b818b8 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 07b3712ae2e..59917d99562 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -138,7 +138,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6bf4eb4f777..488462ac38d 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -107,7 +107,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -305,7 +305,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 15c304a4769..24b7750cc01 100644
--- a/tests/baselines/reference/privacyGloClass.js
+++ b/tests/baselines/reference/privacyGloClass.js
@@ -70,7 +70,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 824b8af36f7..eb3f267f16e 100644
--- a/tests/baselines/reference/privateAccessInSubclass1.js
+++ b/tests/baselines/reference/privateAccessInSubclass1.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 42e09cf745c..a6906a074e9 100644
--- a/tests/baselines/reference/privateInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/privateInstanceMemberAccessibility.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c14b9f04b64..fc118912dcc 100644
--- a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
+++ b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3e80d8fd1c6..34498e90b4f 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.js
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 79764e1fc32..60e64181aed 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3074c564dd1..f5353bdb697 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
@@ -7,7 +7,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3074c564dd1..f5353bdb697 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
@@ -7,7 +7,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e4348a59c64..0761d85d740 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/out.js
+++ b/tests/baselines/reference/project/prologueEmit/amd/out.js
@@ -7,7 +7,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e4348a59c64..0761d85d740 100644
--- a/tests/baselines/reference/project/prologueEmit/node/out.js
+++ b/tests/baselines/reference/project/prologueEmit/node/out.js
@@ -7,7 +7,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1ab6761afae..ce33f2150c1 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
@@ -8,7 +8,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1ab6761afae..ce33f2150c1 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
@@ -8,7 +8,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 20236d8560e..cc926cd1060 100644
--- a/tests/baselines/reference/propertiesAndIndexers.js
+++ b/tests/baselines/reference/propertiesAndIndexers.js
@@ -61,7 +61,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fc471e483f6..7de04b0742b 100644
--- a/tests/baselines/reference/propertyAccess.js
+++ b/tests/baselines/reference/propertyAccess.js
@@ -160,7 +160,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2bf7cef1eac..6d593920208 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
@@ -92,7 +92,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4b9a45a088f..97252183610 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
@@ -67,7 +67,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3ee4947219a..08c781ce485 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 782d7645ac6..90d2d65f9e8 100644
--- a/tests/baselines/reference/propertyOverridesAccessors4.js
+++ b/tests/baselines/reference/propertyOverridesAccessors4.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 31bea31c073..0f190943812 100644
--- a/tests/baselines/reference/propertyOverridingPrototype.js
+++ b/tests/baselines/reference/propertyOverridingPrototype.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ae6d6d9c368..03baad61001 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e83e2640d3c..0dced9694f2 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
@@ -124,7 +124,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ed1e178e4c7..d7e00677654 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 56986ed493f..21b00bcf922 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
@@ -104,7 +104,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 96d242065ce..af1ee105c58 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 94c71071fd0..46d65274af7 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 396b012ca2b..dde0b162f5d 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -125,7 +125,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bb225c8f0b2..a1e89b4b412 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 51deb40ea31..a412a7662ad 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e99e70b317d..37f7bf123e4 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
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 10f32ddcb41..ec60bfcaf29 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
@@ -80,7 +80,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7ffa368e9ed..28862185aef 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.js
+++ b/tests/baselines/reference/reactHOCSpreadprops.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cbcb9866f76..dd9af87032d 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e77a33bc3e0..5f1deaf76fe 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -158,7 +158,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6c3e4e6fd70..a02a72b815a 100644
--- a/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
+++ b/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3a0e01ec65a..8055ec8ec2c 100644
--- a/tests/baselines/reference/readonlyConstructorAssignment.js
+++ b/tests/baselines/reference/readonlyConstructorAssignment.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 66fd8a3f4f7..0f3373dbc65 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.js
+++ b/tests/baselines/reference/recursiveBaseCheck3.js
@@ -14,7 +14,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3eacdf202f9..52b0c9e3bdd 100644
--- a/tests/baselines/reference/recursiveBaseCheck4.js
+++ b/tests/baselines/reference/recursiveBaseCheck4.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 794dc9b0739..3c791b20c7c 100644
--- a/tests/baselines/reference/recursiveBaseCheck6.js
+++ b/tests/baselines/reference/recursiveBaseCheck6.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c011c3def46..8b59baa77b2 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d83542f3a3b..729c1e21b89 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ffe7b49dcd1..e320331ffcf 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js
@@ -114,7 +114,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 30db2775251..6a836fa7429 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js.map
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map
@@ -1,3 +1,3 @@
 //// [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"}
-//// https://sokra.github.io/source-map-visualization#base64,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXINCi8vIFNjZW5hcmlvIDI6IFRlc3QgcmVjdXJzaXZlIGZ1bmN0aW9uIGNhbGwgd2l0aCBjYXN0IGFuZCAidGhpcyIgcGFyYW1ldGVyDQp2YXIgX19leHRlbmRzID0gKHRoaXMgJiYgdGhpcy5fX2V4dGVuZHMpIHx8IChmdW5jdGlvbiAoKSB7DQogICAgdmFyIGV4dGVuZFN0YXRpY3MgPSBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBleHRlbmRTdGF0aWNzID0gT2JqZWN0LnNldFByb3RvdHlwZU9mIHx8DQogICAgICAgICAgICAoeyBfX3Byb3RvX186IFtdIH0gaW5zdGFuY2VvZiBBcnJheSAmJiBmdW5jdGlvbiAoZCwgYikgeyBkLl9fcHJvdG9fXyA9IGI7IH0pIHx8DQogICAgICAgICAgICBmdW5jdGlvbiAoZCwgYikgeyBmb3IgKHZhciBwIGluIGIpIGlmIChPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGwoYiwgcCkpIGRbcF0gPSBiW3BdOyB9Ow0KICAgICAgICByZXR1cm4gZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICB9Ow0KICAgIHJldHVybiBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBpZiAodHlwZW9mIGIgIT09ICJmdW5jdGlvbiIgJiYgYiAhPT0gbnVsbCkNCiAgICAgICAgICAgIHRocm93IG5ldyBUeXBlRXJyb3IoIkNsYXNzIGV4dGVuZHMgdmFsdWUgIiArIGIgKyAiIGlzIG5vdCBhIGNvbnN0cnVjdG9yIG9yIG51bGwiKTsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICAgICAgZnVuY3Rpb24gX18oKSB7IHRoaXMuY29uc3RydWN0b3IgPSBkOyB9DQogICAgICAgIGQucHJvdG90eXBlID0gYiA9PT0gbnVsbCA/IE9iamVjdC5jcmVhdGUoYikgOiAoX18ucHJvdG90eXBlID0gYi5wcm90b3R5cGUsIG5ldyBfXygpKTsNCiAgICB9Ow0KfSkoKTsNCnZhciBTYW1wbGU7DQooZnVuY3Rpb24gKFNhbXBsZSkgew0KICAgIHZhciBBY3Rpb25zOw0KICAgIChmdW5jdGlvbiAoQWN0aW9ucykgew0KICAgICAgICB2YXIgVGhpbmc7DQogICAgICAgIChmdW5jdGlvbiAoVGhpbmdfMSkgew0KICAgICAgICAgICAgdmFyIEZpbmQ7DQogICAgICAgICAgICAoZnVuY3Rpb24gKEZpbmQpIHsNCiAgICAgICAgICAgICAgICB2YXIgU3RhcnRGaW5kQWN0aW9uID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBTdGFydEZpbmRBY3Rpb24oKSB7DQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICAgICAgU3RhcnRGaW5kQWN0aW9uLnByb3RvdHlwZS5nZXRJZCA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuICJ5byI7IH07DQogICAgICAgICAgICAgICAgICAgIFN0YXJ0RmluZEFjdGlvbi5wcm90b3R5cGUucnVuID0gZnVuY3Rpb24gKFRoaW5nKSB7DQogICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsNCiAgICAgICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0YXJ0RmluZEFjdGlvbjsNCiAgICAgICAgICAgICAgICB9KCkpOw0KICAgICAgICAgICAgICAgIEZpbmQuU3RhcnRGaW5kQWN0aW9uID0gU3RhcnRGaW5kQWN0aW9uOw0KICAgICAgICAgICAgfSkoRmluZCA9IFRoaW5nXzEuRmluZCB8fCAoVGhpbmdfMS5GaW5kID0ge30pKTsNCiAgICAgICAgfSkoVGhpbmcgPSBBY3Rpb25zLlRoaW5nIHx8IChBY3Rpb25zLlRoaW5nID0ge30pKTsNCiAgICB9KShBY3Rpb25zID0gU2FtcGxlLkFjdGlvbnMgfHwgKFNhbXBsZS5BY3Rpb25zID0ge30pKTsNCn0pKFNhbXBsZSB8fCAoU2FtcGxlID0ge30pKTsNCihmdW5jdGlvbiAoU2FtcGxlKSB7DQogICAgdmFyIFRoaW5nOw0KICAgIChmdW5jdGlvbiAoVGhpbmcpIHsNCiAgICAgICAgdmFyIFdpZGdldHM7DQogICAgICAgIChmdW5jdGlvbiAoV2lkZ2V0cykgew0KICAgICAgICAgICAgdmFyIEZpbmRXaWRnZXQgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgZnVuY3Rpb24gRmluZFdpZGdldChjb2RlVGhpbmcpIHsNCiAgICAgICAgICAgICAgICAgICAgdGhpcy5jb2RlVGhpbmcgPSBjb2RlVGhpbmc7DQogICAgICAgICAgICAgICAgICAgIHRoaXMuZG9tTm9kZSA9IG51bGw7DQogICAgICAgICAgICAgICAgICAgIC8vIHNjZW5hcmlvIDENCiAgICAgICAgICAgICAgICAgICAgY29kZVRoaW5nLmFkZFdpZGdldCgiYWRkV2lkZ2V0IiwgdGhpcyk7DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIEZpbmRXaWRnZXQucHJvdG90eXBlLmdhciA9IGZ1bmN0aW9uIChydW5uZXIpIHsgaWYgKHRydWUpIHsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJ1bm5lcih0aGlzKTsNCiAgICAgICAgICAgICAgICB9IH07DQogICAgICAgICAgICAgICAgRmluZFdpZGdldC5wcm90b3R5cGUuZ2V0RG9tTm9kZSA9IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGRvbU5vZGU7DQogICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICBGaW5kV2lkZ2V0LnByb3RvdHlwZS5kZXN0cm95ID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIH07DQogICAgICAgICAgICAgICAgcmV0dXJuIEZpbmRXaWRnZXQ7DQogICAgICAgICAgICB9KCkpOw0KICAgICAgICAgICAgV2lkZ2V0cy5GaW5kV2lkZ2V0ID0gRmluZFdpZGdldDsNCiAgICAgICAgfSkoV2lkZ2V0cyA9IFRoaW5nLldpZGdldHMgfHwgKFRoaW5nLldpZGdldHMgPSB7fSkpOw0KICAgIH0pKFRoaW5nID0gU2FtcGxlLlRoaW5nIHx8IChTYW1wbGUuVGhpbmcgPSB7fSkpOw0KfSkoU2FtcGxlIHx8IChTYW1wbGUgPSB7fSkpOw0KdmFyIEFic3RyYWN0TW9kZSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICBmdW5jdGlvbiBBYnN0cmFjdE1vZGUoKSB7DQogICAgfQ0KICAgIEFic3RyYWN0TW9kZS5wcm90b3R5cGUuZ2V0SW5pdGlhbFN0YXRlID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gbnVsbDsgfTsNCiAgICByZXR1cm4gQWJzdHJhY3RNb2RlOw0KfSgpKTsNCihmdW5jdGlvbiAoU2FtcGxlKSB7DQogICAgdmFyIFRoaW5nOw0KICAgIChmdW5jdGlvbiAoVGhpbmcpIHsNCiAgICAgICAgdmFyIExhbmd1YWdlczsNCiAgICAgICAgKGZ1bmN0aW9uIChMYW5ndWFnZXMpIHsNCiAgICAgICAgICAgIHZhciBQbGFpblRleHQ7DQogICAgICAgICAgICAoZnVuY3Rpb24gKFBsYWluVGV4dCkgew0KICAgICAgICAgICAgICAgIHZhciBTdGF0ZSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICAgICAgZnVuY3Rpb24gU3RhdGUobW9kZSkgew0KICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5tb2RlID0gbW9kZTsNCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICBTdGF0ZS5wcm90b3R5cGUuY2xvbmUgPSBmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpczsNCiAgICAgICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICAgICAgU3RhdGUucHJvdG90eXBlLmVxdWFscyA9IGZ1bmN0aW9uIChvdGhlcikgew0KICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMgPT09IG90aGVyOw0KICAgICAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgICAgICBTdGF0ZS5wcm90b3R5cGUuZ2V0TW9kZSA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuIG1vZGU7IH07DQogICAgICAgICAgICAgICAgICAgIHJldHVybiBTdGF0ZTsNCiAgICAgICAgICAgICAgICB9KCkpOw0KICAgICAgICAgICAgICAgIFBsYWluVGV4dC5TdGF0ZSA9IFN0YXRlOw0KICAgICAgICAgICAgICAgIHZhciBNb2RlID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKF9zdXBlcikgew0KICAgICAgICAgICAgICAgICAgICBfX2V4dGVuZHMoTW9kZSwgX3N1cGVyKTsNCiAgICAgICAgICAgICAgICAgICAgZnVuY3Rpb24gTW9kZSgpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBfc3VwZXIgIT09IG51bGwgJiYgX3N1cGVyLmFwcGx5KHRoaXMsIGFyZ3VtZW50cykgfHwgdGhpczsNCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICAvLyBzY2VuYXJpbyAyDQogICAgICAgICAgICAgICAgICAgIE1vZGUucHJvdG90eXBlLmdldEluaXRpYWxTdGF0ZSA9IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBuZXcgU3RhdGUoc2VsZik7DQogICAgICAgICAgICAgICAgICAgIH07DQogICAgICAgICAgICAgICAgICAgIHJldHVybiBNb2RlOw0KICAgICAgICAgICAgICAgIH0oQWJzdHJhY3RNb2RlKSk7DQogICAgICAgICAgICAgICAgUGxhaW5UZXh0Lk1vZGUgPSBNb2RlOw0KICAgICAgICAgICAgfSkoUGxhaW5UZXh0ID0gTGFuZ3VhZ2VzLlBsYWluVGV4dCB8fCAoTGFuZ3VhZ2VzLlBsYWluVGV4dCA9IHt9KSk7DQogICAgICAgIH0pKExhbmd1YWdlcyA9IFRoaW5nLkxhbmd1YWdlcyB8fCAoVGhpbmcuTGFuZ3VhZ2VzID0ge30pKTsNCiAgICB9KShUaGluZyA9IFNhbXBsZS5UaGluZyB8fCAoU2FtcGxlLlRoaW5nID0ge30pKTsNCn0pKFNhbXBsZSB8fCAoU2FtcGxlID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXJlY3Vyc2l2ZUNsYXNzUmVmZXJlbmNlVGVzdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGlFQUFpRTtBQUNqRSwwRUFBMEU7Ozs7Ozs7Ozs7Ozs7Ozs7QUE4QjFFLElBQU8sTUFBTSxDQVVaO0FBVkQsV0FBTyxNQUFNO0lBQUMsSUFBQSxPQUFPLENBVXBCO0lBVmEsV0FBQSxPQUFPO1FBQUMsSUFBQSxLQUFLLENBVTFCO1FBVnFCLFdBQUEsT0FBSztZQUFDLElBQUEsSUFBSSxDQVUvQjtZQVYyQixXQUFBLElBQUk7Z0JBQy9CO29CQUFBO29CQVFBLENBQUM7b0JBTk8sK0JBQUssR0FBWixjQUFpQixPQUFPLElBQUksQ0FBQyxDQUFDLENBQUM7b0JBRXhCLDZCQUFHLEdBQVYsVUFBVyxLQUE2Qjt3QkFFdkMsT0FBTyxJQUFJLENBQUM7b0JBQ2IsQ0FBQztvQkFDRixzQkFBQztnQkFBRCxDQUFDLEFBUkQsSUFRQztnQkFSWSxvQkFBZSxrQkFRM0IsQ0FBQTtZQUNGLENBQUMsRUFWMkIsSUFBSSxHQUFKLFlBQUksS0FBSixZQUFJLFFBVS9CO1FBQUQsQ0FBQyxFQVZxQixLQUFLLEdBQUwsYUFBSyxLQUFMLGFBQUssUUFVMUI7SUFBRCxDQUFDLEVBVmEsT0FBTyxHQUFQLGNBQU8sS0FBUCxjQUFPLFFBVXBCO0FBQUQsQ0FBQyxFQVZNLE1BQU0sS0FBTixNQUFNLFFBVVo7QUFFRCxXQUFPLE1BQU07SUFBQyxJQUFBLEtBQUssQ0FvQmxCO0lBcEJhLFdBQUEsS0FBSztRQUFDLElBQUEsT0FBTyxDQW9CMUI7UUFwQm1CLFdBQUEsT0FBTztZQUMxQjtnQkFLQyxvQkFBb0IsU0FBa0M7b0JBQWxDLGNBQVMsR0FBVCxTQUFTLENBQXlCO29CQUQ5QyxZQUFPLEdBQU8sSUFBSSxDQUFDO29CQUV2QixhQUFhO29CQUNiLFNBQVMsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFDO2dCQUMzQyxDQUFDO2dCQU5NLHdCQUFHLEdBQVYsVUFBVyxNQUF5QyxJQUFJLElBQUksSUFBSSxFQUFFO29CQUFDLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO2lCQUFDLENBQUEsQ0FBQztnQkFRbEYsK0JBQVUsR0FBakI7b0JBQ0MsT0FBTyxPQUFPLENBQUM7Z0JBQ2hCLENBQUM7Z0JBRU0sNEJBQU8sR0FBZDtnQkFFQSxDQUFDO2dCQUVGLGlCQUFDO1lBQUQsQ0FBQyxBQWxCRCxJQWtCQztZQWxCWSxrQkFBVSxhQWtCdEIsQ0FBQTtRQUNGLENBQUMsRUFwQm1CLE9BQU8sR0FBUCxhQUFPLEtBQVAsYUFBTyxRQW9CMUI7SUFBRCxDQUFDLEVBcEJhLEtBQUssR0FBTCxZQUFLLEtBQUwsWUFBSyxRQW9CbEI7QUFBRCxDQUFDLEVBcEJNLE1BQU0sS0FBTixNQUFNLFFBb0JaO0FBR0Q7SUFBQTtJQUF1RixDQUFDO0lBQTNDLHNDQUFlLEdBQXRCLGNBQW1DLE9BQU8sSUFBSSxDQUFDLENBQUEsQ0FBQztJQUFDLG1CQUFDO0FBQUQsQ0FBQyxBQUF4RixJQUF3RjtBQVN4RixXQUFPLE1BQU07SUFBQyxJQUFBLEtBQUssQ0F3QmxCO0lBeEJhLFdBQUEsS0FBSztRQUFDLElBQUEsU0FBUyxDQXdCNUI7UUF4Qm1CLFdBQUEsU0FBUztZQUFDLElBQUEsU0FBUyxDQXdCdEM7WUF4QjZCLFdBQUEsU0FBUztnQkFFdEM7b0JBQ08sZUFBb0IsSUFBVzt3QkFBWCxTQUFJLEdBQUosSUFBSSxDQUFPO29CQUFJLENBQUM7b0JBQ25DLHFCQUFLLEdBQVo7d0JBQ0MsT0FBTyxJQUFJLENBQUM7b0JBQ2IsQ0FBQztvQkFFTSxzQkFBTSxHQUFiLFVBQWMsS0FBWTt3QkFDekIsT0FBTyxJQUFJLEtBQUssS0FBSyxDQUFDO29CQUN2QixDQUFDO29CQUVNLHVCQUFPLEdBQWQsY0FBMEIsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDO29CQUN6QyxZQUFDO2dCQUFELENBQUMsQUFYRCxJQVdDO2dCQVhZLGVBQUssUUFXakIsQ0FBQTtnQkFFRDtvQkFBMEIsd0JBQVk7b0JBQXRDOztvQkFRQSxDQUFDO29CQU5BLGFBQWE7b0JBQ04sOEJBQWUsR0FBdEI7d0JBQ0MsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFDeEIsQ0FBQztvQkFHRixXQUFDO2dCQUFELENBQUMsQUFSRCxDQUEwQixZQUFZLEdBUXJDO2dCQVJZLGNBQUksT0FRaEIsQ0FBQTtZQUNGLENBQUMsRUF4QjZCLFNBQVMsR0FBVCxtQkFBUyxLQUFULG1CQUFTLFFBd0J0QztRQUFELENBQUMsRUF4Qm1CLFNBQVMsR0FBVCxlQUFTLEtBQVQsZUFBUyxRQXdCNUI7SUFBRCxDQUFDLEVBeEJhLEtBQUssR0FBTCxZQUFLLEtBQUwsWUFBSyxRQXdCbEI7QUFBRCxDQUFDLEVBeEJNLE1BQU0sS0FBTixNQUFNLFFBd0JaIn0=,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXIKLy8gU2NlbmFyaW8gMjogVGVzdCByZWN1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoIGNhc3QgYW5kICJ0aGlzIiBwYXJhbWV0ZXIKCgoKZGVjbGFyZSBtb2R1bGUgU2FtcGxlLlRoaW5nIHsKCglleHBvcnQgaW50ZXJmYWNlIElXaWRnZXQgewoJCWdldERvbU5vZGUoKTogYW55OwoJCWRlc3Ryb3koKTsKCQlnYXIocnVubmVyOih3aWRnZXQ6U2FtcGxlLlRoaW5nLklXaWRnZXQpPT5hbnkpOmFueTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElDb2RlVGhpbmcgewogIAogIAkJZ2V0RG9tTm9kZSgpOiBFbGVtZW50OwoJCQoJCWFkZFdpZGdldCh3aWRnZXRJZDpzdHJpbmcsIHdpZGdldDpJV2lkZ2V0KTsKCgkJCgkJZm9jdXMoKTsgCgkJCgkJLy9hZGRXaWRnZXQod2lkZ2V0OiBTYW1wbGUuVGhpbmcuV2lkZ2V0cy5JV2lkZ2V0KTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElBY3Rpb24gewoJCXJ1bihUaGluZzpJQ29kZVRoaW5nKTpib29sZWFuOwoJCWdldElkKCk6c3RyaW5nOwoJfQkKfQoKbW9kdWxlIFNhbXBsZS5BY3Rpb25zLlRoaW5nLkZpbmQgewoJZXhwb3J0IGNsYXNzIFN0YXJ0RmluZEFjdGlvbiBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JQWN0aW9uIHsKCQkKCQlwdWJsaWMgZ2V0SWQoKSB7IHJldHVybiAieW8iOyB9CgkJCgkJcHVibGljIHJ1bihUaGluZzpTYW1wbGUuVGhpbmcuSUNvZGVUaGluZyk6Ym9vbGVhbiB7CgoJCQlyZXR1cm4gdHJ1ZTsKCQl9Cgl9Cn0KCm1vZHVsZSBTYW1wbGUuVGhpbmcuV2lkZ2V0cyB7CglleHBvcnQgY2xhc3MgRmluZFdpZGdldCBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JV2lkZ2V0IHsKCgkJcHVibGljIGdhcihydW5uZXI6KHdpZGdldDpTYW1wbGUuVGhpbmcuSVdpZGdldCk9PmFueSkgeyBpZiAodHJ1ZSkge3JldHVybiBydW5uZXIodGhpcyk7fX0KCQkJCgkJcHJpdmF0ZSBkb21Ob2RlOmFueSA9IG51bGw7CgkJY29uc3RydWN0b3IocHJpdmF0ZSBjb2RlVGhpbmc6IFNhbXBsZS5UaGluZy5JQ29kZVRoaW5nKSB7CgkJICAgIC8vIHNjZW5hcmlvIDEKCQkgICAgY29kZVRoaW5nLmFkZFdpZGdldCgiYWRkV2lkZ2V0IiwgdGhpcyk7CgkJfQoJCQoJCXB1YmxpYyBnZXREb21Ob2RlKCkgewoJCQlyZXR1cm4gZG9tTm9kZTsKCQl9CgkJCgkJcHVibGljIGRlc3Ryb3koKSB7CgoJCX0KCgl9Cn0KCmludGVyZmFjZSBJTW9kZSB7IGdldEluaXRpYWxTdGF0ZSgpOiBJU3RhdGU7fSAKY2xhc3MgQWJzdHJhY3RNb2RlIGltcGxlbWVudHMgSU1vZGUgeyBwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7IHJldHVybiBudWxsO30gfQoKaW50ZXJmYWNlIElTdGF0ZSB7fQoKaW50ZXJmYWNlIFdpbmRvdyB7CiAgICBvcGVuZXI6IFdpbmRvdzsKfQpkZWNsYXJlIHZhciBzZWxmOiBXaW5kb3c7Cgptb2R1bGUgU2FtcGxlLlRoaW5nLkxhbmd1YWdlcy5QbGFpblRleHQgewoJCglleHBvcnQgY2xhc3MgU3RhdGUgaW1wbGVtZW50cyBJU3RhdGUgewkJCiAgICAgICAgY29uc3RydWN0b3IocHJpdmF0ZSBtb2RlOiBJTW9kZSkgeyB9CgkJcHVibGljIGNsb25lKCk6SVN0YXRlIHsKCQkJcmV0dXJuIHRoaXM7CgkJfQoKCQlwdWJsaWMgZXF1YWxzKG90aGVyOklTdGF0ZSk6Ym9vbGVhbiB7CgkJCXJldHVybiB0aGlzID09PSBvdGhlcjsKCQl9CgkJCgkJcHVibGljIGdldE1vZGUoKTogSU1vZGUgeyByZXR1cm4gbW9kZTsgfQoJfQoJCglleHBvcnQgY2xhc3MgTW9kZSBleHRlbmRzIEFic3RyYWN0TW9kZSB7CgoJCS8vIHNjZW5hcmlvIDIKCQlwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7CgkJCXJldHVybiBuZXcgU3RhdGUoc2VsZik7CgkJfQoKCgl9Cn0KCg==
+//// https://sokra.github.io/source-map-visualization#base64,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXINCi8vIFNjZW5hcmlvIDI6IFRlc3QgcmVjdXJzaXZlIGZ1bmN0aW9uIGNhbGwgd2l0aCBjYXN0IGFuZCAidGhpcyIgcGFyYW1ldGVyDQp2YXIgX19leHRlbmRzID0gKHRoaXMgJiYgdGhpcy5fX2V4dGVuZHMpIHx8IChmdW5jdGlvbiAoKSB7DQogICAgdmFyIGV4dGVuZFN0YXRpY3MgPSBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBleHRlbmRTdGF0aWNzID0gT2JqZWN0LnNldFByb3RvdHlwZU9mIHx8DQogICAgICAgICAgICAoeyBfX3Byb3RvX186IFtdIH0gaW5zdGFuY2VvZiBBcnJheSAmJiBmdW5jdGlvbiAoZCwgYikgeyBkLl9fcHJvdG9fXyA9IGI7IH0pIHx8DQogICAgICAgICAgICBmdW5jdGlvbiAoZCwgYikgeyBmb3IgKHZhciBwIGluIGIpIGlmIChPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGwoYiwgcCkpIGRbcF0gPSBiW3BdOyB9Ow0KICAgICAgICByZXR1cm4gZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICB9Ow0KICAgIHJldHVybiBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBpZiAodHlwZW9mIGIgIT09ICJmdW5jdGlvbiIgJiYgYiAhPT0gbnVsbCkNCiAgICAgICAgICAgIHRocm93IG5ldyBUeXBlRXJyb3IoIkNsYXNzIGV4dGVuZHMgdmFsdWUgIiArIFN0cmluZyhiKSArICIgaXMgbm90IGEgY29uc3RydWN0b3Igb3IgbnVsbCIpOw0KICAgICAgICBleHRlbmRTdGF0aWNzKGQsIGIpOw0KICAgICAgICBmdW5jdGlvbiBfXygpIHsgdGhpcy5jb25zdHJ1Y3RvciA9IGQ7IH0NCiAgICAgICAgZC5wcm90b3R5cGUgPSBiID09PSBudWxsID8gT2JqZWN0LmNyZWF0ZShiKSA6IChfXy5wcm90b3R5cGUgPSBiLnByb3RvdHlwZSwgbmV3IF9fKCkpOw0KICAgIH07DQp9KSgpOw0KdmFyIFNhbXBsZTsNCihmdW5jdGlvbiAoU2FtcGxlKSB7DQogICAgdmFyIEFjdGlvbnM7DQogICAgKGZ1bmN0aW9uIChBY3Rpb25zKSB7DQogICAgICAgIHZhciBUaGluZzsNCiAgICAgICAgKGZ1bmN0aW9uIChUaGluZ18xKSB7DQogICAgICAgICAgICB2YXIgRmluZDsNCiAgICAgICAgICAgIChmdW5jdGlvbiAoRmluZCkgew0KICAgICAgICAgICAgICAgIHZhciBTdGFydEZpbmRBY3Rpb24gPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uIFN0YXJ0RmluZEFjdGlvbigpIHsNCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICBTdGFydEZpbmRBY3Rpb24ucHJvdG90eXBlLmdldElkID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gInlvIjsgfTsNCiAgICAgICAgICAgICAgICAgICAgU3RhcnRGaW5kQWN0aW9uLnByb3RvdHlwZS5ydW4gPSBmdW5jdGlvbiAoVGhpbmcpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOw0KICAgICAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gU3RhcnRGaW5kQWN0aW9uOw0KICAgICAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICAgICAgRmluZC5TdGFydEZpbmRBY3Rpb24gPSBTdGFydEZpbmRBY3Rpb247DQogICAgICAgICAgICB9KShGaW5kID0gVGhpbmdfMS5GaW5kIHx8IChUaGluZ18xLkZpbmQgPSB7fSkpOw0KICAgICAgICB9KShUaGluZyA9IEFjdGlvbnMuVGhpbmcgfHwgKEFjdGlvbnMuVGhpbmcgPSB7fSkpOw0KICAgIH0pKEFjdGlvbnMgPSBTYW1wbGUuQWN0aW9ucyB8fCAoU2FtcGxlLkFjdGlvbnMgPSB7fSkpOw0KfSkoU2FtcGxlIHx8IChTYW1wbGUgPSB7fSkpOw0KKGZ1bmN0aW9uIChTYW1wbGUpIHsNCiAgICB2YXIgVGhpbmc7DQogICAgKGZ1bmN0aW9uIChUaGluZykgew0KICAgICAgICB2YXIgV2lkZ2V0czsNCiAgICAgICAgKGZ1bmN0aW9uIChXaWRnZXRzKSB7DQogICAgICAgICAgICB2YXIgRmluZFdpZGdldCA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICBmdW5jdGlvbiBGaW5kV2lkZ2V0KGNvZGVUaGluZykgew0KICAgICAgICAgICAgICAgICAgICB0aGlzLmNvZGVUaGluZyA9IGNvZGVUaGluZzsNCiAgICAgICAgICAgICAgICAgICAgdGhpcy5kb21Ob2RlID0gbnVsbDsNCiAgICAgICAgICAgICAgICAgICAgLy8gc2NlbmFyaW8gMQ0KICAgICAgICAgICAgICAgICAgICBjb2RlVGhpbmcuYWRkV2lkZ2V0KCJhZGRXaWRnZXQiLCB0aGlzKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgRmluZFdpZGdldC5wcm90b3R5cGUuZ2FyID0gZnVuY3Rpb24gKHJ1bm5lcikgeyBpZiAodHJ1ZSkgew0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gcnVubmVyKHRoaXMpOw0KICAgICAgICAgICAgICAgIH0gfTsNCiAgICAgICAgICAgICAgICBGaW5kV2lkZ2V0LnByb3RvdHlwZS5nZXREb21Ob2RlID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gZG9tTm9kZTsNCiAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgIEZpbmRXaWRnZXQucHJvdG90eXBlLmRlc3Ryb3kgPSBmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICByZXR1cm4gRmluZFdpZGdldDsNCiAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICBXaWRnZXRzLkZpbmRXaWRnZXQgPSBGaW5kV2lkZ2V0Ow0KICAgICAgICB9KShXaWRnZXRzID0gVGhpbmcuV2lkZ2V0cyB8fCAoVGhpbmcuV2lkZ2V0cyA9IHt9KSk7DQogICAgfSkoVGhpbmcgPSBTYW1wbGUuVGhpbmcgfHwgKFNhbXBsZS5UaGluZyA9IHt9KSk7DQp9KShTYW1wbGUgfHwgKFNhbXBsZSA9IHt9KSk7DQp2YXIgQWJzdHJhY3RNb2RlID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEFic3RyYWN0TW9kZSgpIHsNCiAgICB9DQogICAgQWJzdHJhY3RNb2RlLnByb3RvdHlwZS5nZXRJbml0aWFsU3RhdGUgPSBmdW5jdGlvbiAoKSB7IHJldHVybiBudWxsOyB9Ow0KICAgIHJldHVybiBBYnN0cmFjdE1vZGU7DQp9KCkpOw0KKGZ1bmN0aW9uIChTYW1wbGUpIHsNCiAgICB2YXIgVGhpbmc7DQogICAgKGZ1bmN0aW9uIChUaGluZykgew0KICAgICAgICB2YXIgTGFuZ3VhZ2VzOw0KICAgICAgICAoZnVuY3Rpb24gKExhbmd1YWdlcykgew0KICAgICAgICAgICAgdmFyIFBsYWluVGV4dDsNCiAgICAgICAgICAgIChmdW5jdGlvbiAoUGxhaW5UZXh0KSB7DQogICAgICAgICAgICAgICAgdmFyIFN0YXRlID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBTdGF0ZShtb2RlKSB7DQogICAgICAgICAgICAgICAgICAgICAgICB0aGlzLm1vZGUgPSBtb2RlOw0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgIFN0YXRlLnByb3RvdHlwZS5jbG9uZSA9IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0aGlzOw0KICAgICAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgICAgICBTdGF0ZS5wcm90b3R5cGUuZXF1YWxzID0gZnVuY3Rpb24gKG90aGVyKSB7DQogICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcyA9PT0gb3RoZXI7DQogICAgICAgICAgICAgICAgICAgIH07DQogICAgICAgICAgICAgICAgICAgIFN0YXRlLnByb3RvdHlwZS5nZXRNb2RlID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gbW9kZTsgfTsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0YXRlOw0KICAgICAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICAgICAgUGxhaW5UZXh0LlN0YXRlID0gU3RhdGU7DQogICAgICAgICAgICAgICAgdmFyIE1vZGUgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoX3N1cGVyKSB7DQogICAgICAgICAgICAgICAgICAgIF9fZXh0ZW5kcyhNb2RlLCBfc3VwZXIpOw0KICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBNb2RlKCkgew0KICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIF9zdXBlciAhPT0gbnVsbCAmJiBfc3VwZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKSB8fCB0aGlzOw0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgIC8vIHNjZW5hcmlvIDINCiAgICAgICAgICAgICAgICAgICAgTW9kZS5wcm90b3R5cGUuZ2V0SW5pdGlhbFN0YXRlID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBTdGF0ZShzZWxmKTsNCiAgICAgICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE1vZGU7DQogICAgICAgICAgICAgICAgfShBYnN0cmFjdE1vZGUpKTsNCiAgICAgICAgICAgICAgICBQbGFpblRleHQuTW9kZSA9IE1vZGU7DQogICAgICAgICAgICB9KShQbGFpblRleHQgPSBMYW5ndWFnZXMuUGxhaW5UZXh0IHx8IChMYW5ndWFnZXMuUGxhaW5UZXh0ID0ge30pKTsNCiAgICAgICAgfSkoTGFuZ3VhZ2VzID0gVGhpbmcuTGFuZ3VhZ2VzIHx8IChUaGluZy5MYW5ndWFnZXMgPSB7fSkpOw0KICAgIH0pKFRoaW5nID0gU2FtcGxlLlRoaW5nIHx8IChTYW1wbGUuVGhpbmcgPSB7fSkpOw0KfSkoU2FtcGxlIHx8IChTYW1wbGUgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9cmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGlFQUFpRTtBQUNqRSwwRUFBMEU7Ozs7Ozs7Ozs7Ozs7Ozs7QUE4QjFFLElBQU8sTUFBTSxDQVVaO0FBVkQsV0FBTyxNQUFNO0lBQUMsSUFBQSxPQUFPLENBVXBCO0lBVmEsV0FBQSxPQUFPO1FBQUMsSUFBQSxLQUFLLENBVTFCO1FBVnFCLFdBQUEsT0FBSztZQUFDLElBQUEsSUFBSSxDQVUvQjtZQVYyQixXQUFBLElBQUk7Z0JBQy9CO29CQUFBO29CQVFBLENBQUM7b0JBTk8sK0JBQUssR0FBWixjQUFpQixPQUFPLElBQUksQ0FBQyxDQUFDLENBQUM7b0JBRXhCLDZCQUFHLEdBQVYsVUFBVyxLQUE2Qjt3QkFFdkMsT0FBTyxJQUFJLENBQUM7b0JBQ2IsQ0FBQztvQkFDRixzQkFBQztnQkFBRCxDQUFDLEFBUkQsSUFRQztnQkFSWSxvQkFBZSxrQkFRM0IsQ0FBQTtZQUNGLENBQUMsRUFWMkIsSUFBSSxHQUFKLFlBQUksS0FBSixZQUFJLFFBVS9CO1FBQUQsQ0FBQyxFQVZxQixLQUFLLEdBQUwsYUFBSyxLQUFMLGFBQUssUUFVMUI7SUFBRCxDQUFDLEVBVmEsT0FBTyxHQUFQLGNBQU8sS0FBUCxjQUFPLFFBVXBCO0FBQUQsQ0FBQyxFQVZNLE1BQU0sS0FBTixNQUFNLFFBVVo7QUFFRCxXQUFPLE1BQU07SUFBQyxJQUFBLEtBQUssQ0FvQmxCO0lBcEJhLFdBQUEsS0FBSztRQUFDLElBQUEsT0FBTyxDQW9CMUI7UUFwQm1CLFdBQUEsT0FBTztZQUMxQjtnQkFLQyxvQkFBb0IsU0FBa0M7b0JBQWxDLGNBQVMsR0FBVCxTQUFTLENBQXlCO29CQUQ5QyxZQUFPLEdBQU8sSUFBSSxDQUFDO29CQUV2QixhQUFhO29CQUNiLFNBQVMsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFDO2dCQUMzQyxDQUFDO2dCQU5NLHdCQUFHLEdBQVYsVUFBVyxNQUF5QyxJQUFJLElBQUksSUFBSSxFQUFFO29CQUFDLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO2lCQUFDLENBQUEsQ0FBQztnQkFRbEYsK0JBQVUsR0FBakI7b0JBQ0MsT0FBTyxPQUFPLENBQUM7Z0JBQ2hCLENBQUM7Z0JBRU0sNEJBQU8sR0FBZDtnQkFFQSxDQUFDO2dCQUVGLGlCQUFDO1lBQUQsQ0FBQyxBQWxCRCxJQWtCQztZQWxCWSxrQkFBVSxhQWtCdEIsQ0FBQTtRQUNGLENBQUMsRUFwQm1CLE9BQU8sR0FBUCxhQUFPLEtBQVAsYUFBTyxRQW9CMUI7SUFBRCxDQUFDLEVBcEJhLEtBQUssR0FBTCxZQUFLLEtBQUwsWUFBSyxRQW9CbEI7QUFBRCxDQUFDLEVBcEJNLE1BQU0sS0FBTixNQUFNLFFBb0JaO0FBR0Q7SUFBQTtJQUF1RixDQUFDO0lBQTNDLHNDQUFlLEdBQXRCLGNBQW1DLE9BQU8sSUFBSSxDQUFDLENBQUEsQ0FBQztJQUFDLG1CQUFDO0FBQUQsQ0FBQyxBQUF4RixJQUF3RjtBQVN4RixXQUFPLE1BQU07SUFBQyxJQUFBLEtBQUssQ0F3QmxCO0lBeEJhLFdBQUEsS0FBSztRQUFDLElBQUEsU0FBUyxDQXdCNUI7UUF4Qm1CLFdBQUEsU0FBUztZQUFDLElBQUEsU0FBUyxDQXdCdEM7WUF4QjZCLFdBQUEsU0FBUztnQkFFdEM7b0JBQ08sZUFBb0IsSUFBVzt3QkFBWCxTQUFJLEdBQUosSUFBSSxDQUFPO29CQUFJLENBQUM7b0JBQ25DLHFCQUFLLEdBQVo7d0JBQ0MsT0FBTyxJQUFJLENBQUM7b0JBQ2IsQ0FBQztvQkFFTSxzQkFBTSxHQUFiLFVBQWMsS0FBWTt3QkFDekIsT0FBTyxJQUFJLEtBQUssS0FBSyxDQUFDO29CQUN2QixDQUFDO29CQUVNLHVCQUFPLEdBQWQsY0FBMEIsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDO29CQUN6QyxZQUFDO2dCQUFELENBQUMsQUFYRCxJQVdDO2dCQVhZLGVBQUssUUFXakIsQ0FBQTtnQkFFRDtvQkFBMEIsd0JBQVk7b0JBQXRDOztvQkFRQSxDQUFDO29CQU5BLGFBQWE7b0JBQ04sOEJBQWUsR0FBdEI7d0JBQ0MsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFDeEIsQ0FBQztvQkFHRixXQUFDO2dCQUFELENBQUMsQUFSRCxDQUEwQixZQUFZLEdBUXJDO2dCQVJZLGNBQUksT0FRaEIsQ0FBQTtZQUNGLENBQUMsRUF4QjZCLFNBQVMsR0FBVCxtQkFBUyxLQUFULG1CQUFTLFFBd0J0QztRQUFELENBQUMsRUF4Qm1CLFNBQVMsR0FBVCxlQUFTLEtBQVQsZUFBUyxRQXdCNUI7SUFBRCxDQUFDLEVBeEJhLEtBQUssR0FBTCxZQUFLLEtBQUwsWUFBSyxRQXdCbEI7QUFBRCxDQUFDLEVBeEJNLE1BQU0sS0FBTixNQUFNLFFBd0JaIn0=,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXIKLy8gU2NlbmFyaW8gMjogVGVzdCByZWN1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoIGNhc3QgYW5kICJ0aGlzIiBwYXJhbWV0ZXIKCgoKZGVjbGFyZSBtb2R1bGUgU2FtcGxlLlRoaW5nIHsKCglleHBvcnQgaW50ZXJmYWNlIElXaWRnZXQgewoJCWdldERvbU5vZGUoKTogYW55OwoJCWRlc3Ryb3koKTsKCQlnYXIocnVubmVyOih3aWRnZXQ6U2FtcGxlLlRoaW5nLklXaWRnZXQpPT5hbnkpOmFueTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElDb2RlVGhpbmcgewogIAogIAkJZ2V0RG9tTm9kZSgpOiBFbGVtZW50OwoJCQoJCWFkZFdpZGdldCh3aWRnZXRJZDpzdHJpbmcsIHdpZGdldDpJV2lkZ2V0KTsKCgkJCgkJZm9jdXMoKTsgCgkJCgkJLy9hZGRXaWRnZXQod2lkZ2V0OiBTYW1wbGUuVGhpbmcuV2lkZ2V0cy5JV2lkZ2V0KTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElBY3Rpb24gewoJCXJ1bihUaGluZzpJQ29kZVRoaW5nKTpib29sZWFuOwoJCWdldElkKCk6c3RyaW5nOwoJfQkKfQoKbW9kdWxlIFNhbXBsZS5BY3Rpb25zLlRoaW5nLkZpbmQgewoJZXhwb3J0IGNsYXNzIFN0YXJ0RmluZEFjdGlvbiBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JQWN0aW9uIHsKCQkKCQlwdWJsaWMgZ2V0SWQoKSB7IHJldHVybiAieW8iOyB9CgkJCgkJcHVibGljIHJ1bihUaGluZzpTYW1wbGUuVGhpbmcuSUNvZGVUaGluZyk6Ym9vbGVhbiB7CgoJCQlyZXR1cm4gdHJ1ZTsKCQl9Cgl9Cn0KCm1vZHVsZSBTYW1wbGUuVGhpbmcuV2lkZ2V0cyB7CglleHBvcnQgY2xhc3MgRmluZFdpZGdldCBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JV2lkZ2V0IHsKCgkJcHVibGljIGdhcihydW5uZXI6KHdpZGdldDpTYW1wbGUuVGhpbmcuSVdpZGdldCk9PmFueSkgeyBpZiAodHJ1ZSkge3JldHVybiBydW5uZXIodGhpcyk7fX0KCQkJCgkJcHJpdmF0ZSBkb21Ob2RlOmFueSA9IG51bGw7CgkJY29uc3RydWN0b3IocHJpdmF0ZSBjb2RlVGhpbmc6IFNhbXBsZS5UaGluZy5JQ29kZVRoaW5nKSB7CgkJICAgIC8vIHNjZW5hcmlvIDEKCQkgICAgY29kZVRoaW5nLmFkZFdpZGdldCgiYWRkV2lkZ2V0IiwgdGhpcyk7CgkJfQoJCQoJCXB1YmxpYyBnZXREb21Ob2RlKCkgewoJCQlyZXR1cm4gZG9tTm9kZTsKCQl9CgkJCgkJcHVibGljIGRlc3Ryb3koKSB7CgoJCX0KCgl9Cn0KCmludGVyZmFjZSBJTW9kZSB7IGdldEluaXRpYWxTdGF0ZSgpOiBJU3RhdGU7fSAKY2xhc3MgQWJzdHJhY3RNb2RlIGltcGxlbWVudHMgSU1vZGUgeyBwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7IHJldHVybiBudWxsO30gfQoKaW50ZXJmYWNlIElTdGF0ZSB7fQoKaW50ZXJmYWNlIFdpbmRvdyB7CiAgICBvcGVuZXI6IFdpbmRvdzsKfQpkZWNsYXJlIHZhciBzZWxmOiBXaW5kb3c7Cgptb2R1bGUgU2FtcGxlLlRoaW5nLkxhbmd1YWdlcy5QbGFpblRleHQgewoJCglleHBvcnQgY2xhc3MgU3RhdGUgaW1wbGVtZW50cyBJU3RhdGUgewkJCiAgICAgICAgY29uc3RydWN0b3IocHJpdmF0ZSBtb2RlOiBJTW9kZSkgeyB9CgkJcHVibGljIGNsb25lKCk6SVN0YXRlIHsKCQkJcmV0dXJuIHRoaXM7CgkJfQoKCQlwdWJsaWMgZXF1YWxzKG90aGVyOklTdGF0ZSk6Ym9vbGVhbiB7CgkJCXJldHVybiB0aGlzID09PSBvdGhlcjsKCQl9CgkJCgkJcHVibGljIGdldE1vZGUoKTogSU1vZGUgeyByZXR1cm4gbW9kZTsgfQoJfQoJCglleHBvcnQgY2xhc3MgTW9kZSBleHRlbmRzIEFic3RyYWN0TW9kZSB7CgoJCS8vIHNjZW5hcmlvIDIKCQlwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7CgkJCXJldHVybiBuZXcgU3RhdGUoc2VsZik7CgkJfQoKCgl9Cn0KCg==
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
index d8ba963d4b4..5be5cb3c912 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -35,7 +35,7 @@ sourceFile:recursiveClassReferenceTest.ts
 >>>    };
 >>>    return function (d, b) {
 >>>        if (typeof b !== "function" && b !== null)
->>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveComplicatedClasses.js b/tests/baselines/reference/recursiveComplicatedClasses.js
index 947c90cee7d..17c3614a739 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.js
+++ b/tests/baselines/reference/recursiveComplicatedClasses.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4310c409b3d..97a88755bf8 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
@@ -39,7 +39,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 faafcda2a8b..b92c9e08c62 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 aaeca97d0b2..ab84eb8dfb8 100644
--- a/tests/baselines/reference/reexportDefaultIsCallable.js
+++ b/tests/baselines/reference/reexportDefaultIsCallable.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 510ba54b19c..eca9f466543 100644
--- a/tests/baselines/reference/reexportedMissingAlias.js
+++ b/tests/baselines/reference/reexportedMissingAlias.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7d65aab9b0b..dcc43ff065f 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -1029,7 +1029,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c232a41ab7f..a474fadb667 100644
--- a/tests/baselines/reference/returnInConstructor1.js
+++ b/tests/baselines/reference/returnInConstructor1.js
@@ -76,7 +76,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ae9ef48f325..7fc46e08153 100644
--- a/tests/baselines/reference/returnStatements.js
+++ b/tests/baselines/reference/returnStatements.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 25d43a6aaaa..b735359dc70 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a05928168c8..da16d876181 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 09096f1c5dc..a70487f9557 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d8ea28b39fe..b3e65d7ece2 100644
--- a/tests/baselines/reference/scopeTests.js
+++ b/tests/baselines/reference/scopeTests.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d246576cd95..6e4284a2b2a 100644
--- a/tests/baselines/reference/shadowPrivateMembers.js
+++ b/tests/baselines/reference/shadowPrivateMembers.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 db7d248222d..235a8da5b11 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1b01bf909f7..5d54d7ce505 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
@@ -1,3 +1,3 @@
 //// [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"}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBiICsgIiBpcyBub3QgYSBjb25zdHJ1Y3RvciBvciBudWxsIik7DQogICAgICAgIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgICAgIGZ1bmN0aW9uIF9fKCkgeyB0aGlzLmNvbnN0cnVjdG9yID0gZDsgfQ0KICAgICAgICBkLnByb3RvdHlwZSA9IGIgPT09IG51bGwgPyBPYmplY3QuY3JlYXRlKGIpIDogKF9fLnByb3RvdHlwZSA9IGIucHJvdG90eXBlLCBuZXcgX18oKSk7DQogICAgfTsNCn0pKCk7DQp2YXIgQWJzdHJhY3RHcmVldGVyID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEFic3RyYWN0R3JlZXRlcigpIHsNCiAgICB9DQogICAgcmV0dXJuIEFic3RyYWN0R3JlZXRlcjsNCn0oKSk7DQp2YXIgR3JlZXRlciA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uIChfc3VwZXIpIHsNCiAgICBfX2V4dGVuZHMoR3JlZXRlciwgX3N1cGVyKTsNCiAgICBmdW5jdGlvbiBHcmVldGVyKCkgew0KICAgICAgICB2YXIgX3RoaXMgPSBfc3VwZXIgIT09IG51bGwgJiYgX3N1cGVyLmFwcGx5KHRoaXMsIGFyZ3VtZW50cykgfHwgdGhpczsNCiAgICAgICAgX3RoaXMuYSA9IDEwOw0KICAgICAgICBfdGhpcy5uYW1lQSA9ICJUZW4iOw0KICAgICAgICByZXR1cm4gX3RoaXM7DQogICAgfQ0KICAgIHJldHVybiBHcmVldGVyOw0KfShBYnN0cmFjdEdyZWV0ZXIpKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZU1hcFZhbGlkYXRpb25DbGFzc1dpdGhEZWZhdWx0Q29uc3RydWN0b3JBbmRFeHRlbmRzQ2xhdXNlLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkNsYXNzV2l0aERlZmF1bHRDb25zdHJ1Y3RvckFuZEV4dGVuZHNDbGF1c2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzb3VyY2VNYXBWYWxpZGF0aW9uQ2xhc3NXaXRoRGVmYXVsdENvbnN0cnVjdG9yQW5kRXh0ZW5kc0NsYXVzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQTtJQUFBO0lBQ0EsQ0FBQztJQUFELHNCQUFDO0FBQUQsQ0FBQyxBQURELElBQ0M7QUFFRDtJQUFzQiwyQkFBZTtJQUFyQztRQUFBLHFFQUdDO1FBRlUsT0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNQLFdBQUssR0FBRyxLQUFLLENBQUM7O0lBQ3pCLENBQUM7SUFBRCxjQUFDO0FBQUQsQ0FBQyxBQUhELENBQXNCLGVBQWUsR0FHcEMifQ==,Y2xhc3MgQWJzdHJhY3RHcmVldGVyIHsKfQoKY2xhc3MgR3JlZXRlciBleHRlbmRzIEFic3RyYWN0R3JlZXRlciB7CiAgICBwdWJsaWMgYSA9IDEwOwogICAgcHVibGljIG5hbWVBID0gIlRlbiI7Cn0=
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIF9fZXh0ZW5kcyA9ICh0aGlzICYmIHRoaXMuX19leHRlbmRzKSB8fCAoZnVuY3Rpb24gKCkgew0KICAgIHZhciBleHRlbmRTdGF0aWNzID0gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyA9IE9iamVjdC5zZXRQcm90b3R5cGVPZiB8fA0KICAgICAgICAgICAgKHsgX19wcm90b19fOiBbXSB9IGluc3RhbmNlb2YgQXJyYXkgJiYgZnVuY3Rpb24gKGQsIGIpIHsgZC5fX3Byb3RvX18gPSBiOyB9KSB8fA0KICAgICAgICAgICAgZnVuY3Rpb24gKGQsIGIpIHsgZm9yICh2YXIgcCBpbiBiKSBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIHApKSBkW3BdID0gYltwXTsgfTsNCiAgICAgICAgcmV0dXJuIGV4dGVuZFN0YXRpY3MoZCwgYik7DQogICAgfTsNCiAgICByZXR1cm4gZnVuY3Rpb24gKGQsIGIpIHsNCiAgICAgICAgaWYgKHR5cGVvZiBiICE9PSAiZnVuY3Rpb24iICYmIGIgIT09IG51bGwpDQogICAgICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCJDbGFzcyBleHRlbmRzIHZhbHVlICIgKyBTdHJpbmcoYikgKyAiIGlzIG5vdCBhIGNvbnN0cnVjdG9yIG9yIG51bGwiKTsNCiAgICAgICAgZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICAgICAgZnVuY3Rpb24gX18oKSB7IHRoaXMuY29uc3RydWN0b3IgPSBkOyB9DQogICAgICAgIGQucHJvdG90eXBlID0gYiA9PT0gbnVsbCA/IE9iamVjdC5jcmVhdGUoYikgOiAoX18ucHJvdG90eXBlID0gYi5wcm90b3R5cGUsIG5ldyBfXygpKTsNCiAgICB9Ow0KfSkoKTsNCnZhciBBYnN0cmFjdEdyZWV0ZXIgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQWJzdHJhY3RHcmVldGVyKCkgew0KICAgIH0NCiAgICByZXR1cm4gQWJzdHJhY3RHcmVldGVyOw0KfSgpKTsNCnZhciBHcmVldGVyID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKF9zdXBlcikgew0KICAgIF9fZXh0ZW5kcyhHcmVldGVyLCBfc3VwZXIpOw0KICAgIGZ1bmN0aW9uIEdyZWV0ZXIoKSB7DQogICAgICAgIHZhciBfdGhpcyA9IF9zdXBlciAhPT0gbnVsbCAmJiBfc3VwZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKSB8fCB0aGlzOw0KICAgICAgICBfdGhpcy5hID0gMTA7DQogICAgICAgIF90aGlzLm5hbWVBID0gIlRlbiI7DQogICAgICAgIHJldHVybiBfdGhpczsNCiAgICB9DQogICAgcmV0dXJuIEdyZWV0ZXI7DQp9KEFic3RyYWN0R3JlZXRlcikpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwVmFsaWRhdGlvbkNsYXNzV2l0aERlZmF1bHRDb25zdHJ1Y3RvckFuZEV4dGVuZHNDbGF1c2UuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkNsYXNzV2l0aERlZmF1bHRDb25zdHJ1Y3RvckFuZEV4dGVuZHNDbGF1c2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzb3VyY2VNYXBWYWxpZGF0aW9uQ2xhc3NXaXRoRGVmYXVsdENvbnN0cnVjdG9yQW5kRXh0ZW5kc0NsYXVzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQTtJQUFBO0lBQ0EsQ0FBQztJQUFELHNCQUFDO0FBQUQsQ0FBQyxBQURELElBQ0M7QUFFRDtJQUFzQiwyQkFBZTtJQUFyQztRQUFBLHFFQUdDO1FBRlUsT0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNQLFdBQUssR0FBRyxLQUFLLENBQUM7O0lBQ3pCLENBQUM7SUFBRCxjQUFDO0FBQUQsQ0FBQyxBQUhELENBQXNCLGVBQWUsR0FHcEMifQ==,Y2xhc3MgQWJzdHJhY3RHcmVldGVyIHsKfQoKY2xhc3MgR3JlZXRlciBleHRlbmRzIEFic3RyYWN0R3JlZXRlciB7CiAgICBwdWJsaWMgYSA9IDEwOwogICAgcHVibGljIG5hbWVBID0gIlRlbiI7Cn0=
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
index 2c1cd06769e..56ee6af79da 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 >>>    };
 >>>    return function (d, b) {
 >>>        if (typeof b !== "function" && b !== null)
->>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/specializedInheritedConstructors1.js b/tests/baselines/reference/specializedInheritedConstructors1.js
index d63203bbdf7..3b21860e9e0 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.js
+++ b/tests/baselines/reference/specializedInheritedConstructors1.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f4e074b4b0b..f3ea7a4c971 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.js
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/spellingSuggestionJSXAttribute.js b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
index fb24d9d4cf8..2355c83a8be 100644
--- a/tests/baselines/reference/spellingSuggestionJSXAttribute.js
+++ b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 460b19551f5..5376c1118c1 100644
--- a/tests/baselines/reference/staticFactory1.js
+++ b/tests/baselines/reference/staticFactory1.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9e94569562b..42e5c817459 100644
--- a/tests/baselines/reference/staticInheritance.js
+++ b/tests/baselines/reference/staticInheritance.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 63e957c42e5..b1ad3b1d870 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 aa99f54d13a..3b1772e7bff 100644
--- a/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
+++ b/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ec6cbac7380..170879d4b64 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a59fa380922..85d5d3eecbf 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -70,7 +70,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d4036f2b95b..993ee3a03c3 100644
--- a/tests/baselines/reference/strictModeReservedWord.js
+++ b/tests/baselines/reference/strictModeReservedWord.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3cff7591111..d8ec0ec3e7f 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8a96be1982d..27aebdb3a40 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e1f7a250d79..41b424cbcf6 100644
--- a/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
+++ b/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8e9f1c9fc73..7a1aaca2e1f 100644
--- a/tests/baselines/reference/subtypesOfTypeParameter.js
+++ b/tests/baselines/reference/subtypesOfTypeParameter.js
@@ -116,7 +116,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d80cc69a8ee..4f432b28654 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
@@ -178,7 +178,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 04ef34cf8aa..b1f8ad190a3 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
@@ -89,7 +89,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 399818ced63..f3a30bfcf34 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
@@ -168,7 +168,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 69f30bc01c9..17bb6a0b46a 100644
--- a/tests/baselines/reference/subtypingTransitivity.js
+++ b/tests/baselines/reference/subtypingTransitivity.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 748f76f6363..410a44f8695 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -183,7 +183,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 403970f0b30..8697d254d4a 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -130,7 +130,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 188c128fe4b..afc642a6374 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.js
@@ -122,7 +122,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d3d7447194b..4ed46be2b80 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js
@@ -183,7 +183,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 33d51530774..26c3a0def74 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js
@@ -132,7 +132,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6bf3b460d77..278e6fbdbfa 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js
@@ -122,7 +122,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cace94f205e..95d5630b1ec 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.js
@@ -60,7 +60,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 013ad52177f..258d1d6a286 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.js
@@ -63,7 +63,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6594195161a..0bde316ff5c 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1af397c4823..06b7da86a5f 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e6b655237b7..9f1c1b0c7db 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9fcb182ba90..d7136d0cb37 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers.js
@@ -77,7 +77,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c3e0d84f2ee..ada2b9bd16b 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 251ff75c52d..8779a962749 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e0b01ee717b..107bf832809 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
@@ -72,7 +72,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d6436006e1e..6848a70a581 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer.js
@@ -51,7 +51,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d49b1909fef..7883e18be69 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3827820a631..074f42029f1 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d4d472eee68..3a145bccb64 100644
--- a/tests/baselines/reference/super.js
+++ b/tests/baselines/reference/super.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 93f8bc494be..10844171c54 100644
--- a/tests/baselines/reference/super1.js
+++ b/tests/baselines/reference/super1.js
@@ -76,7 +76,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 059b0c624f5..5db836a3be4 100644
--- a/tests/baselines/reference/super2.js
+++ b/tests/baselines/reference/super2.js
@@ -60,7 +60,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 858599210b2..18b7fe9ca75 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fd8b9108a64..5edae76957a 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 33d0a995d48..6082fb489c2 100644
--- a/tests/baselines/reference/superAccessCastedCall.js
+++ b/tests/baselines/reference/superAccessCastedCall.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3bab5d4a3d8..3259141597c 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.js
+++ b/tests/baselines/reference/superAccessInFatArrow1.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5df7efcea28..4c32ae07771 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.js
+++ b/tests/baselines/reference/superCallArgsMustMatch.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d98e3ee3ec0..e1e31d7ae69 100644
--- a/tests/baselines/reference/superCallAssignResult.js
+++ b/tests/baselines/reference/superCallAssignResult.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8cd8afdf8c5..014a250c565 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 486b66e4e2c..8fe7512db68 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3e9bf9e59ff..dfc4d0b8623 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 36aa6e89c1e..4315fddc993 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 302b0d8048b..788fd881556 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.js
@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 34edf8a2463..67585f63ef7 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 44e119cfd48..23b46db6641 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 931bf9cdf0a..47182d35913 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1844d3928c9..e76639c1a82 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 356f6552da9..ced02033b49 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d53229c66a6..8654d208a52 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 16e3f52a292..c1420e7a49b 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 693df8a85d8..d8480c4e5f3 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 96cc1483fa6..2a99e059c96 100644
--- a/tests/baselines/reference/superCallInNonStaticMethod.js
+++ b/tests/baselines/reference/superCallInNonStaticMethod.js
@@ -60,7 +60,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 11356e95167..136c8805a69 100644
--- a/tests/baselines/reference/superCallInStaticMethod.js
+++ b/tests/baselines/reference/superCallInStaticMethod.js
@@ -56,7 +56,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6bb6c41575e..05ee3b31b37 100644
--- a/tests/baselines/reference/superCallInsideClassDeclaration.js
+++ b/tests/baselines/reference/superCallInsideClassDeclaration.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 680323e571d..5eb276957b4 100644
--- a/tests/baselines/reference/superCallInsideClassExpression.js
+++ b/tests/baselines/reference/superCallInsideClassExpression.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 382b4d6796c..cb5de68485b 100644
--- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
+++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 07cf32b55e7..6868c153c33 100644
--- a/tests/baselines/reference/superCallOutsideConstructor.js
+++ b/tests/baselines/reference/superCallOutsideConstructor.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6dd011bd669..65c52ace161 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7ea27009ebe..096f2aee06e 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping2.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping2.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b1ecebf4d98..66030ab15a5 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9e1ed5445f1..4ca25eaad55 100644
--- a/tests/baselines/reference/superCallWithCommentEmit01.js
+++ b/tests/baselines/reference/superCallWithCommentEmit01.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 703a2ea65ca..6504638c6f3 100644
--- a/tests/baselines/reference/superCallWithMissingBaseClass.js
+++ b/tests/baselines/reference/superCallWithMissingBaseClass.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 dbb34ad499a..489cc54d2ee 100644
--- a/tests/baselines/reference/superCalls.js
+++ b/tests/baselines/reference/superCalls.js
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cc51d59cc01..2f45e33024f 100644
--- a/tests/baselines/reference/superCallsInConstructor.js
+++ b/tests/baselines/reference/superCallsInConstructor.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fa2c626a0cd..88e2ac11057 100644
--- a/tests/baselines/reference/superElementAccess.js
+++ b/tests/baselines/reference/superElementAccess.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 558493fd28d..5ab2f69aaec 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -61,7 +61,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 67950325de6..80472efcf79 100644
--- a/tests/baselines/reference/superHasMethodsFromMergedInterface.js
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f6c91b74313..7686467c0bb 100644
--- a/tests/baselines/reference/superInCatchBlock1.js
+++ b/tests/baselines/reference/superInCatchBlock1.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e9eb4899b9b..2b51921d4be 100644
--- a/tests/baselines/reference/superInConstructorParam1.js
+++ b/tests/baselines/reference/superInConstructorParam1.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 628da965977..1104ced8658 100644
--- a/tests/baselines/reference/superInLambdas.js
+++ b/tests/baselines/reference/superInLambdas.js
@@ -77,7 +77,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a579d721134..377e1728ee8 100644
--- a/tests/baselines/reference/superInObjectLiterals_ES5.js
+++ b/tests/baselines/reference/superInObjectLiterals_ES5.js
@@ -69,7 +69,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 bf918a40c64..36037c6fb66 100644
--- a/tests/baselines/reference/superNewCall1.js
+++ b/tests/baselines/reference/superNewCall1.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0d97d66a3ff..9fac5b26f30 100644
--- a/tests/baselines/reference/superNoModifiersCrash.js
+++ b/tests/baselines/reference/superNoModifiersCrash.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a6e5cb45095..c41909b6c6c 100644
--- a/tests/baselines/reference/superPropertyAccess.js
+++ b/tests/baselines/reference/superPropertyAccess.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 32e5f3b7ac5..5ea0dc65bac 100644
--- a/tests/baselines/reference/superPropertyAccess1.js
+++ b/tests/baselines/reference/superPropertyAccess1.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 81233cc4d5e..16406589553 100644
--- a/tests/baselines/reference/superPropertyAccess2.js
+++ b/tests/baselines/reference/superPropertyAccess2.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8c3ad67bfa6..b5551a7c00d 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e74a9525382..35b7aa3a9ea 100644
--- a/tests/baselines/reference/superPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/superPropertyAccessInSuperCall01.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0b5091627c6..7cf49fd4bd4 100644
--- a/tests/baselines/reference/superPropertyAccessNoError.js
+++ b/tests/baselines/reference/superPropertyAccessNoError.js
@@ -86,7 +86,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4171627a6ee..ef1d8704aae 100644
--- a/tests/baselines/reference/superPropertyAccess_ES5.js
+++ b/tests/baselines/reference/superPropertyAccess_ES5.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 818db142f41..faa6ba0a588 100644
--- a/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
+++ b/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
@@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c40f1c78ec5..4f9f0c316aa 100644
--- a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a0d3425ff47..1ae389d4fab 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess5.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess5.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 99f4901227a..984c455fd83 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess6.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess6.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c7e01e80ff8..26e34be38ab 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.js
+++ b/tests/baselines/reference/superWithGenericSpecialization.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8e502691d77..24cd2744bc2 100644
--- a/tests/baselines/reference/superWithGenerics.js
+++ b/tests/baselines/reference/superWithGenerics.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 efba7993ad7..5fbfc5dc7b2 100644
--- a/tests/baselines/reference/superWithTypeArgument.js
+++ b/tests/baselines/reference/superWithTypeArgument.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 77c60a0096b..dfbaa09528e 100644
--- a/tests/baselines/reference/superWithTypeArgument2.js
+++ b/tests/baselines/reference/superWithTypeArgument2.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c44d46c99e5..aefd7152b1e 100644
--- a/tests/baselines/reference/superWithTypeArgument3.js
+++ b/tests/baselines/reference/superWithTypeArgument3.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b9085992b00..b7a7779de57 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
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8a764809059..37c24d3e78d 100644
--- a/tests/baselines/reference/switchStatements.js
+++ b/tests/baselines/reference/switchStatements.js
@@ -65,7 +65,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 62f36cd9633..2ec7eb7d142 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -40,7 +40,7 @@ System.register(["./foo"], function (exports_1, context_1) {
         };
         return function (d, b) {
             if (typeof b !== "function" && b !== null)
-                throw new TypeError("Class extends value " + b + " is not a constructor or null");
+                throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
             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 b78cfd54acc..2ae1e1adf67 100644
--- a/tests/baselines/reference/targetTypeBaseCalls.js
+++ b/tests/baselines/reference/targetTypeBaseCalls.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fb1100864a8..85e0b338575 100644
--- a/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
+++ b/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7154dbd01e7..7e6db524586 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -58,7 +58,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 de2224f0296..ef18f01edda 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -59,7 +59,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 96fcc1589b1..d2dfdd9f582 100644
--- a/tests/baselines/reference/thisInSuperCall.js
+++ b/tests/baselines/reference/thisInSuperCall.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7d2869d18f8..f8b19af007e 100644
--- a/tests/baselines/reference/thisInSuperCall1.js
+++ b/tests/baselines/reference/thisInSuperCall1.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 4d527467e52..93f6d55f11f 100644
--- a/tests/baselines/reference/thisInSuperCall2.js
+++ b/tests/baselines/reference/thisInSuperCall2.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 90194b37143..bb3172a8338 100644
--- a/tests/baselines/reference/thisInSuperCall3.js
+++ b/tests/baselines/reference/thisInSuperCall3.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ac3c806f9b0..af04a4a0b62 100644
--- a/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
+++ b/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b0051a35237..d9dd0133db4 100644
--- a/tests/baselines/reference/thisTypeInFunctions.js
+++ b/tests/baselines/reference/thisTypeInFunctions.js
@@ -204,7 +204,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 73f6d091700..3581f2a1ac9 100644
--- a/tests/baselines/reference/thisTypeInFunctions3.js
+++ b/tests/baselines/reference/thisTypeInFunctions3.js
@@ -20,7 +20,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6f440461ea3..de19b3b3aa0 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.js
+++ b/tests/baselines/reference/tsxAttributeResolution15.js
@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 29dc2b128bb..32ae991781a 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.js
+++ b/tests/baselines/reference/tsxAttributeResolution16.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 35b187aa959..e9d25fe9644 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c78f85692b0..6373e69eaa4 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3e47cdc8863..7a26fdced8c 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b4c4586b979..a3c6f046740 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5db7ed55c47..fd89ac24429 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d228f11ea6a..06f76b4fef3 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e68bc2dc498..8749b8e7d00 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 13c3bf87dff..77101cc1b1b 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d334186448e..d969bb162a0 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " 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,7 +72,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6ed2efd0600..14a10efef0d 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fb6197babec..d5147f7a7fe 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.js
+++ b/tests/baselines/reference/tsxGenericAttributesType3.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 19883dce4e2..fc6d5d1c8e1 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.js
+++ b/tests/baselines/reference/tsxGenericAttributesType4.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7ddb8868ef5..7f69a0964f8 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.js
+++ b/tests/baselines/reference/tsxGenericAttributesType5.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f9335728b74..ad20a87ef0b 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.js
+++ b/tests/baselines/reference/tsxGenericAttributesType6.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3db5f14c69c..eeaf808d148 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.js
+++ b/tests/baselines/reference/tsxGenericAttributesType9.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 61f14ce1a62..44f009b4392 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.js
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.js
@@ -136,7 +136,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9528bac0ea0..fb139915551 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6f6116ace08..d10593a36af 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cb9d4127fd2..8a5c5d881af 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ffc5d4e4acc..180e78f073f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 995a4784040..afc33e04965 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
@@ -43,7 +43,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 030396a8666..b5d5eaacbc0 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution17.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution17.js
@@ -30,7 +30,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fb56db8e3fa..7f7757b7270 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 abcc21be90e..181e36e5ccc 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
@@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 526a235d1bc..f4a3f681e4c 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3d03cf87902..fb858cc9235 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
@@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 1cab6a0c7cc..94c138359a9 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e76525a91bb..c49da0d07e8 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f6d1c6f674f..ce99936f688 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 59e2a644083..61d36c90bbc 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
@@ -35,7 +35,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 84cfc10f51c..08912d81274 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d5c77b3a4fc..5ca73f3a38c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -48,7 +48,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 920d13dc502..98ded85f510 100644
--- a/tests/baselines/reference/tsxUnionElementType3.js
+++ b/tests/baselines/reference/tsxUnionElementType3.js
@@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 92769ec199d..eab01d689f7 100644
--- a/tests/baselines/reference/tsxUnionElementType4.js
+++ b/tests/baselines/reference/tsxUnionElementType4.js
@@ -46,7 +46,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b0e332a798c..4507528a2f0 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c0191c37798..66446769b04 100644
--- a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
+++ b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9728d5a9ddf..daf5529f28e 100644
--- a/tests/baselines/reference/typeAssertions.js
+++ b/tests/baselines/reference/typeAssertions.js
@@ -61,7 +61,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardConstructorDerivedClass.js b/tests/baselines/reference/typeGuardConstructorDerivedClass.js
index 07f1f38a7db..51b0e321d8c 100644
--- a/tests/baselines/reference/typeGuardConstructorDerivedClass.js
+++ b/tests/baselines/reference/typeGuardConstructorDerivedClass.js
@@ -76,7 +76,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 85b512bc3c6..dd7438b80ec 100644
--- a/tests/baselines/reference/typeGuardFunction.js
+++ b/tests/baselines/reference/typeGuardFunction.js
@@ -92,7 +92,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d1a8f7b7348..00e7e673b4a 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -177,7 +177,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 632831081c2..7e907854ff5 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.js
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 5a38bb67177..20709fb2ab8 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js
@@ -151,7 +151,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9fbf93de717..aed57e46ebb 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
@@ -69,7 +69,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 8c20bf31967..a894f79e55c 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
@@ -82,7 +82,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ac0374b37fe..aa129ef49b4 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.js
+++ b/tests/baselines/reference/typeGuardOfFormIsType.js
@@ -46,7 +46,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 46b4f737b05..a3943eefb29 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.js
@@ -92,7 +92,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a48e2fe353d..b474e0fbf65 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 6c70db2453e..892e03b1ed8 100644
--- a/tests/baselines/reference/typeMatch2.js
+++ b/tests/baselines/reference/typeMatch2.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e9a0c3d7aed..d9db2f11171 100644
--- a/tests/baselines/reference/typeOfSuperCall.js
+++ b/tests/baselines/reference/typeOfSuperCall.js
@@ -18,7 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cc0cbb9c5a7..b2c4fb1889e 100644
--- a/tests/baselines/reference/typeParameterAsBaseClass.js
+++ b/tests/baselines/reference/typeParameterAsBaseClass.js
@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 285776b8d86..dec3ddefb4a 100644
--- a/tests/baselines/reference/typeParameterAsBaseType.js
+++ b/tests/baselines/reference/typeParameterAsBaseType.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 80031edceef..58fe9ae2a8f 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 24677520c05..f15c60a27a5 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.js
@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 ad5e929c4b3..66bae80bf0a 100644
--- a/tests/baselines/reference/typeRelationships.js
+++ b/tests/baselines/reference/typeRelationships.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 2c74c5ff073..59b3aa45a2a 100644
--- a/tests/baselines/reference/typeValueConflict1.js
+++ b/tests/baselines/reference/typeValueConflict1.js
@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d20c2cbeaed..6172fb37e55 100644
--- a/tests/baselines/reference/typeValueConflict2.js
+++ b/tests/baselines/reference/typeValueConflict2.js
@@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e3592d1d4c0..b2d478b7de7 100644
--- a/tests/baselines/reference/typeVariableTypeGuards.js
+++ b/tests/baselines/reference/typeVariableTypeGuards.js
@@ -94,7 +94,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 313f0ae6a40..e719af6a47e 100644
--- a/tests/baselines/reference/typeofClass2.js
+++ b/tests/baselines/reference/typeofClass2.js
@@ -31,7 +31,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 f574e3b02ef..b4b8d0a2a64 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
@@ -52,7 +52,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 cd8c178ab91..5a5c96a1a52 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
@@ -50,7 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 7db774fd6a5..e15378a56e1 100644
--- a/tests/baselines/reference/undeclaredBase.js
+++ b/tests/baselines/reference/undeclaredBase.js
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 fa3c2408a2d..1a7a58254d4 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
@@ -132,7 +132,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 a6110d9f523..f8d2a2818f3 100644
--- a/tests/baselines/reference/underscoreMapFirst.js
+++ b/tests/baselines/reference/underscoreMapFirst.js
@@ -58,7 +58,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e04e18e4e64..372eb902cb0 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass01.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass01.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 c371616996d..c13dd45e3ab 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass02.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass02.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e49c339910b..9dfc6330376 100644
--- a/tests/baselines/reference/unionTypeEquivalence.js
+++ b/tests/baselines/reference/unionTypeEquivalence.js
@@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 406f625044a..9c2b39709d4 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.js
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 be8c147f620..b99b4835886 100644
--- a/tests/baselines/reference/unionTypesAssignability.js
+++ b/tests/baselines/reference/unionTypesAssignability.js
@@ -83,7 +83,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 3122633c4bf..022a738d917 100644
--- a/tests/baselines/reference/unknownSymbols1.js
+++ b/tests/baselines/reference/unknownSymbols1.js
@@ -42,7 +42,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 284fdd40cd1..e5a745ed026 100644
--- a/tests/baselines/reference/unspecializedConstraints.js
+++ b/tests/baselines/reference/unspecializedConstraints.js
@@ -163,7 +163,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 316f62596dd..dda75be8525 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
@@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0b1172989e7..172b57e17ac 100644
--- a/tests/baselines/reference/unusedClassesinNamespace4.js
+++ b/tests/baselines/reference/unusedClassesinNamespace4.js
@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 9ed9128e49d..d2d7b9fb37d 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.js
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.js
@@ -111,7 +111,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 0968756fad5..932b39c3398 100644
--- a/tests/baselines/reference/unusedInvalidTypeArguments.js
+++ b/tests/baselines/reference/unusedInvalidTypeArguments.js
@@ -62,7 +62,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -111,7 +111,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 b37f10be375..f8231b52e22 100644
--- a/tests/baselines/reference/useBeforeDeclaration_superClass.js
+++ b/tests/baselines/reference/useBeforeDeclaration_superClass.js
@@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 d0075f87fc4..2f69c9293ea 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.js
+++ b/tests/baselines/reference/validUseOfThisInSuper.js
@@ -19,7 +19,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 12eb2a16dbb..cf15cf028c6 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 e270e01b428..e895cbf5d33 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
@@ -77,7 +77,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         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 717aec7b730..95e4f231902 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
@@ -77,7 +77,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     return function (d, b) {
         if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());