diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
index 9557601efee8b..02f6ce4874d06 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 d4cf1fe69ae79..143d8ef260480 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 4f71c72da59de..54346dc007614 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 fe0304dc8bdef..2f9b2b1de8db9 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 149339bc265a2..a1f2000224d22 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 5c67c4c920a05..4476763061b1c 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 ac5c77c59a869..5994aeb891ecf 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 b2005724d036c..ca405834ab4d0 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 ecfe5fc34fd07..0a866b482cd98 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 b18895a48eaa3..43f06a465e21f 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 da5b2725fe9bc..2bf2b18eb66ca 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 68833218d2c4b..2219db0782ff6 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 d010bdf1072d7..6899fb5cee88e 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 177b1a5cea72b..e567cb76be752 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 ae171ff395d2a..d970fd1878abf 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 0e06ab07a16a0..affaf4df78913 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 bca20359e010e..e6e55b76cccfc 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 9d387ff62cb2e..b47774b8624cf 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 c569781f1ffa0..3cbd24ddc6de2 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 11669a4b0063c..b521ac03ce2d1 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 886f7ae52808e..61afb71509c55 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 36cbcaa0275d7..e13e6a8548a9f 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 58a2cfc4623ae..e9930fd2b1def 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 6d54f798fb2a8..550dd61e94500 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 09c6abe34916f..a4121dd3f6d30 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 c3f3338c81151..812b95759f642 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 fcb5ff5df686e..2337e318ca965 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 9e74206c132e8..13cabfa491387 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 8c9d99dc46e6a..634859b47ea3b 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 1cf819168e5e8..78bdc9fc1290e 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 ef77fb3ea156c..43cadb77e14cb 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 c22456b5eacd7..a8a05b720dc09 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 84ec5e7641468..6c4d7091ded21 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 fa95311ea24ab..2cd17ce27dd09 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 136312daaaecd..9cb41738ec3bc 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 5d172b9b5a34c..185ec0de3be27 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 3f754e20256dd..0592e54fec909 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 40d925b99f4b3..259519e9cba46 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 6b9ea414bba97..718c1e180b460 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 9a14d501a7c16..ae03f4225454c 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 9b6b6f2983fa6..3d23df97b619b 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 3fd0675a214f7..9e92e8850c0e2 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 81289abd59e0d..a00da29ed0d32 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 ca864f24df883..e28ba28653308 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 56e0ca2b03794..28fe175560029 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 2af39acd2aaa6..62413e44a779a 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 a8f0991cf6487..8924ffb70a072 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 08e335b55a942..68425cd2c8cc4 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 644f66e5abf81..92809166bb30c 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 3cdf95df07344..5d1cd4a385fe3 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 f96ad8fc6ab6d..7775094c62b02 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 516adec8694fa..644210dc6c71b 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 4d64e8af1d238..be4dcf52df7f9 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 396adade09bc5..607749f624da9 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 38f60f7fd977a..833c1eeae8841 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 b947fd1216c56..fca80d0fa674d 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 9b3417dc995ea..fe70a8d231a57 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 6ee6efc89331f..d58dd744c3dca 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 9f6b20a71eba7..c59e70e07952c 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 26fb7952d4473..07af48dd14e7b 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 d357dd5363d83..00080afbeb2f3 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 df3bd9deec0c3..6c838590c21cd 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 325dc56370b22..b93d8a55cdfc0 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 f3a4ed3176143..dd48ba034ae79 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 2b10f0e38510e..e977f374b952a 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 b98cd8a885b69..14b65f84ed0e3 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 830901db1ca3e..fdf5bfb9f4e4b 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 cfbd3f9a18159..5f0f3ac2704eb 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 c1977dc998126..d0e765c048e31 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 42899e76c339d..aa2797758a8e1 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 5032900df2a25..8ac9de71e986a 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 5a2f89298ce74..3b69863c1aa7d 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 81c9e0d41596f..5a6a80b496c47 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 dfb8d8a455c9a..28612036cd120 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 8799553530879..1cb440487344f 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 63f811a67c701..58abfe024a2d5 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 af28d3eb3393a..8eee35d0809d8 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 480c7baabaa83..28bb2fb6ed0e9 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 e213c7c05e616..87fedcf4da186 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 bae227dd44930..fa69c0b51d8ea 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 ddd75f2d3cec3..584aa086a12b5 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 d3c34622b849b..3b9e0839fb465 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 b4f77ae0ff68e..7513d8a076038 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 f96a0585b0a20..11ba94cd59392 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 d6e371fd197b0..98655f7fc7699 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 af389ce3fcedb..f265559c9fa3d 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 ed629829b9780..31b587d9da807 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 d99574f3051e2..9022b7c65ca85 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 30de6e92a838c..3739b7cad0b54 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 6452059dd3906..505f01a1dd264 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 bdc6e55bc3296..3712d0ff12ae1 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 fbddda517ec57..ad45f40a98027 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 9cfaf4afec473..fb0b44e1de59b 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 4c82d7b2b294d..b5f9f0858b2cc 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 a8301289def49..ce089fc463b6f 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 1bd6fb4e401e4..7ed62aad949d1 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 3b3181bacb380..90b42cc646960 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 d83696bfc50a0..696c3371959bc 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 ea86d2bf0837e..9e0fcf0e5d5fe 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 ea2db89e9cf2b..7f2129d5d00fb 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 7dd4b30bcb035..32094a830b3da 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 7ca0b425cc831..c1550c37766a6 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 510f492b5228f..3eeb4bb0866ee 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 288b452c88c9c..37b005ed6e2fd 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 ce76c42f1907d..8f7705ceac409 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 fd2222a5377d2..fbab311025a29 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 d43568f3dbb0f..921453695e068 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 8502b5aa21e50..9cb73f83cbab4 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 cff0842ff9bd7..33853b46f937d 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 5099fe1197143..e8906510a451d 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 4e5b2ade0c81d..fe59028c08e2b 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 4c66edf51035c..983a8e1f55604 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 888e9c5316b2a..4b1f4f31fc30f 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 94dd91637aa0e..1c1b02ac0b150 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 453900bf32d29..1e802bc23ab4b 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 a6b497780ad5e..4f6dbe4b2621e 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 13cd7db5e4a8b..4fb60b4043bac 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 2c9c7ae1642d6..7f86dce2fbc95 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 f3664491f83e4..3d7f1adae463f 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 2369bda834d7b..da9194cf4885d 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 0dd173f34e876..8dd5771c29f20 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 16ea2823a2f47..5dcee4b519350 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 bef91534fe1c5..a9a89ac9a96c0 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 1c8fa8aa34ed0..9c4e258b70dc9 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 83cd9b04bfaaf..f857b4209a7f3 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 1b6b7f9a76ac8..5e404484a6d74 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 61af83d198d44..1ae632084aeb9 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 a1698b831d34b..e9d5c1b85a9a9 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 65c4fff437335..bfa7e0360fdc9 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 5d9ee3c76bdc4..f1986f3ad3495 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 9cca267f3092c..1ebe2be1836d9 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 42d82f6ea0faa..a4493fd86f492 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 f0454c72f2781..34a333619b9e8 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 953f7bd630b98..b4ec841a30eea 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 7613c23ae8d0d..fdf721d6ac5f4 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 8ad72c59b1ef9..51cb37a783430 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 6624104b8ba47..3977e4e1d321a 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 e11d58af787f2..acdd2b75be817 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 84aea7bdf8b84..c04a32bef7cda 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 261777267c7d0..7e18f0457606b 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 22a852a58bda4..ba13cef76c6ba 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 407e55690cc08..b71c8abed8289 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 1b9eac2a341e3..4013c036cc815 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 fa2026179d321..a064acd93c36e 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 bd1d4afddce41..14a1516ebc1c6 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 4546e39b74c77..7d8004503881e 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 27427f54141a0..199cd885c7bcb 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 82fedc750a235..a2d8b670c1926 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 23305ebdfce72..ededf2a25d376 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 cb8781c1562de..30b98303d1966 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 5bcc85966ae5c..f7f1a5d244091 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 1353765531698..6f42a9bd9a2a2 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 80f8863586fca..97258c5c1595f 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 afa01e4c613cf..1d48b64b809ce 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 5ad639f311a5c..babe28a722a8f 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 8555a3f262cb5..655355d1375c8 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 c373354722f2b..9ea92525d96db 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 a63e1777a6765..83ead7522aef7 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 ed3e55e2726d3..266aad9f96642 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 98da3b4718158..0f1c14c44f19e 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 8615a47ee4f93..55e1239844c7f 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 437fe85c7763b..bd56a6c95b4d2 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 eb0aed3c132a8..9a664e83bffd6 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 48b657066579a..5795e5c45891f 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 67b2022c460f2..0888735d373f5 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 8d36c5915c6f5..b38b2eda85c64 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 7ee6920b47270..cb08b51e9f2c8 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 1dab28c11d7fd..226abd152d8d2 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 6721e1db67545..f4348a315e650 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 57be56583247e..18cb61863e164 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 826be5fa6f1e1..6028c76dfbc12 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 094cd7a31ac77..178d9900d85b2 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 a6f42a595925d..66d32d477cd34 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 dfe890598cc2a..cb5b85e1be2a3 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 75d2ffeafbfab..5a61e7c209b46 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 2e9aee055c308..d9faf83173bb4 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 6fa8bfc0592d5..2bd949cbae666 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 54be5b454314b..1e46117871643 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 c5632e0d8a25e..b1501d3358229 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 8abe8522273be..3e3278db6b9f0 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 2398903bc89a2..669306e8cccd9 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 058ed5f399e5c..463ba27cb2baa 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 d541d6e0ad14f..ddcd656a833ed 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 3e7ebcd6c48e1..ecc2b0239d6e4 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 49b31b9baf77e..95576841cbb6a 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 6713c8e3dc7b8..504fd6202f5ec 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 ed4af66689a1e..f54793f152e77 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 63b0c9ca0b023..7e6ae05a727f1 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 48c5f9875bed7..d98c1ef0622bf 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 1f34a4ba2da57..b842ec25ed700 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 c5820aac9abed..c090c4f6eaf1d 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 95fb1535ef3ca..c175ecaf712bd 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 bc5d5fffcdd33..b535c4b4976b6 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 654ec54a782e6..425c76f36f31f 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 a0267f10229d0..74fef3246a600 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 36a8fc96d8484..a04612c8250f7 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 a51047a290400..1aa1f9c2ca46b 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 7facdf34b27d3..f533db30b7231 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 6326646f02d0c..12443bc7fd051 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 f3a0d730ae649..4ee3c8b58ca24 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 cec08c5ac473b..f55105444221b 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 b95142e2c1bfc..83513475dcead 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 fff7d089798ee..b10228647f059 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 92dbd05ee78d3..3758f1c66059c 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 d9fa2ce9a3076..d32ed669fd65d 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 e2f3a41471665..cf19bbcc89238 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 fa02344de455c..c85aeb8354b41 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 048f85fa1de6a..307c8bd1f9f42 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 f21ed47c6dcca..2a9e3e0c5e159 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 28fa01c72933a..d0117dd6cd9b7 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 698c0483498b2..b0c5d636059b4 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 c3f81fd59f5e4..e08f130ae1909 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 217b6ee58981d..8482c49c368ed 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 4f4556e594cee..fa4ade01dd079 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 2d362a321bbeb..afe310df031d5 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 564a5fc9ccc54..e43369a86cf50 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 a7f919df1ddda..45e4782c1c81c 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 90d6d34c54590..d89d1a9d8a4c4 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 fff4f8402c844..e43b9a11c1b5d 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 f3331c5009b6c..9a8b227934c68 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 51057da5d50a9..4fa6ed30d6f8c 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 ea051f36b58b1..11a9ababd2566 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 ceb28ef993e8e..ddbd0819229cd 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 b6f817c795b3d..ac6dca30ac5cc 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 becb659f7c04b..15ec6643826ce 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 7d23d6d79ee56..f88735b52df4d 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 27b6d3c28f895..92d8570ab0cc4 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 fec56a7717074..210aec197a1d6 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 9951397b09ed2..27d65afe6cd0e 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 05a842a2c2300..bdf63756cd1aa 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 c41d9b2f4ce9e..c460c94441be3 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 4a7440359459c..be8397ca335a3 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 c58d19843e259..b31a5475d0611 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 fbe58ad0e51b1..ea5d8935047e7 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 e74122b9210f8..453546633af2f 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 f3246f8abf3a2..24cdda6244dec 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 30b2175316b19..81450e940b7f4 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 d8e8abe81c9a4..a6f2c3ac965ed 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 d27b664384027..bbb05a73617bd 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 bc6ee7e27c0d6..d753b63edaf94 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 672c5f64d3226..4e8414cb0fad3 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 a6b3a7d626afa..7b5fcee16f365 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 e533c31005daf..e138230549852 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 43c47781845a6..2b8dd1c9fa2db 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 424e2dcfe7d46..88ae8010ff548 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 7ad5d0f9d4a2f..4b44b4c0233d0 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 91121fdcaa8c2..c00eb2ce84ac5 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 037ad6cf347f0..b156e9bd3d6ca 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 0db8521a858bc..2ee00dd003371 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 f89052b511292..21201fb108c19 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 7fd1e0c084896..63de3e68739bb 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 328209def1e03..18f1017225cee 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 e8f97f7bd15c2..c90c8aa43c714 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 818b35bda859b..067bac4cb8e8c 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 a378890ec38b5..6fd8766bf1dc6 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 84b9bbbc2399a..52d35b3474b88 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 170ff04db29bc..59199d8c0f064 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 ad78d445e7c7e..a155ffdb8189a 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 8de69c43c163e..a946b5983dd3a 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 ae8a0c17d78fb..f75108175bada 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 35ee4e49b3895..4af59a8e7e7d9 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 033d3d2aad332..8763c3605d1cc 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 4dcb1eb9f6aac..5770ba526088e 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 1247ed58709be..10ca7fc146e2d 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 150b15ee0e753..485d0b901470b 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 ad42c9e2d3ecb..145fa37064c6b 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 8b6874afe318f..e2fa8cbe80f49 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 f1ddf5b6786b6..c0fd3589312f5 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 90ee84092875c..e02ce21e2a2b4 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 b4a27645c4d35..1d716082b788e 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 a0834cd6035ab..c3ea5a2329806 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 0442aaf891145..a2e5ea9af03ee 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 8394b68958995..bf7d6631025a9 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 79922c29bbb79..76efe551df5c5 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 2dc09fab0502d..35107d1da2c80 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 d098bbdb49066..5378e342fd40c 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 bfdd788f4de7b..a080cbacce258 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 c9db50fe9ac7d..62b147973328e 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 8874eb394d088..a2b271f82fff3 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 aee578cbc604d..fed9b4cf03d63 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 f7f18d97f4d76..9562bd9edc265 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 1595028eab33b..02a2be56a5d84 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 b65ee3a90e6f7..2964dfd637b24 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 46aecf4283273..7be320920c22e 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 38a49bdb3feb5..df42d2c22b45c 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 34c814e023a44..b2758596e01b6 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 2b706a3a395f6..cb5857614297d 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 f2da0b4b077b1..84c0bd24ee0c8 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 9e7eee5b13db9..24512be746e03 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 504db3a61975c..9ce924abfa49d 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 08bbf88c1cd46..eee9fc871c137 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 28fa8c1ac350a..03cf53e5ee550 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 d17bed39ec056..6b70dd68b003a 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 255623d51c4e3..59434074d67e7 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 fd0a171d49990..1609efab14f59 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 c014ac9eb735d..53750feade668 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 26c593bd39bba..ca329e46504e0 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 e037862cbb44c..88d6856e2143d 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 dd683cb066bb6..b416a4f498027 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 c8d57a9f13a43..c0cc36e4ad515 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 ad17cf35af849..f59f10f4612fc 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 8fc7af93c9cad..a8347b040f65c 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 b3967c883776e..384abc713063e 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 6fa2fb6666e04..80243d163c55e 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 cf7aa47ef5549..ee9655f37097c 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 d44fe6c6c6fd5..a6d020138d93b 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 444833aa7ab4c..36060ceb52327 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 c2808ec4217c5..11403472ef942 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 d423664c32c38..0811d4f1bf2b2 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 f092a6bc42633..53d1ee8848024 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 0b4df59fb1f1f..0f6b043b2c2bd 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 61c823d57fc8a..b40dce9e1993a 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 12e5b71a11317..89dddd7bfec17 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 3d3d5431c054d..03149434bd287 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 47581e1937dca..da2daf8dcb248 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 f31339e38af08..54ebb7d858045 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 e91b339e6d30e..bb2fa76fc0cc1 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 05ac3119e1796..790cd930e6b12 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 c9823bfaa55ed..e74d04a633ee2 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 9edd01767fbe5..031a88dbb8798 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 8610f95e0a891..2b8177adb6a82 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 a33ff30d32847..e609f86ca7cd1 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 002bb48ded6f8..ea1ec3d125e6e 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 f5a6bfc1d4d70..f4d31aa139112 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 2114d5b6f6690..e14a73e6926f3 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 82bdeec82ae9d..6e90fcbfedd91 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 fa9d38908a099..1932f6f2de656 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 c93f9f6bcba3a..0256aa3baae41 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 a610a625d3d8f..8b795bc1ea639 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 b35a297f9aec2..6cb95e2795b6b 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 de04b0eee5403..b01d17c97df2d 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 2a131e2ac04e9..f80d7f4deaa77 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 87ce7bc877818..7dc1ca88ab53a 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 67c637265802c..7676baef57150 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 c0bba1d89800f..63f4aea8fe745 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 14f79f4a0f7dd..94d6195440551 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 99d8156784b09..e8bd0ecaffa9a 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 2881f2336492d..4d3cc5053be59 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 96559b8bf2360..e2ee1bca7090a 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 80118ec8d0860..b310e48685df9 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 de1f20636a9e7..82bfe35d5865a 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 86126a9c3e299..678e85d270adc 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 3126b860342eb..d431051fe6d9b 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 5a3ff7e44f2da..d7da659f1b2b0 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 3a0fe12fe6a2d..e7bc3cf0930ae 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 da112e48983ac..260bb6d4bd569 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 5284a2e9a74ac..ea378ae129874 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 859ad1a397548..2e36ae9dace9a 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 093eaad8b407c..55c8750363993 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 bdde889ee8cc4..0a863286b59d2 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 71b35c8cced53..8c492ad4b736f 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 3f516cbd55b20..5be7467c7b583 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 1b116bc2fa6f5..dba72fff13a5b 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 decf4f4eaa90f..1e7b5d0a79ba1 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 920cae18c8300..53b66ff6a845a 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 acb1b0f320fee..28c292c318df6 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 fce1e33177e16..f198c9c7f00c9 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 a66374608a581..3f62dde8cce75 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 23f2f4b0410f5..b4433d63bfb42 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 d5a36344ea68f..4bb0e685a4316 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 d0e74ec1bff8b..3d23afda8aeab 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 3b0256a25c8a4..95c6011e5cfa6 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 fab42865555f1..9cde80d5ee353 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 54861fd3fbf59..0b9514867c288 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 90a0c0098b9de..abe892cda533a 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 247e88490a05d..bc5e1371ee87e 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 65c7603d5f8ab..47707cd8b946f 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 e70b7d8472146..d97630ae1b9ef 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 8412efa809151..6d504ce0fe036 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 96af28b411ee0..7506bbc2d1ffa 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 59fb2d8ccc046..5fccd8e717b47 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 42c00f9f8bb87..7408a8ff174e0 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 f643bd1524fef..a3449eee10b96 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 3b61fe8299d37..284d6e2b97e6e 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 998459333fc59..282d4c372d834 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 bba2d44460126..a71a3c8093c99 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 b5a2e0a65882a..7e9a835224160 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 f29478f932a6a..85fd402a02d34 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 9e1f0dcea288d..2c7a0726c3b68 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 c9b25616295fb..fb4b3afd4cd7b 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 926506cb27672..4b1d266a25d90 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 8b7d96f7406b1..baa7793c96dcc 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 05ce07def37bd..ef29c54d9d631 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 09a8b085be675..33645d6bca734 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 a9a265b1668ef..f63bc5e06a21d 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 2e024b6ae5f9b..9ad9ab10729b8 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 8fb94fe80e840..5663a2e0100d2 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 b3e92f279c5df..5ed50f281651e 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 b51171c927673..34272a0a6b160 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 c2da946bc0ab7..7fb2a31ff5540 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 3986c4477c546..67aedaf329cfc 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 4f2cabab68f75..d37bd23008261 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 eda722c3b393c..e2713dd725a0b 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 29fe586b31682..3fb4dabb2863a 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 c6e650d324534..7bf6c1b10b6c7 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 39fdf2fb18337..3e333a8fbc79e 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 b3ed00c7b1f9b..1bcc14be47de8 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 24dde4f12e727..1c857e3c37665 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 5224aa9da2822..3cb1680c25582 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 cfa47c66a60a6..f15c3a68f4c2f 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 a3553eb1f1d66..d27bb46ad9a35 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 0e559acbfe22b..6c8f2ea35a2ba 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 4e1d7a3247c6c..641febf9b10f9 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 79b052f3ab953..3aaa275514d27 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 9d3e2fab9ef87..a787b81d89cdd 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 4167db5255451..32612069ea146 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 12069905f8be4..a800eef15d630 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 cb8593451bf40..79a9fefda9000 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 a3b4c4f4bee6b..0bcd4b06d5b62 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 a6e3aeeda6b7b..b8dba0bbc249e 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 aceab2377b5df..3bc790a261cf3 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 570e681186740..1f2ae5b27192b 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 0b5df5bcea06c..257ee1b008d04 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 21cef954352ef..2143a8327ee0c 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 731011b3374c9..e1742022d15b3 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 25f523fc6391f..5a7694ab8a1fd 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 42aad59f3b3e8..2ccac56d60388 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 f762a338b5d1e..987b4561a2033 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 dfda6dbc0f991..098ec8d5f5973 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 5b15a34c41c75..c5d84fd6a609b 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 ef745a281aac6..3e0b748005bf0 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 b2a5694f0f95b..970556f0662b6 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 f35d95365a79f..308e05dde03a0 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 015f571e4a66d..70fbb6ff8f34d 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 ed4f33fcdb56d..4d0f4f4c74705 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 7e57d9fd510d9..298fe5a9bf8b9 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 cf7102ddbc64f..5a96756a7feea 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 6ac475f5f068c..4fdd17b59052f 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 21303e8e5a09a..c8f912ac9b91c 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 8016a044a05d2..58830a5885b06 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 6f287a65ea3ce..9cbc37464f539 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 d21d81f3efb10..c86db6899c7fd 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 ca14c995ae12b..bed2bdd984f80 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 54ba35af2e44e..a5e65c9ccc6d5 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 68d2b9334e0be..2c58bbf1567f2 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 f4c16b35e70b4..6d577ed7dfa7a 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 928e1845a2cb2..393c2059c5c3e 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 1560f85c825c8..5c1ee2dfb46b7 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 0e06d1c67f12f..3cda816969dc1 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 a5a33e224570c..ab9565f2c39fe 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 bfa315e005956..109ccf8f8b859 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 b19479a46b3fd..99304e5ef278e 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 66875077615fc..3ecda3001f9da 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 71664cfe99e84..5a3a88c181a13 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 37fdaecaf88e8..bac4b82fc6080 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 c8f2791736c5d..738c2410347eb 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 284f98f966a1d..7dd969426aa1b 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 01b312cdee983..15e09b94edd92 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 924ba1d609d0d..15d63ab80e449 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 92f5f6a24a0d4..3be49fbf1ecd6 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 8b0ed42431dfc..bbed54436c68b 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 39685c25879ff..979526b4e1363 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 1309e467e9266..ff1e8d4422453 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 23b4f19d74cab..a06b6c362b7ec 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 236612cc44448..b1dcfaebf9fe4 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 dcd0494edba56..23169b3e78473 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 8ed5331e2e27c..2a0712285680a 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 dfb3551fe0cd0..941cada6a10f1 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 9fa59e4043349..b9174f3a70846 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 a29d40099cc6f..d150cbe494fe0 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 14769f07fc31d..2e76c79d4c586 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 94269ff37745f..25493c7dd5c94 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 11fd8c72359a1..147df84c5a6e0 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 e602b8e949eb3..0a0201b8f65a9 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 d921994e725df..48369668d83f9 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 a2ef9bf379665..6527faf3efb66 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 233d8b8d1fcf6..a731d60ec2157 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 56204c64e9b03..46511fed37920 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 166f21a997912..4d367e0ab5cc6 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 e6ce8d50c111a..bdce4736f1d6a 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 5db64b3e5e34c..ab7051e4eda99 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 18eaf3f1b37f0..11d1a103c5a0d 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 c832bf0bb452c..fd782b786858e 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 f1070604bbd11..969aba758457f 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 71e0ab2df52eb..8f9eb7f0e7379 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 2e097a6868acb..95d282c2747c6 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 1e5964c78e9d5..40b99342a4ce0 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 1f9f1aac0577b..e24d6580c97d6 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 0e44c6441f827..f2b7dd8c601f5 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 149e0ca3437f7..e11cfef736c3c 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 6977750e44efb..6aa9dc86f9dd5 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 40bf6cb94c147..fdc8d53f03358 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 b3c168044102c..9c261a626090a 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 426ee329a73aa..857aaabdaee79 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 59e94b72b0804..71ac2995974b0 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 e1caf9bf30752..cf90daa2032d0 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 2b1b2804d2e8e..4b92804a6b0ad 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 2be97b8e1bee0..8de21e81ef878 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 800feed7f0257..2be75e871c497 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 948febd9a173d..7be97e8aaf8ff 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 0dd2426f2d671..b60b12c193529 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 d9a300e481456..941dacde74c17 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 50a22cd1d0db7..62252ccce3ef4 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 2fc06167b66d5..de39da0095f98 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 073f034688734..e6a5aa12c34df 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 77a0e12869ba2..d2bf3095ff0b5 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 c7f34b2afe0dd..24d0894fbb756 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 98e99c275e3af..ac8acff7160b4 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 b09a5fff4eaa5..a2f88424ac190 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 31fe2ba0746fc..627ac4773999c 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 04f290c4dc3d7..0b38f44d2f9b3 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 f58f22d8cab36..f7b4231c21b4a 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 bddf70e93c2a7..a88f4d95d07f8 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 cf6a801e0cab7..afa676fa4f571 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 1327d749ed2bd..f9a8c67592e73 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 d53219bee571f..1cdcb5467800b 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 ae688652efd12..d6eb469b401f2 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 ec9743c369b2a..f53155c2fda8f 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 ada58bded675e..1d2029f7608a2 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 6462cc88cd43f..bf650038c1074 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 75e272e63a5f6..fba7be179505b 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 9bf759ee3bf94..a458eeb39c499 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 3ea79327af224..479b825a96df3 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 f36622caf7982..25873414546c8 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 d900e81e504ed..5c04d4cfdb28f 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 268eed44ce26f..25633839757f2 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 c88f02effb7cb..805d37f27c744 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 2e8e12f1b6e3a..be011e9d3705c 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 4778adaf18fa7..6ee8826b1f6dd 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 df56d1fc90782..0dd95dacd6d8f 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 ad83510bc048a..22b0c8f03d4fd 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 0eebf4ec01a3a..3b360884eed3f 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 1cd8607219308..88329b5db3bb3 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 6861c54ac13bc..a4beef4d9fc46 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 daf40adfdb5ee..1f721e4359ae6 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 eeed28a88a337..a7a906b7a25a8 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 d77bf0e86a071..050b60fa6aa52 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 0da2aab44c29c..5d0cbd0f5b234 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 b81e3221f7929..664558132f424 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 f89bac380018e..0475ba6eb3d2a 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 4405bf7c8df57..69f8c0634531e 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 7cb2efd947c2e..db5019c35c9eb 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 e12ff81fd12d7..34961cd5c7c83 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 a7f413ff3e5b8..9e94af61b6f4d 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 eeeb0717ff896..8e4558e0bfa2a 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 ee2d71cf0a91f..fe23d72dc2164 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 b8f69215ce960..3e7ec7be44556 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 b2193425996cd..f0878fbaa9326 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 f5ad8ac183910..2d0bce82f568f 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 baaeb86eb6dcf..a290f00402b95 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 5d21dd547edf8..bbe734f79cd5f 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 697131ab8ed16..fa626a6886da2 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 114aa968d45b1..45a3e297d6f32 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 951de322d75a2..709ba3cb1a56d 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 061489933ac9b..52958aeb8b146 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 b2f0649ae9c78..7fcaba5f2afa6 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 adb0aa59cc41a..b1bbca204aa69 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 8f32ccd4b1a1b..4c59bce599aab 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 ad3de685e4e09..5a8c897b3b525 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 060a81492f4ee..7516593953b38 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 b74c78df76406..5e9515a6bd6b7 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 f47cd7cae02f6..fd84e40f29c81 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 93e5e57936067..7a7a4560fd474 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 4069a34360c4f..17937b4db6ba1 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 16ca6a0704fb7..7c81cf05d5038 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 cb967d32950d3..82bf0a715baf7 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 b55289f9efcaa..9f16800d3a3a1 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 384b89cd52571..182f2c8cf3043 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 b96a879fa0330..b49f85e7e4254 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 005af817d2236..a959fb8efd78c 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 e54c78e7cec20..e4a55c7496964 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 e4e889ca71d50..d8bfb663ae74c 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 e90891e3f1a8b..dd5a08e9b5196 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 0db9898a07b86..0c5b48ca4a280 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 c20a6d17a30e6..577263c8ad80e 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 f43d4d3039fa7..4f6b4586b15c2 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 85b6eb408b50f..92fcfb0648c5b 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 7695f95f95288..46618b80e2fa7 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 1b058e6e4ed18..d508a3e4a8059 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 d119207262387..93d6de686a343 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 67edbb32c761a..0d5d8a620cd67 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 67edbb32c761a..0d5d8a620cd67 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 1a64f288ebb14..5fa132a8f28d0 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 1a64f288ebb14..5fa132a8f28d0 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 0a0b0ec9d4328..c8adc86478b29 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 0a0b0ec9d4328..c8adc86478b29 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 2caa4f9aff42f..c2e73029b7ccb 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 5fe7cc855991f..093b780a62f64 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 cc40b6694915e..c494c4dc8d68a 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 ee4a4553559cc..27929ebf3adc6 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 dab1983f8a791..1a4f0a27f2e7e 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 d6f89d3d44afb..014a5013ec9ba 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 f701af5227da1..6c0588fd1cd8d 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 0718ddf1a2ef6..d6fdf461e6ab5 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 58adf2a7e320a..f2de756499eb0 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 657cbbc62f22d..1485e5102cf27 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 c784adc5070ed..1f9c6c354f4a4 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 d60de9a2278b7..939ae7bab7a13 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 4f2a7b479daef..e621bd73dfb43 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 b5ef7a42d1400..2c57eefd5d6bc 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 092e0d760bcc7..dd395868cbcb3 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 4d5dff9bfbe98..e050ca7f28286 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 08941e71f91f9..356fe07017c09 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 085a4df090528..12005b16c32aa 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 aa2b6137d93ca..08d074a09b1a8 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 8989621f0764d..1a659a736360f 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 d823384e47eba..92bb9126a13de 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 13f10b8d70f1b..21c9b2ee2d074 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 9d83fe78e86d3..9f19d092270a8 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 fef99a0e1c1a0..18df2b2d54db3 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 2c483b0a0ee5b..5eb66b604fbcf 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 df5d3b06b730f..b4ba96607540c 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 68b7bf6319e04..cc503899c22bb 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 0b869b23b205a..175d78620b499 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 c4c68166bf80b..7aea03bd66727 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 b87b394c3d615..84f26cd4967de 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 2540891baa0f2..9e6e801affafa 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 40f1639a93935..2522ca4b0d277 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 dd14ea1a9d1c7..c6b2ea0035dca 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 8328751cd86bd..a85b9ffab0cc5 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 7e5a2a8bf5b07..5cc4b488403a6 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 31cb28a6533d2..208319f09c317 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 b50b355ae090f..597a579bd24fe 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 9f877e88132a0..463699011fc33 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 c0631fd81cad0..a680fafa9a2c4 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 6b81f995977af..e5571e7464c04 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 56737a58b509a..f78000a85a218 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 3272f2911f00b..cd34e4f0fab04 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 77635c5db9feb..c9b87d76832a8 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 0c70690dac31e..0d217106264ec 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 4e63f2b4b359d..d93cac3514fc1 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 9d4bd460dbb23..02fcbdc93415b 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 6d0938a575055..338b47d1d21e0 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 b355546aaf7ee..5fe0e4c1d72d6 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 c9f6b85b56057..20bdea5d38336 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 1b4234922c41d..5a3cf95ecb433 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 90fb0252437fc..64c8620281dd8 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 d4990d38b64b3..f214d36d6cca6 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 6dabb115729b0..b2882f9678d34 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 31781a40d286d..b071e6dba8d60 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 fa5b69de45061..75ffa4ec2ce84 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 baae2b5408e5a..d762aff68f8c6 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 79f2fd4d2266a..9818d4c3cce6b 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 9ccba0029bfdc..5a959a81e576e 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 7804c003c2d95..80819867c0e41 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 abfbab4b9d749..186b6c6080934 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 f5bbcaa5b134d..267ebc5aa2a44 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 cb7c4ec7f0d51..7fc78fef16aa3 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 1845966cb671e..56869ee2ad00b 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 cfc66d95a15f1..e951bbaba58a0 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 89a13ff13ebb8..d70673825a439 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 ec15d8dc63c5c..d2b9399eee888 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 287908e373be5..270ea29a4c8b4 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 8af59214c1879..03a17252477be 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 765e2f2b3881d..a16f467752522 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 aeb7f1bd19394..2a13d91c225f0 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 d81166ce7fcf4..c3459967680e9 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 1e7b9752a880f..b0e07126be095 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 92862f6b3276e..61d1243a05694 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 3842353a42106..1e125e56b5b0f 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 6273a0a6e6f23..32e083ab8bd06 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 5e7afcedee699..8393fdb0fcac6 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 752c9ea52c5c4..1fc3784fefeb3 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 93de82e677706..5420c3c339924 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 b8cc088d3d616..e95ae5f90d755 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 c24d80f147084..602d895284234 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 dea9dc21f274a..85e617304cf35 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 32e6151eaf27a..f086a80dc3f7e 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 8ad74974054d5..58b2d058a427b 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 f512611bf9dfa..6a57c71030a65 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 c7e5082ba6c22..bfe5160184de5 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 2b2d1828aad9d..65c71d5551f01 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 33e88304123fa..1cd4e446daca5 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 3203e0e1d6378..0df0acc27aa0d 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 18cf1dfb7b2ca..e689e55aea4c8 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 8f96058918504..fe683a2eb0600 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 da1e783e8459f..ded81aa902c56 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 cd4a3b01b10d6..b9041fe2ea1d4 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 46aef97471213..69c3e36c5cd04 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 aa8e5d18b89d2..c5d6941345423 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 df968b2ec5e55..192615a838696 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 983d72ed40461..5a0e1b4b53240 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 6623d55985e43..df6111c296894 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 5c76d43f480bb..3e54ea4919e4f 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 7ff0ab7f4293e..846b10236b2e0 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 a1468ab1ff713..dd53198d5f520 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 7924c74a82bd6..0519c6979e730 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 dc6c9c34d351a..e0617a91ad0a2 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 91f258602e658..4f6ba1f6ceb48 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 c19ba063c5d2a..b4ecbb6d0b6ff 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 24fb622ccc4da..40422e84749b7 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 3f2f8ca1effb3..5d0209eedd244 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 381a671ec8238..7f76fd0be68de 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 84ffd8e9fb6c5..520fa39fd7332 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 085c3f84f5604..b5476c9b2bccb 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 12937ccfa8129..77f76e1282e0d 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 addb0a9ba229d..8dc37241f291a 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 4a9266de4c585..c5f6a1ab40046 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 1838072b62736..67cd1695fa7f1 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 a7c2020052a90..acad3d957833c 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 61660eafd64d1..9837544119fc3 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 9730557a34b50..9dca6526d9595 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 e963a9fafd369..450a7d0632191 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 39ec3d2558246..5cd7b5a74f0ca 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 5781964bbe407..51ff643f08449 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 dbf9fd288447d..6188090698828 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 6e631780236bd..5090b8e70717d 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 eac4af99e8304..2586346f83b09 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 50e7039768ffc..fbb718d3f1a95 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 257bc39a239bb..569a897134cf6 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 1f015132caca1..ea6607aee5b74 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 021b897532ad2..4f06879245050 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 66803cb3adf04..89b7df11abae2 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 e13521eb93a32..afe50f577cfeb 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 0456a88661c82..fee00146b4930 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 745eb47e29e4c..25d4bddf3326f 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 5b71c34d3a500..7f93cd13332e6 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 79574a2c2293c..e5bd5f14969a3 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 b06e38e4b1819..5994b0a0aae64 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 d284bb54f66c3..a97c7a45a2ce6 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 dfd7cb74acd3c..05ac08b689caa 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 3c4712dd9da5a..4256ed6c9fc3b 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 43d6c7ce9bcc3..b5b68ae9e71b3 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 43c277106f522..ab1d306ccbc3b 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 73136ccbfb511..1c0f8eb85ccd2 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 1201db208d825..0d677d2a6b0cf 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 179b13adacfdb..8c2ba03e299cd 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 75757d7682890..8bbd1f1c65ebe 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 fd364d4e9be25..e14a69ca330b4 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 94d18716d8b6f..27409f14eb082 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 e2640811bacf4..c03bb3f087243 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 d33fcdcfe72a1..e186e1b6618fb 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 0f89e8b29e615..60b67b9d1b370 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 206df67849c06..1557b9d15725e 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 9be13e16c2bb6..b310cbfa26f88 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 9e50377314eed..24ff1be045a79 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 0ab5af1e762af..272299f6ec3e0 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 45599a5b231ae..09b3336d98beb 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 d86def3384636..69d5892b70250 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 c575bb64bf30c..76ef6df943d79 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 11f14828e7a54..9dcee70745de1 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 3f42f2272136c..6252d088f443b 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 5e1d98219a207..f8e280838ad83 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 312a8df079602..c9cb2806d40f6 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 c4b84a51adb66..20970c59e77f6 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 940029538896a..60a8c1bb38d73 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 08934728467d8..fe55e8b372dd4 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 723689e049d31..a6e87979fde1d 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 269e8442b060c..f97c7e5fc1ffd 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 a41c996708428..fb84fea665791 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 5e0b8f5558d82..d719dde6809f3 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 ededc625796d7..e965cd4f85599 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 208a11a9eef17..20bcc100d2284 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 86ce622198650..353b2e2a7312f 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 c0d8b29ff478a..f4646f5ac3cc0 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 e0a271f106da6..4f475cca9537b 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 92afb996e7a46..ff65a82766e87 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 002a63f10808e..544fd73b34e39 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 b1329b31a2394..aedcec369a159 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 2a41c1a8894d4..92fd3d2a39aba 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 c5dc176c031c7..504fb3d6fd552 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 c9485b956bbe1..9698a478748b6 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 eca3e2db18f10..453e1bb86b415 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 e943531e7d63d..02a303096955d 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 5153086903a05..b774f3259a8ef 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 cffc7e69f3f15..cf3e8a3a0da08 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 8e27eb15d12ac..c4fb822a4ef6b 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 6529fa98909db..562d6da842adb 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 fa25dc1e36f67..5859238eff153 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 556df2263b459..d605b16ccf05e 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 bf0e81186619e..57b22fb1e2023 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 bff8d86000a22..7a7214ca7f695 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 203665f850516..07c36cfc5a5ce 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 3958b722d3eec..04e77f960d42b 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 f077b435cdd8a..2929d41338468 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 456fb843e4c67..6869bce498299 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 e2dcee2eefe80..1cb1fa61d05c1 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 4cee2d6d5362b..28e0a03be7657 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 aa0cf6cc14a23..642ee60382f6b 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 4b55d1cbae035..0963813244be4 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 d525eda14f071..e546b21f1b3c3 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 8ffabcb987a90..8b929eebdb779 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 465af91735168..fe93923a0aa1f 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 7d66b4902ed72..023fd8130f95a 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 e148a983921d4..7870c9d31099f 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 1e0544332b914..7e7ea2701fa94 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 a7a8f7053c59e..784b4cc7b8992 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 04e19d27ec9df..d482544c64e2e 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 a0223809175cf..9fcf125002eb6 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 6eaf11f1e8f4d..c5e3bfacce5b2 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 8adef023d1b5b..8a7cc63221f6a 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 d64296f744ba5..5174540119bc8 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 b4c42b6daf539..ff8b8ad73d226 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 a54e4724ca911..d7e7d11fedeaf 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 9cd4e8eb4397e..8329275e56271 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 72c7e1ed2b5ec..efed8435d94c8 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 a2086aedc39ed..d813e887290f7 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 a97f59ccc0dbe..f0853faef55a1 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 080781e1238cc..889911f14720d 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 d88b95823139f..76e772a6befe9 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 9847668e5c51a..c404b6f983e39 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 f458981edd04a..06b9662e06225 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 e3e0d37bbae1c..613d1b5bd34b3 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 3f898dee08900..d69e2eda2b9b7 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 82f259b7bb27c..91fe71e2678ee 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 276c0bce1aaa5..eae10ca7ade43 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 c69f16c974156..c8a8d4e409990 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 a47f2661ae668..4fc222c0b8cd1 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 b21d1fdc3eae1..b2616fdda83aa 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 9b8688bd7741b..489c5c5907409 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 f8f3c22465575..f1ce62a13bffa 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 a7352b2545bbc..386efe6f6a183 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 c80ec6cfdd2a4..0e30d1e0fdf3e 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 d27fd958a7b4b..e771ecf58ab58 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 9d0f9f88f6ce9..0893a13946333 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 cc932a000aea2..b9e3b55a51414 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 580e7a40a8cc8..72ea1ff50817e 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 68177b5c614f6..b5fdcc911c7f6 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 f6f15c1d12f6f..6b33a55f34688 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 4903aba5a72b7..71bff4214c985 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 6106f7fb68779..632d1c9e3984c 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 8bc8f89703bdd..87b79c1882b52 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 e6059cddb6b0d..e6bb30de43138 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 __());