diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 9d7dc9375996b..da10144d679ad 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -23,11 +23,10 @@ namespace ts {
         IsNamedExternalExport = 1 << 4,
         IsDefaultExternalExport = 1 << 5,
         IsDerivedClass = 1 << 6,
-        UseImmediatelyInvokedFunctionExpression = 1 << 7,
 
         HasAnyDecorators = HasConstructorDecorators | HasMemberDecorators,
         NeedsName = HasStaticInitializedProperties | HasMemberDecorators,
-        MayNeedImmediatelyInvokedFunctionExpression = HasAnyDecorators | HasStaticInitializedProperties,
+        UseImmediatelyInvokedFunctionExpression = HasAnyDecorators | HasStaticInitializedProperties,
         IsExported = IsExportOfNamespace | IsDefaultExternalExport | IsNamedExternalExport,
     }
 
@@ -590,7 +589,6 @@ namespace ts {
             if (isExportOfNamespace(node)) facts |= ClassFacts.IsExportOfNamespace;
             else if (isDefaultExternalModuleExport(node)) facts |= ClassFacts.IsDefaultExternalExport;
             else if (isNamedExternalModuleExport(node)) facts |= ClassFacts.IsNamedExternalExport;
-            if (languageVersion <= ScriptTarget.ES5 && (facts & ClassFacts.MayNeedImmediatelyInvokedFunctionExpression)) facts |= ClassFacts.UseImmediatelyInvokedFunctionExpression;
             return facts;
         }
 
@@ -661,6 +659,12 @@ namespace ts {
                 const iife = createImmediatelyInvokedArrowFunction(statements);
                 setEmitFlags(iife, EmitFlags.TypeScriptClassWrapper);
 
+                // Class comment is already added by the ES2015 transform when targeting ES5 or below.
+                // Only add if targetting ES2015+ to prevent duplicates
+                if (languageVersion > ScriptTarget.ES5) {
+                    addSyntheticLeadingComment(iife, SyntaxKind.MultiLineCommentTrivia, "* @class ");
+                }
+
                 const varStatement = createVariableStatement(
                     /*modifiers*/ undefined,
                     createVariableDeclarationList([
@@ -669,7 +673,7 @@ namespace ts {
                             /*type*/ undefined,
                             iife
                         )
-                    ])
+                    ], languageVersion > ScriptTarget.ES5 ? NodeFlags.Let : undefined)
                 );
 
                 setOriginalNode(varStatement, node);
diff --git a/tests/baselines/reference/awaitAndYieldInProperty.js b/tests/baselines/reference/awaitAndYieldInProperty.js
index 73c04a612c2d0..238666278a8f1 100644
--- a/tests/baselines/reference/awaitAndYieldInProperty.js
+++ b/tests/baselines/reference/awaitAndYieldInProperty.js
@@ -19,27 +19,31 @@ async function* test(x: Promise<string>) {
 
 //// [awaitAndYieldInProperty.js]
 async function* test(x) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    class C {
-        constructor() {
-            this[_a] = await x;
-            this[_c] = yield 2;
-        }
-    }
-    _a = await x, _b = await x, _c = yield 1, _d = yield 3;
-    C[_b] = await x;
-    C[_d] = yield 4;
-    return _j = class {
+    var _a, _b, _c, _d, _e;
+    let C = /** @class */ (() => {
+        var _e, _f, _g, _h;
+        class C {
             constructor() {
                 this[_e] = await x;
                 this[_g] = yield 2;
             }
+        }
+        _e = await x, _f = await x, _g = yield 1, _h = yield 3;
+        C[_f] = await x;
+        C[_h] = yield 4;
+        return C;
+    })();
+    return _e = class {
+            constructor() {
+                this[_a] = await x;
+                this[_c] = yield 2;
+            }
         },
-        _e = await x,
-        _f = await x,
-        _g = yield 1,
-        _h = yield 3,
-        _j[_f] = await x,
-        _j[_h] = yield 4,
-        _j;
+        _a = await x,
+        _b = await x,
+        _c = yield 1,
+        _d = yield 3,
+        _e[_b] = await x,
+        _e[_d] = yield 4,
+        _e;
 }
diff --git a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.js b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.js
index b3a3d25a81935..0d5cc7e784553 100644
--- a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.js
+++ b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.js
@@ -4,6 +4,9 @@ class C3 {
 }
 
 //// [classDeclarationCheckUsedBeforeDefinitionInItself.js]
-class C3 {
-}
-C3.intance = new C3(); // ok
+let C3 = /** @class */ (() => {
+    class C3 {
+    }
+    C3.intance = new C3(); // ok
+    return C3;
+})();
diff --git a/tests/baselines/reference/computedPropertyNames12_ES6.js b/tests/baselines/reference/computedPropertyNames12_ES6.js
index f56dbf287a8c6..9a0e26d1e24f3 100644
--- a/tests/baselines/reference/computedPropertyNames12_ES6.js
+++ b/tests/baselines/reference/computedPropertyNames12_ES6.js
@@ -17,16 +17,19 @@ class C {
 }
 
 //// [computedPropertyNames12_ES6.js]
-var _a, _b, _c;
 var s;
 var n;
 var a;
-class C {
-    constructor() {
-        this[_a] = n;
-        this[_b] = 2;
-        this[`hello bye`] = 0;
+let C = /** @class */ (() => {
+    var _a, _b, _c;
+    class C {
+        constructor() {
+            this[_a] = n;
+            this[_b] = 2;
+            this[`hello bye`] = 0;
+        }
     }
-}
-_a = n, s + s, _b = s + n, +s, _c = `hello ${a} bye`;
-C[_c] = 0;
+    _a = n, s + s, _b = s + n, +s, _c = `hello ${a} bye`;
+    C[_c] = 0;
+    return C;
+})();
diff --git a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js
index 9f0407588a83e..fcff09585fbfe 100644
--- a/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js
+++ b/tests/baselines/reference/computedPropertyNamesWithStaticProperty.js
@@ -11,13 +11,16 @@ class C {
 }
 
 //// [computedPropertyNamesWithStaticProperty.js]
-class C {
-    get [C.staticProp]() {
-        return "hello";
+let C = /** @class */ (() => {
+    class C {
+        get [C.staticProp]() {
+            return "hello";
+        }
+        set [C.staticProp](x) {
+            var y = x;
+        }
+        [C.staticProp]() { }
     }
-    set [C.staticProp](x) {
-        var y = x;
-    }
-    [C.staticProp]() { }
-}
-C.staticProp = 10;
+    C.staticProp = 10;
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index d9ba6a5ce1261..3b8d6507b4fcb 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -14,12 +14,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var Testing123_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-let Testing123 = Testing123_1 = class Testing123 {
-};
-Testing123.prop1 = Testing123_1.prop0;
-Testing123 = Testing123_1 = __decorate([
-    Something({ v: () => Testing123_1 })
-], Testing123);
+let Testing123 = /** @class */ (() => {
+    var Testing123_1;
+    let Testing123 = Testing123_1 = class Testing123 {
+    };
+    Testing123.prop1 = Testing123_1.prop0;
+    Testing123 = Testing123_1 = __decorate([
+        Something({ v: () => Testing123_1 })
+    ], Testing123);
+    return Testing123;
+})();
 exports.Testing123 = Testing123;
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index 2ed37afa881bf..5af634a7b9dc1 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -12,11 +12,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var Testing123_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-let Testing123 = Testing123_1 = class Testing123 {
-};
-Testing123 = Testing123_1 = __decorate([
-    Something({ v: () => Testing123_1 })
-], Testing123);
+let Testing123 = /** @class */ (() => {
+    var Testing123_1;
+    let Testing123 = Testing123_1 = class Testing123 {
+    };
+    Testing123 = Testing123_1 = __decorate([
+        Something({ v: () => Testing123_1 })
+    ], Testing123);
+    return Testing123;
+})();
 exports.Testing123 = Testing123;
diff --git a/tests/baselines/reference/decoratedClassExportsSystem1.js b/tests/baselines/reference/decoratedClassExportsSystem1.js
index 844a87fe0930b..8d26dfb9a4e5b 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem1.js
+++ b/tests/baselines/reference/decoratedClassExportsSystem1.js
@@ -16,17 +16,21 @@ System.register([], function (exports_1, context_1) {
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
-    var Testing123_1, Testing123;
+    var Testing123;
     var __moduleName = context_1 && context_1.id;
     return {
         setters: [],
         execute: function () {
-            Testing123 = Testing123_1 = class Testing123 {
-            };
-            Testing123.prop1 = Testing123_1.prop0;
-            Testing123 = Testing123_1 = __decorate([
-                Something({ v: () => Testing123_1 })
-            ], Testing123);
+            Testing123 = /** @class */ (() => {
+                var Testing123_1;
+                let Testing123 = Testing123_1 = class Testing123 {
+                };
+                Testing123.prop1 = Testing123_1.prop0;
+                Testing123 = Testing123_1 = __decorate([
+                    Something({ v: () => Testing123_1 })
+                ], Testing123);
+                return Testing123;
+            })();
             exports_1("Testing123", Testing123);
         }
     };
diff --git a/tests/baselines/reference/decoratedClassExportsSystem2.js b/tests/baselines/reference/decoratedClassExportsSystem2.js
index a9458e125b325..cc26df71f033a 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem2.js
+++ b/tests/baselines/reference/decoratedClassExportsSystem2.js
@@ -13,16 +13,20 @@ System.register([], function (exports_1, context_1) {
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
-    var Testing123_1, Testing123;
+    var Testing123;
     var __moduleName = context_1 && context_1.id;
     return {
         setters: [],
         execute: function () {
-            Testing123 = Testing123_1 = class Testing123 {
-            };
-            Testing123 = Testing123_1 = __decorate([
-                Something({ v: () => Testing123_1 })
-            ], Testing123);
+            Testing123 = /** @class */ (() => {
+                var Testing123_1;
+                let Testing123 = Testing123_1 = class Testing123 {
+                };
+                Testing123 = Testing123_1 = __decorate([
+                    Something({ v: () => Testing123_1 })
+                ], Testing123);
+                return Testing123;
+            })();
             exports_1("Testing123", Testing123);
         }
     };
diff --git a/tests/baselines/reference/decoratedClassFromExternalModule.js b/tests/baselines/reference/decoratedClassFromExternalModule.js
index ce397323d9ccd..a4ae38133b89a 100644
--- a/tests/baselines/reference/decoratedClassFromExternalModule.js
+++ b/tests/baselines/reference/decoratedClassFromExternalModule.js
@@ -17,10 +17,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 function decorate(target) { }
-let Decorated = class Decorated {
-};
-Decorated = __decorate([
-    decorate
-], Decorated);
+let Decorated = /** @class */ (() => {
+    let Decorated = class Decorated {
+    };
+    Decorated = __decorate([
+        decorate
+    ], Decorated);
+    return Decorated;
+})();
 export default Decorated;
 //// [undecorated.js]
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
index dadaa5ed6df1b..5772bdade2003 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
@@ -24,11 +24,14 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
-    let Foo = class Foo {
-    };
-    Foo = __decorate([
-        decorator
-    ], Foo);
+    let Foo = /** @class */ (() => {
+        let Foo = class Foo {
+        };
+        Foo = __decorate([
+            decorator
+        ], Foo);
+        return Foo;
+    })();
     exports.default = Foo;
 });
 //// [b.js]
@@ -42,10 +45,13 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
-    let default_1 = class {
-    };
-    default_1 = __decorate([
-        decorator
-    ], default_1);
+    let default_1 = /** @class */ (() => {
+        let default_1 = class {
+        };
+        default_1 = __decorate([
+            decorator
+        ], default_1);
+        return default_1;
+    })();
     exports.default = default_1;
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
index f6c7b7cbc8b80..51a3144eb91f2 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
@@ -23,11 +23,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
-let Foo = class Foo {
-};
-Foo = __decorate([
-    decorator
-], Foo);
+let Foo = /** @class */ (() => {
+    let Foo = class Foo {
+    };
+    Foo = __decorate([
+        decorator
+    ], Foo);
+    return Foo;
+})();
 exports.default = Foo;
 //// [b.js]
 "use strict";
@@ -39,9 +42,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
-let default_1 = class {
-};
-default_1 = __decorate([
-    decorator
-], default_1);
+let default_1 = /** @class */ (() => {
+    let default_1 = class {
+    };
+    default_1 = __decorate([
+        decorator
+    ], default_1);
+    return default_1;
+})();
 exports.default = default_1;
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
index 63290f4176a2b..2c92aa2a6c372 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
@@ -26,11 +26,14 @@ System.register([], function (exports_1, context_1) {
     return {
         setters: [],
         execute: function () {
-            Foo = class Foo {
-            };
-            Foo = __decorate([
-                decorator
-            ], Foo);
+            Foo = /** @class */ (() => {
+                let Foo = class Foo {
+                };
+                Foo = __decorate([
+                    decorator
+                ], Foo);
+                return Foo;
+            })();
             exports_1("default", Foo);
         }
     };
@@ -49,11 +52,14 @@ System.register([], function (exports_1, context_1) {
     return {
         setters: [],
         execute: function () {
-            default_1 = class {
-            };
-            default_1 = __decorate([
-                decorator
-            ], default_1);
+            default_1 = /** @class */ (() => {
+                let default_1 = class {
+                };
+                default_1 = __decorate([
+                    decorator
+                ], default_1);
+                return default_1;
+            })();
             exports_1("default", default_1);
         }
     };
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index beb5fa26755ef..f8c2160559e40 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -32,11 +32,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
-    let Foo = class Foo {
-    };
-    Foo = __decorate([
-        decorator
-    ], Foo);
+    let Foo = /** @class */ (() => {
+        let Foo = class Foo {
+        };
+        Foo = __decorate([
+            decorator
+        ], Foo);
+        return Foo;
+    })();
     exports.default = Foo;
 });
 //// [b.js]
@@ -58,10 +61,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
-    let default_1 = class {
-    };
-    default_1 = __decorate([
-        decorator
-    ], default_1);
+    let default_1 = /** @class */ (() => {
+        let default_1 = class {
+        };
+        default_1 = __decorate([
+            decorator
+        ], default_1);
+        return default_1;
+    })();
     exports.default = default_1;
 });
diff --git a/tests/baselines/reference/decoratorMetadataPromise.js b/tests/baselines/reference/decoratorMetadataPromise.js
index 41bb42e27328e..d724e048afda0 100644
--- a/tests/baselines/reference/decoratorMetadataPromise.js
+++ b/tests/baselines/reference/decoratorMetadataPromise.js
@@ -30,30 +30,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-class A {
-    foo() {
-        return __awaiter(this, void 0, void 0, function* () { });
+let A = /** @class */ (() => {
+    class A {
+        foo() {
+            return __awaiter(this, void 0, void 0, function* () { });
+        }
+        bar() {
+            return __awaiter(this, void 0, void 0, function* () { return 0; });
+        }
+        baz(n) { return n; }
     }
-    bar() {
-        return __awaiter(this, void 0, void 0, function* () { return 0; });
-    }
-    baz(n) { return n; }
-}
-__decorate([
-    decorator,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], A.prototype, "foo", null);
-__decorate([
-    decorator,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], A.prototype, "bar", null);
-__decorate([
-    decorator,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Promise]),
-    __metadata("design:returntype", Promise)
-], A.prototype, "baz", null);
+    __decorate([
+        decorator,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Promise)
+    ], A.prototype, "foo", null);
+    __decorate([
+        decorator,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Promise)
+    ], A.prototype, "bar", null);
+    __decorate([
+        decorator,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Promise]),
+        __metadata("design:returntype", Promise)
+    ], A.prototype, "baz", null);
+    return A;
+})();
diff --git a/tests/baselines/reference/decoratorOnClass1.es6.js b/tests/baselines/reference/decoratorOnClass1.es6.js
index 7a02b9f5cd877..6e2f74e995780 100644
--- a/tests/baselines/reference/decoratorOnClass1.es6.js
+++ b/tests/baselines/reference/decoratorOnClass1.es6.js
@@ -14,9 +14,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let C = class C {
-};
-C = __decorate([
-    dec
-], C);
+let C = /** @class */ (() => {
+    let C = class C {
+    };
+    C = __decorate([
+        dec
+    ], C);
+    return C;
+})();
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass2.es6.js b/tests/baselines/reference/decoratorOnClass2.es6.js
index d1258af98b90f..6946945df6267 100644
--- a/tests/baselines/reference/decoratorOnClass2.es6.js
+++ b/tests/baselines/reference/decoratorOnClass2.es6.js
@@ -14,10 +14,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let C = class C {
-};
-C = __decorate([
-    dec
-], C);
+let C = /** @class */ (() => {
+    let C = class C {
+    };
+    C = __decorate([
+        dec
+    ], C);
+    return C;
+})();
 export { C };
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass3.es6.js b/tests/baselines/reference/decoratorOnClass3.es6.js
index a6b1d6e258997..4cdfc3e6865de 100644
--- a/tests/baselines/reference/decoratorOnClass3.es6.js
+++ b/tests/baselines/reference/decoratorOnClass3.es6.js
@@ -14,10 +14,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let C = class C {
-};
-C = __decorate([
-    dec
-], C);
+let C = /** @class */ (() => {
+    let C = class C {
+    };
+    C = __decorate([
+        dec
+    ], C);
+    return C;
+})();
 export default C;
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass4.es6.js b/tests/baselines/reference/decoratorOnClass4.es6.js
index 0435c822da6bc..915f91f8721b0 100644
--- a/tests/baselines/reference/decoratorOnClass4.es6.js
+++ b/tests/baselines/reference/decoratorOnClass4.es6.js
@@ -12,9 +12,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let default_1 = class {
-};
-default_1 = __decorate([
-    dec
-], default_1);
+let default_1 = /** @class */ (() => {
+    let default_1 = class {
+    };
+    default_1 = __decorate([
+        dec
+    ], default_1);
+    return default_1;
+})();
 export default default_1;
diff --git a/tests/baselines/reference/decoratorOnClass5.es6.js b/tests/baselines/reference/decoratorOnClass5.es6.js
index b1c45cbce312c..0c9fa643ebe03 100644
--- a/tests/baselines/reference/decoratorOnClass5.es6.js
+++ b/tests/baselines/reference/decoratorOnClass5.es6.js
@@ -16,12 +16,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var C_1;
-let C = C_1 = class C {
-    static x() { return C_1.y; }
-};
-C.y = 1;
-C = C_1 = __decorate([
-    dec
-], C);
+let C = /** @class */ (() => {
+    var C_1;
+    let C = C_1 = class C {
+        static x() { return C_1.y; }
+    };
+    C.y = 1;
+    C = C_1 = __decorate([
+        dec
+    ], C);
+    return C;
+})();
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass6.es6.js b/tests/baselines/reference/decoratorOnClass6.es6.js
index f9d8d2f419929..e54247c0246c3 100644
--- a/tests/baselines/reference/decoratorOnClass6.es6.js
+++ b/tests/baselines/reference/decoratorOnClass6.es6.js
@@ -16,13 +16,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var C_1;
-let C = C_1 = class C {
-    static x() { return C_1.y; }
-};
-C.y = 1;
-C = C_1 = __decorate([
-    dec
-], C);
+let C = /** @class */ (() => {
+    var C_1;
+    let C = C_1 = class C {
+        static x() { return C_1.y; }
+    };
+    C.y = 1;
+    C = C_1 = __decorate([
+        dec
+    ], C);
+    return C;
+})();
 export { C };
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass7.es6.js b/tests/baselines/reference/decoratorOnClass7.es6.js
index aefc9536a878c..105ce5f5ef35e 100644
--- a/tests/baselines/reference/decoratorOnClass7.es6.js
+++ b/tests/baselines/reference/decoratorOnClass7.es6.js
@@ -16,13 +16,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var C_1;
-let C = C_1 = class C {
-    static x() { return C_1.y; }
-};
-C.y = 1;
-C = C_1 = __decorate([
-    dec
-], C);
+let C = /** @class */ (() => {
+    var C_1;
+    let C = C_1 = class C {
+        static x() { return C_1.y; }
+    };
+    C.y = 1;
+    C = C_1 = __decorate([
+        dec
+    ], C);
+    return C;
+})();
 export default C;
 let c = new C();
diff --git a/tests/baselines/reference/decoratorOnClass8.es6.js b/tests/baselines/reference/decoratorOnClass8.es6.js
index 88dd41e7b6065..7b91f4d266b24 100644
--- a/tests/baselines/reference/decoratorOnClass8.es6.js
+++ b/tests/baselines/reference/decoratorOnClass8.es6.js
@@ -13,10 +13,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let default_1 = class default_1 {
-};
-default_1.y = 1;
-default_1 = __decorate([
-    dec
-], default_1);
+let default_1 = /** @class */ (() => {
+    let default_1 = class default_1 {
+    };
+    default_1.y = 1;
+    default_1 = __decorate([
+        dec
+    ], default_1);
+    return default_1;
+})();
 export default default_1;
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.es6.js b/tests/baselines/reference/decoratorOnClassAccessor1.es6.js
index 484005b7a3680..6b010f8a1b033 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.es6.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.es6.js
@@ -12,9 +12,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-export default class default_1 {
-    get accessor() { return 1; }
-}
-__decorate([
-    dec
-], default_1.prototype, "accessor", null);
+let default_1 = /** @class */ (() => {
+    class default_1 {
+        get accessor() { return 1; }
+    }
+    __decorate([
+        dec
+    ], default_1.prototype, "accessor", null);
+    return default_1;
+})();
+export default default_1;
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.es6.js b/tests/baselines/reference/decoratorOnClassMethod1.es6.js
index 6c518ae805ee0..ffdac44708e6d 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.es6.js
+++ b/tests/baselines/reference/decoratorOnClassMethod1.es6.js
@@ -12,9 +12,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-export default class default_1 {
-    method() { }
-}
-__decorate([
-    dec
-], default_1.prototype, "method", null);
+let default_1 = /** @class */ (() => {
+    class default_1 {
+        method() { }
+    }
+    __decorate([
+        dec
+    ], default_1.prototype, "method", null);
+    return default_1;
+})();
+export default default_1;
diff --git a/tests/baselines/reference/decoratorOnClassMethod13.js b/tests/baselines/reference/decoratorOnClassMethod13.js
index e8a913070fcea..9bc4d1e45ab57 100644
--- a/tests/baselines/reference/decoratorOnClassMethod13.js
+++ b/tests/baselines/reference/decoratorOnClassMethod13.js
@@ -13,13 +13,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-class C {
-    ["1"]() { }
-    ["b"]() { }
-}
-__decorate([
-    dec
-], C.prototype, "1", null);
-__decorate([
-    dec
-], C.prototype, "b", null);
+let C = /** @class */ (() => {
+    class C {
+        ["1"]() { }
+        ["b"]() { }
+    }
+    __decorate([
+        dec
+    ], C.prototype, "1", null);
+    __decorate([
+        dec
+    ], C.prototype, "b", null);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.js b/tests/baselines/reference/decoratorOnClassMethod4.js
index c68cca5d3a04f..f719fb309931a 100644
--- a/tests/baselines/reference/decoratorOnClassMethod4.js
+++ b/tests/baselines/reference/decoratorOnClassMethod4.js
@@ -12,9 +12,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-class C {
-    ["method"]() { }
-}
-__decorate([
-    dec
-], C.prototype, "method", null);
+let C = /** @class */ (() => {
+    class C {
+        ["method"]() { }
+    }
+    __decorate([
+        dec
+    ], C.prototype, "method", null);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.js b/tests/baselines/reference/decoratorOnClassMethod5.js
index c89ebc6bb38e3..d3985ad6904e4 100644
--- a/tests/baselines/reference/decoratorOnClassMethod5.js
+++ b/tests/baselines/reference/decoratorOnClassMethod5.js
@@ -12,9 +12,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-class C {
-    ["method"]() { }
-}
-__decorate([
-    dec()
-], C.prototype, "method", null);
+let C = /** @class */ (() => {
+    class C {
+        ["method"]() { }
+    }
+    __decorate([
+        dec()
+    ], C.prototype, "method", null);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.js b/tests/baselines/reference/decoratorOnClassMethod6.js
index 45f5eeddb8129..a436f1a7ec95e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod6.js
+++ b/tests/baselines/reference/decoratorOnClassMethod6.js
@@ -12,9 +12,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-class C {
-    ["method"]() { }
-}
-__decorate([
-    dec
-], C.prototype, "method", null);
+let C = /** @class */ (() => {
+    class C {
+        ["method"]() { }
+    }
+    __decorate([
+        dec
+    ], C.prototype, "method", null);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.js b/tests/baselines/reference/decoratorOnClassMethod7.js
index dc92364cd89eb..0777661051512 100644
--- a/tests/baselines/reference/decoratorOnClassMethod7.js
+++ b/tests/baselines/reference/decoratorOnClassMethod7.js
@@ -12,9 +12,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-class C {
-    ["method"]() { }
-}
-__decorate([
-    dec
-], C.prototype, "method", null);
+let C = /** @class */ (() => {
+    class C {
+        ["method"]() { }
+    }
+    __decorate([
+        dec
+    ], C.prototype, "method", null);
+    return C;
+})();
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.js
index b58c69150e5e8..9d249d8bdf304 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.js
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.js
@@ -15,9 +15,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-export default class default_1 {
-    method(p) { }
-}
-__decorate([
-    __param(0, dec)
-], default_1.prototype, "method", null);
+let default_1 = /** @class */ (() => {
+    class default_1 {
+        method(p) { }
+    }
+    __decorate([
+        __param(0, dec)
+    ], default_1.prototype, "method", null);
+    return default_1;
+})();
+export default default_1;
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.es6.js b/tests/baselines/reference/decoratorOnClassProperty1.es6.js
index 81b72acf47811..17ef5044de986 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.es6.js
+++ b/tests/baselines/reference/decoratorOnClassProperty1.es6.js
@@ -12,8 +12,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-export default class default_1 {
-}
-__decorate([
-    dec
-], default_1.prototype, "prop", void 0);
+let default_1 = /** @class */ (() => {
+    class default_1 {
+    }
+    __decorate([
+        dec
+    ], default_1.prototype, "prop", void 0);
+    return default_1;
+})();
+export default default_1;
diff --git a/tests/baselines/reference/decoratorsOnComputedProperties.js b/tests/baselines/reference/decoratorsOnComputedProperties.js
index 3f0444b310aaa..cdaead9ec259f 100644
--- a/tests/baselines/reference/decoratorsOnComputedProperties.js
+++ b/tests/baselines/reference/decoratorsOnComputedProperties.js
@@ -197,262 +197,282 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var _a, _b, _c, _d;
-var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
+var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
 function x(o, k) { }
 let i = 0;
 function foo() { return ++i + ""; }
 const fieldNameA = "fieldName1";
 const fieldNameB = "fieldName2";
 const fieldNameC = "fieldName3";
-class A {
-    constructor() {
-        this["property2"] = 2;
-        this[Symbol.iterator] = null;
-        this["property4"] = 2;
-        this[Symbol.match] = null;
-        this[_f] = null;
-        this[_h] = null;
+let A = /** @class */ (() => {
+    var _a, _b, _c, _d;
+    class A {
+        constructor() {
+            this["property2"] = 2;
+            this[Symbol.iterator] = null;
+            this["property4"] = 2;
+            this[Symbol.match] = null;
+            this[_b] = null;
+            this[_d] = null;
+        }
     }
-}
-foo(), _e = foo(), _f = foo(), _g = fieldNameB, _h = fieldNameC;
-__decorate([
-    x
-], A.prototype, "property", void 0);
-__decorate([
-    x
-], A.prototype, Symbol.toStringTag, void 0);
-__decorate([
-    x
-], A.prototype, "property2", void 0);
-__decorate([
-    x
-], A.prototype, Symbol.iterator, void 0);
-__decorate([
-    x
-], A.prototype, _e, void 0);
-__decorate([
-    x
-], A.prototype, _f, void 0);
-__decorate([
-    x
-], A.prototype, _g, void 0);
-__decorate([
-    x
-], A.prototype, _h, void 0);
+    foo(), _a = foo(), _b = foo(), _c = fieldNameB, _d = fieldNameC;
+    __decorate([
+        x
+    ], A.prototype, "property", void 0);
+    __decorate([
+        x
+    ], A.prototype, Symbol.toStringTag, void 0);
+    __decorate([
+        x
+    ], A.prototype, "property2", void 0);
+    __decorate([
+        x
+    ], A.prototype, Symbol.iterator, void 0);
+    __decorate([
+        x
+    ], A.prototype, _a, void 0);
+    __decorate([
+        x
+    ], A.prototype, _b, void 0);
+    __decorate([
+        x
+    ], A.prototype, _c, void 0);
+    __decorate([
+        x
+    ], A.prototype, _d, void 0);
+    return A;
+})();
 void (_a = class B {
         constructor() {
             this["property2"] = 2;
             this[Symbol.iterator] = null;
             this["property4"] = 2;
             this[Symbol.match] = null;
-            this[_k] = null;
-            this[_m] = null;
+            this[_f] = null;
+            this[_h] = null;
         }
     },
     foo(),
-    _j = foo(),
-    _k = foo(),
-    _l = fieldNameB,
-    _m = fieldNameC,
+    _e = foo(),
+    _f = foo(),
+    _g = fieldNameB,
+    _h = fieldNameC,
     _a);
-class C {
-    constructor() {
-        this["property2"] = 2;
-        this[Symbol.iterator] = null;
-        this["property4"] = 2;
-        this[Symbol.match] = null;
-        this[_p] = null;
-        this[_r] = null;
+let C = /** @class */ (() => {
+    var _a, _b, _c, _d;
+    class C {
+        constructor() {
+            this["property2"] = 2;
+            this[Symbol.iterator] = null;
+            this["property4"] = 2;
+            this[Symbol.match] = null;
+            this[_b] = null;
+            this[_d] = null;
+        }
+        [(foo(), _a = foo(), _b = foo(), _c = fieldNameB, _d = fieldNameC, "some" + "method")]() { }
     }
-    [(foo(), _o = foo(), _p = foo(), _q = fieldNameB, _r = fieldNameC, "some" + "method")]() { }
-}
-__decorate([
-    x
-], C.prototype, "property", void 0);
-__decorate([
-    x
-], C.prototype, Symbol.toStringTag, void 0);
-__decorate([
-    x
-], C.prototype, "property2", void 0);
-__decorate([
-    x
-], C.prototype, Symbol.iterator, void 0);
-__decorate([
-    x
-], C.prototype, _o, void 0);
-__decorate([
-    x
-], C.prototype, _p, void 0);
-__decorate([
-    x
-], C.prototype, _q, void 0);
-__decorate([
-    x
-], C.prototype, _r, void 0);
+    __decorate([
+        x
+    ], C.prototype, "property", void 0);
+    __decorate([
+        x
+    ], C.prototype, Symbol.toStringTag, void 0);
+    __decorate([
+        x
+    ], C.prototype, "property2", void 0);
+    __decorate([
+        x
+    ], C.prototype, Symbol.iterator, void 0);
+    __decorate([
+        x
+    ], C.prototype, _a, void 0);
+    __decorate([
+        x
+    ], C.prototype, _b, void 0);
+    __decorate([
+        x
+    ], C.prototype, _c, void 0);
+    __decorate([
+        x
+    ], C.prototype, _d, void 0);
+    return C;
+})();
 void class D {
     constructor() {
         this["property2"] = 2;
         this[Symbol.iterator] = null;
         this["property4"] = 2;
         this[Symbol.match] = null;
-        this[_t] = null;
-        this[_v] = null;
+        this[_k] = null;
+        this[_m] = null;
     }
-    [(foo(), _s = foo(), _t = foo(), _u = fieldNameB, _v = fieldNameC, "some" + "method")]() { }
+    [(foo(), _j = foo(), _k = foo(), _l = fieldNameB, _m = fieldNameC, "some" + "method")]() { }
 };
-class E {
-    constructor() {
-        this["property2"] = 2;
-        this[Symbol.iterator] = null;
-        this["property4"] = 2;
-        this[Symbol.match] = null;
-        this[_x] = null;
-        this[_z] = null;
+let E = /** @class */ (() => {
+    var _a, _b, _c, _d;
+    class E {
+        constructor() {
+            this["property2"] = 2;
+            this[Symbol.iterator] = null;
+            this["property4"] = 2;
+            this[Symbol.match] = null;
+            this[_b] = null;
+            this[_d] = null;
+        }
+        [(foo(), _a = foo(), _b = foo(), "some" + "method")]() { }
     }
-    [(foo(), _w = foo(), _x = foo(), "some" + "method")]() { }
-}
-_y = fieldNameB, _z = fieldNameC;
-__decorate([
-    x
-], E.prototype, "property", void 0);
-__decorate([
-    x
-], E.prototype, Symbol.toStringTag, void 0);
-__decorate([
-    x
-], E.prototype, "property2", void 0);
-__decorate([
-    x
-], E.prototype, Symbol.iterator, void 0);
-__decorate([
-    x
-], E.prototype, _w, void 0);
-__decorate([
-    x
-], E.prototype, _x, void 0);
-__decorate([
-    x
-], E.prototype, _y, void 0);
-__decorate([
-    x
-], E.prototype, _z, void 0);
+    _c = fieldNameB, _d = fieldNameC;
+    __decorate([
+        x
+    ], E.prototype, "property", void 0);
+    __decorate([
+        x
+    ], E.prototype, Symbol.toStringTag, void 0);
+    __decorate([
+        x
+    ], E.prototype, "property2", void 0);
+    __decorate([
+        x
+    ], E.prototype, Symbol.iterator, void 0);
+    __decorate([
+        x
+    ], E.prototype, _a, void 0);
+    __decorate([
+        x
+    ], E.prototype, _b, void 0);
+    __decorate([
+        x
+    ], E.prototype, _c, void 0);
+    __decorate([
+        x
+    ], E.prototype, _d, void 0);
+    return E;
+})();
 void (_b = class F {
         constructor() {
             this["property2"] = 2;
             this[Symbol.iterator] = null;
             this["property4"] = 2;
             this[Symbol.match] = null;
-            this[_1] = null;
-            this[_3] = null;
+            this[_p] = null;
+            this[_r] = null;
         }
-        [(foo(), _0 = foo(), _1 = foo(), "some" + "method")]() { }
+        [(foo(), _o = foo(), _p = foo(), "some" + "method")]() { }
     },
-    _2 = fieldNameB,
-    _3 = fieldNameC,
+    _q = fieldNameB,
+    _r = fieldNameC,
     _b);
-class G {
-    constructor() {
-        this["property2"] = 2;
-        this[Symbol.iterator] = null;
-        this["property4"] = 2;
-        this[Symbol.match] = null;
-        this[_5] = null;
-        this[_7] = null;
+let G = /** @class */ (() => {
+    var _a, _b, _c, _d;
+    class G {
+        constructor() {
+            this["property2"] = 2;
+            this[Symbol.iterator] = null;
+            this["property4"] = 2;
+            this[Symbol.match] = null;
+            this[_b] = null;
+            this[_d] = null;
+        }
+        [(foo(), _a = foo(), _b = foo(), "some" + "method")]() { }
+        [(_c = fieldNameB, "some" + "method2")]() { }
     }
-    [(foo(), _4 = foo(), _5 = foo(), "some" + "method")]() { }
-    [(_6 = fieldNameB, "some" + "method2")]() { }
-}
-_7 = fieldNameC;
-__decorate([
-    x
-], G.prototype, "property", void 0);
-__decorate([
-    x
-], G.prototype, Symbol.toStringTag, void 0);
-__decorate([
-    x
-], G.prototype, "property2", void 0);
-__decorate([
-    x
-], G.prototype, Symbol.iterator, void 0);
-__decorate([
-    x
-], G.prototype, _4, void 0);
-__decorate([
-    x
-], G.prototype, _5, void 0);
-__decorate([
-    x
-], G.prototype, _6, void 0);
-__decorate([
-    x
-], G.prototype, _7, void 0);
+    _d = fieldNameC;
+    __decorate([
+        x
+    ], G.prototype, "property", void 0);
+    __decorate([
+        x
+    ], G.prototype, Symbol.toStringTag, void 0);
+    __decorate([
+        x
+    ], G.prototype, "property2", void 0);
+    __decorate([
+        x
+    ], G.prototype, Symbol.iterator, void 0);
+    __decorate([
+        x
+    ], G.prototype, _a, void 0);
+    __decorate([
+        x
+    ], G.prototype, _b, void 0);
+    __decorate([
+        x
+    ], G.prototype, _c, void 0);
+    __decorate([
+        x
+    ], G.prototype, _d, void 0);
+    return G;
+})();
 void (_c = class H {
         constructor() {
             this["property2"] = 2;
             this[Symbol.iterator] = null;
             this["property4"] = 2;
             this[Symbol.match] = null;
-            this[_9] = null;
-            this[_11] = null;
+            this[_t] = null;
+            this[_v] = null;
         }
-        [(foo(), _8 = foo(), _9 = foo(), "some" + "method")]() { }
-        [(_10 = fieldNameB, "some" + "method2")]() { }
+        [(foo(), _s = foo(), _t = foo(), "some" + "method")]() { }
+        [(_u = fieldNameB, "some" + "method2")]() { }
     },
-    _11 = fieldNameC,
+    _v = fieldNameC,
     _c);
-class I {
-    constructor() {
-        this["property2"] = 2;
-        this[Symbol.iterator] = null;
-        this["property4"] = 2;
-        this[Symbol.match] = null;
-        this[_13] = null;
-        this[_16] = null;
+let I = /** @class */ (() => {
+    var _a, _b, _c, _d, _e;
+    class I {
+        constructor() {
+            this["property2"] = 2;
+            this[Symbol.iterator] = null;
+            this["property4"] = 2;
+            this[Symbol.match] = null;
+            this[_b] = null;
+            this[_e] = null;
+        }
+        [(foo(), _a = foo(), _b = foo(), _c = "some" + "method")]() { }
+        [(_d = fieldNameB, "some" + "method2")]() { }
     }
-    [(foo(), _12 = foo(), _13 = foo(), _14 = "some" + "method")]() { }
-    [(_15 = fieldNameB, "some" + "method2")]() { }
-}
-_16 = fieldNameC;
-__decorate([
-    x
-], I.prototype, "property", void 0);
-__decorate([
-    x
-], I.prototype, Symbol.toStringTag, void 0);
-__decorate([
-    x
-], I.prototype, "property2", void 0);
-__decorate([
-    x
-], I.prototype, Symbol.iterator, void 0);
-__decorate([
-    x
-], I.prototype, _12, void 0);
-__decorate([
-    x
-], I.prototype, _13, void 0);
-__decorate([
-    x
-], I.prototype, _14, null);
-__decorate([
-    x
-], I.prototype, _15, void 0);
-__decorate([
-    x
-], I.prototype, _16, void 0);
+    _e = fieldNameC;
+    __decorate([
+        x
+    ], I.prototype, "property", void 0);
+    __decorate([
+        x
+    ], I.prototype, Symbol.toStringTag, void 0);
+    __decorate([
+        x
+    ], I.prototype, "property2", void 0);
+    __decorate([
+        x
+    ], I.prototype, Symbol.iterator, void 0);
+    __decorate([
+        x
+    ], I.prototype, _a, void 0);
+    __decorate([
+        x
+    ], I.prototype, _b, void 0);
+    __decorate([
+        x
+    ], I.prototype, _c, null);
+    __decorate([
+        x
+    ], I.prototype, _d, void 0);
+    __decorate([
+        x
+    ], I.prototype, _e, void 0);
+    return I;
+})();
 void (_d = class J {
         constructor() {
             this["property2"] = 2;
             this[Symbol.iterator] = null;
             this["property4"] = 2;
             this[Symbol.match] = null;
-            this[_18] = null;
-            this[_21] = null;
+            this[_x] = null;
+            this[_0] = null;
         }
-        [(foo(), _17 = foo(), _18 = foo(), _19 = "some" + "method")]() { }
-        [(_20 = fieldNameB, "some" + "method2")]() { }
+        [(foo(), _w = foo(), _x = foo(), _y = "some" + "method")]() { }
+        [(_z = fieldNameB, "some" + "method2")]() { }
     },
-    _21 = fieldNameC,
+    _0 = fieldNameC,
     _d);
diff --git a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.js b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.js
index 961bd4041cdf8..337dc8d03f743 100644
--- a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.js
@@ -15,19 +15,22 @@ class B {
 }
 
 //// [emitClassDeclarationWithLiteralPropertyNameInES6.js]
-class B {
-    constructor() {
-        this["hello"] = 10;
-        this[0b110] = "world";
-        this[0o23534] = "WORLD";
-        this[20] = "twenty";
+let B = /** @class */ (() => {
+    class B {
+        constructor() {
+            this["hello"] = 10;
+            this[0b110] = "world";
+            this[0o23534] = "WORLD";
+            this[20] = "twenty";
+        }
+        "foo"() { }
+        0b1110() { }
+        11() { }
+        interface() { }
     }
-    "foo"() { }
-    0b1110() { }
-    11() { }
-    interface() { }
-}
-B["hi"] = 10000;
-B[22] = "twenty-two";
-B[0b101] = "binary";
-B[0o3235] = "octal";
+    B["hi"] = 10000;
+    B[22] = "twenty-two";
+    B[0b101] = "binary";
+    B[0o3235] = "octal";
+    return B;
+})();
diff --git a/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.js b/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.js
index 8e0bf3de06bcd..7d0b9e7e95c86 100644
--- a/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.js
+++ b/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.js
@@ -10,12 +10,18 @@ class D {
 
 
 //// [emitClassDeclarationWithStaticPropertyAssignmentInES6.js]
-class C {
-}
-C.z = "Foo";
-class D {
-    constructor() {
-        this.x = 20000;
+let C = /** @class */ (() => {
+    class C {
     }
-}
-D.b = true;
+    C.z = "Foo";
+    return C;
+})();
+let D = /** @class */ (() => {
+    class D {
+        constructor() {
+            this.x = 20000;
+        }
+    }
+    D.b = true;
+    return D;
+})();
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).js
index b0039e8d4834b..69f5522723f07 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).js
@@ -17,11 +17,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    let A = class A {
-    };
-    A = __decorate([
-        dec
-    ], A);
+    let A = /** @class */ (() => {
+        let A = class A {
+        };
+        A = __decorate([
+            dec
+        ], A);
+        return A;
+    })();
     exports.A = A;
     const o = { a: 1 };
     const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=commonjs).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=commonjs).js
index 42fcc5acf61d4..09dacd74722f5 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=commonjs).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=commonjs).js
@@ -16,11 +16,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-let A = class A {
-};
-A = __decorate([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = __decorate([
+        dec
+    ], A);
+    return A;
+})();
 exports.A = A;
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es2020).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es2020).js
index 74b96c362b390..a8e82719015ea 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es2020).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es2020).js
@@ -14,11 +14,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let A = class A {
-};
-A = __decorate([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = __decorate([
+        dec
+    ], A);
+    return A;
+})();
 export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es6).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es6).js
index 74b96c362b390..a8e82719015ea 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es6).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=es6).js
@@ -14,11 +14,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let A = class A {
-};
-A = __decorate([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = __decorate([
+        dec
+    ], A);
+    return A;
+})();
 export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=esnext).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=esnext).js
index 74b96c362b390..a8e82719015ea 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=esnext).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=esnext).js
@@ -14,11 +14,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let A = class A {
-};
-A = __decorate([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = __decorate([
+        dec
+    ], A);
+    return A;
+})();
 export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).js
index 42fcc5acf61d4..09dacd74722f5 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).js
@@ -16,11 +16,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-let A = class A {
-};
-A = __decorate([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = __decorate([
+        dec
+    ], A);
+    return A;
+})();
 exports.A = A;
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).js
index 8c40955c2cad4..399428ad01502 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).js
@@ -21,11 +21,14 @@ System.register([], function (exports_1, context_1) {
     return {
         setters: [],
         execute: function () {
-            A = class A {
-            };
-            A = __decorate([
-                dec
-            ], A);
+            A = /** @class */ (() => {
+                let A = class A {
+                };
+                A = __decorate([
+                    dec
+                ], A);
+                return A;
+            })();
             exports_1("A", A);
             o = { a: 1 };
             y = Object.assign({}, o);
diff --git a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).js b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).js
index 330e5ea0acb0b..3014bd421f450 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).js
@@ -25,11 +25,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    let A = class A {
-    };
-    A = __decorate([
-        dec
-    ], A);
+    let A = /** @class */ (() => {
+        let A = class A {
+        };
+        A = __decorate([
+            dec
+        ], A);
+        return A;
+    })();
     exports.A = A;
     const o = { a: 1 };
     const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/es6ModuleClassDeclaration.js b/tests/baselines/reference/es6ModuleClassDeclaration.js
index a228739abbfb7..d0dbc29e7daa1 100644
--- a/tests/baselines/reference/es6ModuleClassDeclaration.js
+++ b/tests/baselines/reference/es6ModuleClassDeclaration.js
@@ -113,43 +113,8 @@ module m2 {
 }
 
 //// [es6ModuleClassDeclaration.js]
-export class c {
-    constructor() {
-        this.x = 10;
-        this.y = 30;
-    }
-    method1() {
-    }
-    method2() {
-    }
-    static method3() {
-    }
-    static method4() {
-    }
-}
-c.k = 20;
-c.l = 30;
-class c2 {
-    constructor() {
-        this.x = 10;
-        this.y = 30;
-    }
-    method1() {
-    }
-    method2() {
-    }
-    static method3() {
-    }
-    static method4() {
-    }
-}
-c2.k = 20;
-c2.l = 30;
-new c();
-new c2();
-export var m1;
-(function (m1) {
-    class c3 {
+let c = /** @class */ (() => {
+    class c {
         constructor() {
             this.x = 10;
             this.y = 30;
@@ -163,10 +128,13 @@ export var m1;
         static method4() {
         }
     }
-    c3.k = 20;
-    c3.l = 30;
-    m1.c3 = c3;
-    class c4 {
+    c.k = 20;
+    c.l = 30;
+    return c;
+})();
+export { c };
+let c2 = /** @class */ (() => {
+    class c2 {
         constructor() {
             this.x = 10;
             this.y = 30;
@@ -180,8 +148,53 @@ export var m1;
         static method4() {
         }
     }
-    c4.k = 20;
-    c4.l = 30;
+    c2.k = 20;
+    c2.l = 30;
+    return c2;
+})();
+new c();
+new c2();
+export var m1;
+(function (m1) {
+    let c3 = /** @class */ (() => {
+        class c3 {
+            constructor() {
+                this.x = 10;
+                this.y = 30;
+            }
+            method1() {
+            }
+            method2() {
+            }
+            static method3() {
+            }
+            static method4() {
+            }
+        }
+        c3.k = 20;
+        c3.l = 30;
+        return c3;
+    })();
+    m1.c3 = c3;
+    let c4 = /** @class */ (() => {
+        class c4 {
+            constructor() {
+                this.x = 10;
+                this.y = 30;
+            }
+            method1() {
+            }
+            method2() {
+            }
+            static method3() {
+            }
+            static method4() {
+            }
+        }
+        c4.k = 20;
+        c4.l = 30;
+        return c4;
+    })();
     new c();
     new c2();
     new c3();
@@ -189,39 +202,45 @@ export var m1;
 })(m1 || (m1 = {}));
 var m2;
 (function (m2) {
-    class c3 {
-        constructor() {
-            this.x = 10;
-            this.y = 30;
-        }
-        method1() {
-        }
-        method2() {
-        }
-        static method3() {
-        }
-        static method4() {
-        }
-    }
-    c3.k = 20;
-    c3.l = 30;
+    let c3 = /** @class */ (() => {
+        class c3 {
+            constructor() {
+                this.x = 10;
+                this.y = 30;
+            }
+            method1() {
+            }
+            method2() {
+            }
+            static method3() {
+            }
+            static method4() {
+            }
+        }
+        c3.k = 20;
+        c3.l = 30;
+        return c3;
+    })();
     m2.c3 = c3;
-    class c4 {
-        constructor() {
-            this.x = 10;
-            this.y = 30;
-        }
-        method1() {
-        }
-        method2() {
-        }
-        static method3() {
-        }
-        static method4() {
-        }
-    }
-    c4.k = 20;
-    c4.l = 30;
+    let c4 = /** @class */ (() => {
+        class c4 {
+            constructor() {
+                this.x = 10;
+                this.y = 30;
+            }
+            method1() {
+            }
+            method2() {
+            }
+            static method3() {
+            }
+            static method4() {
+            }
+        }
+        c4.k = 20;
+        c4.l = 30;
+        return c4;
+    })();
     new c();
     new c2();
     new c3();
diff --git a/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.js b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.js
index 3acb89b8696d7..6e0bdb295a168 100644
--- a/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.js
+++ b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.js
@@ -4,6 +4,10 @@ export default class {
 }
 
 //// [exportDefaultClassWithStaticPropertyAssignmentsInES6.js]
-export default class default_1 {
-}
-default_1.z = "Foo";
+let default_1 = /** @class */ (() => {
+    class default_1 {
+    }
+    default_1.z = "Foo";
+    return default_1;
+})();
+export default default_1;
diff --git a/tests/baselines/reference/generatorTypeCheck39.js b/tests/baselines/reference/generatorTypeCheck39.js
index 1e0009d24ed7c..73b1416c82f3f 100644
--- a/tests/baselines/reference/generatorTypeCheck39.js
+++ b/tests/baselines/reference/generatorTypeCheck39.js
@@ -20,12 +20,15 @@ function decorator(x) {
     return y => { };
 }
 function* g() {
-    let C = class C {
-        constructor() {
-            this.x = yield 0;
-        }
-    };
-    C = __decorate([
-        decorator(yield 0)
-    ], C);
+    let C = /** @class */ (() => {
+        let C = class C {
+            constructor() {
+                this.x = yield 0;
+            }
+        };
+        C = __decorate([
+            decorator(yield 0)
+        ], C);
+        return C;
+    })();
 }
diff --git a/tests/baselines/reference/generatorTypeCheck58.js b/tests/baselines/reference/generatorTypeCheck58.js
index 925fc2b76d26d..c969eb9ba7bbf 100644
--- a/tests/baselines/reference/generatorTypeCheck58.js
+++ b/tests/baselines/reference/generatorTypeCheck58.js
@@ -7,8 +7,11 @@ function* g() {
 
 //// [generatorTypeCheck58.js]
 function* g() {
-    class C {
-    }
-    C.x = yield 0;
+    let C = /** @class */ (() => {
+        class C {
+        }
+        C.x = yield 0;
+        return C;
+    })();
     ;
 }
diff --git a/tests/baselines/reference/generatorTypeCheck59.js b/tests/baselines/reference/generatorTypeCheck59.js
index 8fd32e7730a98..8b1dfbd777c03 100644
--- a/tests/baselines/reference/generatorTypeCheck59.js
+++ b/tests/baselines/reference/generatorTypeCheck59.js
@@ -14,11 +14,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 function* g() {
-    class C {
-        m() { }
-    }
-    __decorate([
-        (yield "")
-    ], C.prototype, "m", null);
+    let C = /** @class */ (() => {
+        class C {
+            m() { }
+        }
+        __decorate([
+            (yield "")
+        ], C.prototype, "m", null);
+        return C;
+    })();
     ;
 }
diff --git a/tests/baselines/reference/generatorTypeCheck61.js b/tests/baselines/reference/generatorTypeCheck61.js
index 9cc157f26840d..bd095dd2478b5 100644
--- a/tests/baselines/reference/generatorTypeCheck61.js
+++ b/tests/baselines/reference/generatorTypeCheck61.js
@@ -12,10 +12,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 function* g() {
-    let C = class C {
-    };
-    C = __decorate([
-        (yield 0)
-    ], C);
+    let C = /** @class */ (() => {
+        let C = class C {
+        };
+        C = __decorate([
+            (yield 0)
+        ], C);
+        return C;
+    })();
     ;
 }
diff --git a/tests/baselines/reference/importHelpersES6.js b/tests/baselines/reference/importHelpersES6.js
index 9eb0e980c0f8c..df12fb0c0502f 100644
--- a/tests/baselines/reference/importHelpersES6.js
+++ b/tests/baselines/reference/importHelpersES6.js
@@ -19,11 +19,14 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [a.js]
 import { __decorate } from "tslib";
-let A = class A {
-};
-A = __decorate([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = __decorate([
+        dec
+    ], A);
+    return A;
+})();
 export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
index d603b0ade17f2..74631aae213cb 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
@@ -21,11 +21,14 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    let A = class A {
-    };
-    A = tslib_1.__decorate([
-        dec
-    ], A);
+    let A = /** @class */ (() => {
+        let A = class A {
+        };
+        A = tslib_1.__decorate([
+            dec
+        ], A);
+        return A;
+    })();
     exports.A = A;
     const o = { a: 1 };
     const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
index 560bc114c3d4c..b201899e5c733 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
@@ -21,11 +21,14 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-let A = class A {
-};
-A = tslib_1.__decorate([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = tslib_1.__decorate([
+        dec
+    ], A);
+    return A;
+})();
 exports.A = A;
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
index ba22069c306f2..0f029ca44fa87 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
@@ -19,11 +19,14 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [a.js]
 import { __decorate as __decorate_1 } from "tslib";
-let A = class A {
-};
-A = __decorate_1([
-    dec
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+    };
+    A = __decorate_1([
+        dec
+    ], A);
+    return A;
+})();
 export { A };
 const o = { a: 1 };
 const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
index fb10d64b45af3..1ebf0c245bacf 100644
--- a/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
@@ -29,11 +29,14 @@ System.register(["tslib"], function (exports_1, context_1) {
             }
         ],
         execute: function () {
-            A = class A {
-            };
-            A = tslib_1.__decorate([
-                dec
-            ], A);
+            A = /** @class */ (() => {
+                let A = class A {
+                };
+                A = tslib_1.__decorate([
+                    dec
+                ], A);
+                return A;
+            })();
             exports_1("A", A);
             o = { a: 1 };
             y = Object.assign({}, o);
diff --git a/tests/baselines/reference/invalidNewTarget.es6.js b/tests/baselines/reference/invalidNewTarget.es6.js
index ed1b2cc1592a8..f77704edd759d 100644
--- a/tests/baselines/reference/invalidNewTarget.es6.js
+++ b/tests/baselines/reference/invalidNewTarget.es6.js
@@ -27,20 +27,23 @@ const O = {
 //// [invalidNewTarget.es6.js]
 const a = new.target;
 const b = () => new.target;
-class C {
-    constructor() {
-        this.f = () => new.target;
+let C = /** @class */ (() => {
+    class C {
+        constructor() {
+            this.f = () => new.target;
+        }
+        [new.target]() { }
+        c() { return new.target; }
+        get d() { return new.target; }
+        set e(_) { _ = new.target; }
+        static [new.target]() { }
+        static g() { return new.target; }
+        static get h() { return new.target; }
+        static set i(_) { _ = new.target; }
     }
-    [new.target]() { }
-    c() { return new.target; }
-    get d() { return new.target; }
-    set e(_) { _ = new.target; }
-    static [new.target]() { }
-    static g() { return new.target; }
-    static get h() { return new.target; }
-    static set i(_) { _ = new.target; }
-}
-C.j = () => new.target;
+    C.j = () => new.target;
+    return C;
+})();
 const O = {
     [new.target]: undefined,
     k() { return new.target; },
diff --git a/tests/baselines/reference/newTarget.es6.js b/tests/baselines/reference/newTarget.es6.js
index 2bd95ff9f9871..a209735d51573 100644
--- a/tests/baselines/reference/newTarget.es6.js
+++ b/tests/baselines/reference/newTarget.es6.js
@@ -33,14 +33,17 @@ const O = {
 
 
 //// [newTarget.es6.js]
-class A {
-    constructor() {
-        this.d = function () { return new.target; };
-        const a = new.target;
-        const b = () => new.target;
+let A = /** @class */ (() => {
+    class A {
+        constructor() {
+            this.d = function () { return new.target; };
+            const a = new.target;
+            const b = () => new.target;
+        }
     }
-}
-A.c = function () { return new.target; };
+    A.c = function () { return new.target; };
+    return A;
+})();
 class B extends A {
     constructor() {
         super();
diff --git a/tests/baselines/reference/potentiallyUncalledDecorators.js b/tests/baselines/reference/potentiallyUncalledDecorators.js
index b69f848a8c933..fe46a41c41ba6 100644
--- a/tests/baselines/reference/potentiallyUncalledDecorators.js
+++ b/tests/baselines/reference/potentiallyUncalledDecorators.js
@@ -85,105 +85,135 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-class FooComponent {
-}
-__decorate([
-    Input
-], FooComponent.prototype, "foo", void 0);
-class Person {
-}
-__decorate([
-    tracked
-], Person.prototype, "person", void 0);
-class MultiplyByTwo {
-    get multiplied() {
-        return this.args.number * 2;
+let FooComponent = /** @class */ (() => {
+    class FooComponent {
     }
-}
-__decorate([
-    tracked('args')
-], MultiplyByTwo.prototype, "multiplied", null);
-let A = class A {
-    bar() { }
-};
-__decorate([
-    noArgs
-], A.prototype, "foo", void 0);
-__decorate([
-    noArgs
-], A.prototype, "bar", null);
-A = __decorate([
-    noArgs
-], A);
-let B = class B {
-    bar() { }
-};
-__decorate([
-    allRest
-], B.prototype, "foo", void 0);
-__decorate([
-    allRest
-], B.prototype, "bar", null);
-B = __decorate([
-    allRest
-], B);
-let C = class C {
-    bar() { }
-};
-__decorate([
-    oneOptional
-], C.prototype, "foo", void 0);
-__decorate([
-    oneOptional
-], C.prototype, "bar", null);
-C = __decorate([
-    oneOptional
-], C);
-let D = class D {
-    bar() { }
-};
-__decorate([
-    twoOptional
-], D.prototype, "foo", void 0);
-__decorate([
-    twoOptional
-], D.prototype, "bar", null);
-D = __decorate([
-    twoOptional
-], D);
-let E = class E {
-    bar() { }
-};
-__decorate([
-    threeOptional
-], E.prototype, "foo", void 0);
-__decorate([
-    threeOptional
-], E.prototype, "bar", null);
-E = __decorate([
-    threeOptional
-], E);
-let F = class F {
-    bar() { }
-};
-__decorate([
-    oneOptionalWithRest
-], F.prototype, "foo", void 0);
-__decorate([
-    oneOptionalWithRest
-], F.prototype, "bar", null);
-F = __decorate([
-    oneOptionalWithRest
-], F);
-let G = class G {
-    bar() { }
-};
-__decorate([
-    anyDec
-], G.prototype, "foo", void 0);
-__decorate([
-    anyDec
-], G.prototype, "bar", null);
-G = __decorate([
-    anyDec
-], G);
+    __decorate([
+        Input
+    ], FooComponent.prototype, "foo", void 0);
+    return FooComponent;
+})();
+let Person = /** @class */ (() => {
+    class Person {
+    }
+    __decorate([
+        tracked
+    ], Person.prototype, "person", void 0);
+    return Person;
+})();
+let MultiplyByTwo = /** @class */ (() => {
+    class MultiplyByTwo {
+        get multiplied() {
+            return this.args.number * 2;
+        }
+    }
+    __decorate([
+        tracked('args')
+    ], MultiplyByTwo.prototype, "multiplied", null);
+    return MultiplyByTwo;
+})();
+let A = /** @class */ (() => {
+    let A = class A {
+        bar() { }
+    };
+    __decorate([
+        noArgs
+    ], A.prototype, "foo", void 0);
+    __decorate([
+        noArgs
+    ], A.prototype, "bar", null);
+    A = __decorate([
+        noArgs
+    ], A);
+    return A;
+})();
+let B = /** @class */ (() => {
+    let B = class B {
+        bar() { }
+    };
+    __decorate([
+        allRest
+    ], B.prototype, "foo", void 0);
+    __decorate([
+        allRest
+    ], B.prototype, "bar", null);
+    B = __decorate([
+        allRest
+    ], B);
+    return B;
+})();
+let C = /** @class */ (() => {
+    let C = class C {
+        bar() { }
+    };
+    __decorate([
+        oneOptional
+    ], C.prototype, "foo", void 0);
+    __decorate([
+        oneOptional
+    ], C.prototype, "bar", null);
+    C = __decorate([
+        oneOptional
+    ], C);
+    return C;
+})();
+let D = /** @class */ (() => {
+    let D = class D {
+        bar() { }
+    };
+    __decorate([
+        twoOptional
+    ], D.prototype, "foo", void 0);
+    __decorate([
+        twoOptional
+    ], D.prototype, "bar", null);
+    D = __decorate([
+        twoOptional
+    ], D);
+    return D;
+})();
+let E = /** @class */ (() => {
+    let E = class E {
+        bar() { }
+    };
+    __decorate([
+        threeOptional
+    ], E.prototype, "foo", void 0);
+    __decorate([
+        threeOptional
+    ], E.prototype, "bar", null);
+    E = __decorate([
+        threeOptional
+    ], E);
+    return E;
+})();
+let F = /** @class */ (() => {
+    let F = class F {
+        bar() { }
+    };
+    __decorate([
+        oneOptionalWithRest
+    ], F.prototype, "foo", void 0);
+    __decorate([
+        oneOptionalWithRest
+    ], F.prototype, "bar", null);
+    F = __decorate([
+        oneOptionalWithRest
+    ], F);
+    return F;
+})();
+let G = /** @class */ (() => {
+    let G = class G {
+        bar() { }
+    };
+    __decorate([
+        anyDec
+    ], G.prototype, "foo", void 0);
+    __decorate([
+        anyDec
+    ], G.prototype, "bar", null);
+    G = __decorate([
+        anyDec
+    ], G);
+    return G;
+})();
diff --git a/tests/baselines/reference/privateNameAndStaticInitializer(target=es2015).js b/tests/baselines/reference/privateNameAndStaticInitializer(target=es2015).js
index caeb43d15a3e9..0d03cc006e8c0 100644
--- a/tests/baselines/reference/privateNameAndStaticInitializer(target=es2015).js
+++ b/tests/baselines/reference/privateNameAndStaticInitializer(target=es2015).js
@@ -8,12 +8,15 @@ class A {
 
 
 //// [privateNameAndStaticInitializer.js]
-var _foo, _prop;
-class A {
-    constructor() {
-        _foo.set(this, 1);
-        _prop.set(this, 2);
+let A = /** @class */ (() => {
+    var _foo, _prop;
+    class A {
+        constructor() {
+            _foo.set(this, 1);
+            _prop.set(this, 2);
+        }
     }
-}
-_foo = new WeakMap(), _prop = new WeakMap();
-A.inst = new A();
+    _foo = new WeakMap(), _prop = new WeakMap();
+    A.inst = new A();
+    return A;
+})();
diff --git a/tests/baselines/reference/privateNameAndStaticInitializer(target=esnext).js b/tests/baselines/reference/privateNameAndStaticInitializer(target=esnext).js
index 3387d0b4d1a52..b5c90411438f1 100644
--- a/tests/baselines/reference/privateNameAndStaticInitializer(target=esnext).js
+++ b/tests/baselines/reference/privateNameAndStaticInitializer(target=esnext).js
@@ -8,12 +8,15 @@ class A {
 
 
 //// [privateNameAndStaticInitializer.js]
-class A {
-    constructor() {
-        this.#foo = 1;
-        this.#prop = 2;
+let A = /** @class */ (() => {
+    class A {
+        constructor() {
+            this.#foo = 1;
+            this.#prop = 2;
+        }
+        #foo;
+        #prop;
     }
-    #foo;
-    #prop;
-}
-A.inst = new A();
+    A.inst = new A();
+    return A;
+})();
diff --git a/tests/baselines/reference/privateNameFieldsESNext.js b/tests/baselines/reference/privateNameFieldsESNext.js
index acc37caa3cc8f..dfa84989314fa 100644
--- a/tests/baselines/reference/privateNameFieldsESNext.js
+++ b/tests/baselines/reference/privateNameFieldsESNext.js
@@ -21,26 +21,29 @@ class C {
 
 
 //// [privateNameFieldsESNext.js]
-class C {
-    constructor() {
-        this.a = 123;
-        this.#a = 10;
-        this.c = "hello";
-        this.#something = () => 1234;
+let C = /** @class */ (() => {
+    class C {
+        constructor() {
+            this.a = 123;
+            this.#a = 10;
+            this.c = "hello";
+            this.#something = () => 1234;
+        }
+        #a;
+        #b;
+        method() {
+            console.log(this.#a);
+            this.#a = "hello";
+            console.log(this.#b);
+        }
+        static #m;
+        static #x;
+        static test() {
+            console.log(this.#m);
+            console.log(this.#x = "test");
+        }
+        #something;
     }
-    #a;
-    #b;
-    method() {
-        console.log(this.#a);
-        this.#a = "hello";
-        console.log(this.#b);
-    }
-    static #m;
-    static #x;
-    static test() {
-        console.log(this.#m);
-        console.log(this.#x = "test");
-    }
-    #something;
-}
-C.#m = "test";
+    C.#m = "test";
+    return C;
+})();
diff --git a/tests/baselines/reference/privateNamesConstructorChain-1.js b/tests/baselines/reference/privateNamesConstructorChain-1.js
index dfba142f9aa53..87ee524349529 100644
--- a/tests/baselines/reference/privateNamesConstructorChain-1.js
+++ b/tests/baselines/reference/privateNamesConstructorChain-1.js
@@ -21,23 +21,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     }
     return privateMap.get(receiver);
 };
-var _foo, _bar, _foo_1, _bar_1;
-class Parent {
-    constructor() {
-        _foo.set(this, 3);
-    }
-    accessChildProps() {
-        __classPrivateFieldGet(new Child(), _foo); // OK (`#foo` was added when `Parent`'s constructor was called on `child`)
-        __classPrivateFieldGet(Child, _bar); // Error: not found
+var _foo, _bar;
+let Parent = /** @class */ (() => {
+    var _foo_1, _bar;
+    class Parent {
+        constructor() {
+            _foo_1.set(this, 3);
+        }
+        accessChildProps() {
+            __classPrivateFieldGet(new Child(), _foo_1); // OK (`#foo` was added when `Parent`'s constructor was called on `child`)
+            __classPrivateFieldGet(Child, _bar); // Error: not found
+        }
     }
-}
-_foo = new WeakMap(), _bar = new WeakMap();
-_bar.set(Parent, 5);
+    _foo_1 = new WeakMap(), _bar = new WeakMap();
+    _bar.set(Parent, 5);
+    return Parent;
+})();
 class Child extends Parent {
     constructor() {
         super(...arguments);
-        _foo_1.set(this, "foo"); // OK (Child's #foo does not conflict, as `Parent`'s `#foo` is not accessible)
-        _bar_1.set(this, "bar"); // OK
+        _foo.set(this, "foo"); // OK (Child's #foo does not conflict, as `Parent`'s `#foo` is not accessible)
+        _bar.set(this, "bar"); // OK
     }
 }
-_foo_1 = new WeakMap(), _bar_1 = new WeakMap();
+_foo = new WeakMap(), _bar = new WeakMap();
diff --git a/tests/baselines/reference/privateNamesConstructorChain-2.js b/tests/baselines/reference/privateNamesConstructorChain-2.js
index 0d0069a47a9ad..a6e6e88c65505 100644
--- a/tests/baselines/reference/privateNamesConstructorChain-2.js
+++ b/tests/baselines/reference/privateNamesConstructorChain-2.js
@@ -23,24 +23,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     }
     return privateMap.get(receiver);
 };
-var _foo, _bar, _foo_1, _bar_1;
-class Parent {
-    constructor() {
-        _foo.set(this, 3);
-    }
-    accessChildProps() {
-        __classPrivateFieldGet(new Child(), _foo); // OK (`#foo` was added when `Parent`'s constructor was called on `child`)
-        __classPrivateFieldGet(Child, _bar); // Error: not found
+var _foo, _bar;
+let Parent = /** @class */ (() => {
+    var _foo_1, _bar;
+    class Parent {
+        constructor() {
+            _foo_1.set(this, 3);
+        }
+        accessChildProps() {
+            __classPrivateFieldGet(new Child(), _foo_1); // OK (`#foo` was added when `Parent`'s constructor was called on `child`)
+            __classPrivateFieldGet(Child, _bar); // Error: not found
+        }
     }
-}
-_foo = new WeakMap(), _bar = new WeakMap();
-_bar.set(Parent, 5);
+    _foo_1 = new WeakMap(), _bar = new WeakMap();
+    _bar.set(Parent, 5);
+    return Parent;
+})();
 class Child extends Parent {
     constructor() {
         super(...arguments);
-        _foo_1.set(this, "foo"); // OK (Child's #foo does not conflict, as `Parent`'s `#foo` is not accessible)
-        _bar_1.set(this, "bar"); // OK
+        _foo.set(this, "foo"); // OK (Child's #foo does not conflict, as `Parent`'s `#foo` is not accessible)
+        _bar.set(this, "bar"); // OK
     }
 }
-_foo_1 = new WeakMap(), _bar_1 = new WeakMap();
+_foo = new WeakMap(), _bar = new WeakMap();
 new Parent().accessChildProps();
diff --git a/tests/baselines/reference/privateNamesInNestedClasses-2.js b/tests/baselines/reference/privateNamesInNestedClasses-2.js
index 896beb6308339..edf6658baf426 100644
--- a/tests/baselines/reference/privateNamesInNestedClasses-2.js
+++ b/tests/baselines/reference/privateNamesInNestedClasses-2.js
@@ -24,22 +24,25 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     }
     return privateMap.get(receiver);
 };
-var _x;
-class A {
-    constructor() {
-        var _x_1;
-        class B {
-            constructor() {
-                _x_1.set(this, 5);
-                class C {
-                    constructor() {
-                        __classPrivateFieldGet(A, _x_1); // error
+let A = /** @class */ (() => {
+    var _x;
+    class A {
+        constructor() {
+            var _x_1;
+            class B {
+                constructor() {
+                    _x_1.set(this, 5);
+                    class C {
+                        constructor() {
+                            __classPrivateFieldGet(A, _x_1); // error
+                        }
                     }
                 }
             }
+            _x_1 = new WeakMap();
         }
-        _x_1 = new WeakMap();
     }
-}
-_x = new WeakMap();
-_x.set(A, 5);
+    _x = new WeakMap();
+    _x.set(A, 5);
+    return A;
+})();
diff --git a/tests/baselines/reference/privateNamesUnique-3.js b/tests/baselines/reference/privateNamesUnique-3.js
index 9575d6d89c57d..2ba6381a234ec 100644
--- a/tests/baselines/reference/privateNamesUnique-3.js
+++ b/tests/baselines/reference/privateNamesUnique-3.js
@@ -21,21 +21,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     }
     return privateMap.get(receiver);
 };
-var _foo, _foo_1, _foo_2;
-class A {
-    constructor() {
-        _foo_1.set(this, 1);
-        // because static and instance private names
-        // share the same lexical scope
-        // https://tc39.es/proposal-class-fields/#prod-ClassBody
+let A = /** @class */ (() => {
+    var _foo, _foo_1;
+    class A {
+        constructor() {
+            _foo_1.set(this, 1);
+            // because static and instance private names
+            // share the same lexical scope
+            // https://tc39.es/proposal-class-fields/#prod-ClassBody
+        }
     }
-}
-_foo = new WeakMap(), _foo_1 = new WeakMap();
-_foo_1.set(A, true); // error (duplicate)
-class B {
-    test(x) {
-        __classPrivateFieldGet(x, _foo_2); // error (#foo is a static property on B, not an instance property)
+    _foo = new WeakMap(), _foo_1 = new WeakMap();
+    _foo_1.set(A, true); // error (duplicate)
+    return A;
+})();
+let B = /** @class */ (() => {
+    var _foo;
+    class B {
+        test(x) {
+            __classPrivateFieldGet(x, _foo); // error (#foo is a static property on B, not an instance property)
+        }
     }
-}
-_foo_2 = new WeakMap();
-_foo_2.set(B, true);
+    _foo = new WeakMap();
+    _foo.set(B, true);
+    return B;
+})();
diff --git a/tests/baselines/reference/symbolDeclarationEmit11.js b/tests/baselines/reference/symbolDeclarationEmit11.js
index b0cd9cfddbd5b..88520763dafb8 100644
--- a/tests/baselines/reference/symbolDeclarationEmit11.js
+++ b/tests/baselines/reference/symbolDeclarationEmit11.js
@@ -7,12 +7,15 @@ class C {
 }
 
 //// [symbolDeclarationEmit11.js]
-class C {
-    static [Symbol.isConcatSpreadable]() { }
-    static get [Symbol.toPrimitive]() { return ""; }
-    static set [Symbol.toPrimitive](x) { }
-}
-C[Symbol.iterator] = 0;
+let C = /** @class */ (() => {
+    class C {
+        static [Symbol.isConcatSpreadable]() { }
+        static get [Symbol.toPrimitive]() { return ""; }
+        static set [Symbol.toPrimitive](x) { }
+    }
+    C[Symbol.iterator] = 0;
+    return C;
+})();
 
 
 //// [symbolDeclarationEmit11.d.ts]
diff --git a/tests/baselines/reference/systemModuleTargetES6.js b/tests/baselines/reference/systemModuleTargetES6.js
index 0df2835683e82..b3231e22752ad 100644
--- a/tests/baselines/reference/systemModuleTargetES6.js
+++ b/tests/baselines/reference/systemModuleTargetES6.js
@@ -32,11 +32,14 @@ System.register([], function (exports_1, context_1) {
             MyClass = class MyClass {
             };
             exports_1("MyClass", MyClass);
-            MyClass2 = class MyClass2 {
-                static getInstance() { return MyClass2.value; }
-            };
+            MyClass2 = /** @class */ (() => {
+                class MyClass2 {
+                    static getInstance() { return MyClass2.value; }
+                }
+                MyClass2.value = 42;
+                return MyClass2;
+            })();
             exports_1("MyClass2", MyClass2);
-            MyClass2.value = 42;
         }
     };
 });
diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js b/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js
index 3f2dd6cdb56fb..93cf7f8788380 100644
--- a/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js
+++ b/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js
@@ -1,9 +1,12 @@
-class C {
-    constructor() {
-        this.foo = 10;
+let C = /** @class */ (() => {
+    class C {
+        constructor() {
+            this.foo = 10;
+        }
     }
-}
-C.bar = 20;
+    C.bar = 20;
+    return C;
+})();
 (function (C) {
     C.x = 10;
 })(C || (C = {}));
diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToProperties.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToProperties.js
index d5f27d7148c6e..6a7d3c0d77f90 100644
--- a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToProperties.js
+++ b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToProperties.js
@@ -1,12 +1,16 @@
 /*comment*/
-class Clazz {
+let Clazz = /** @class */ (() => {
     /*comment*/
-    constructor(/*comment*/
-    field = 1) {
-        this.field = field;
+    class Clazz {
         /*comment*/
-        this.instanceProp = 2;
+        constructor(/*comment*/
+        field = 1) {
+            this.field = field;
+            /*comment*/
+            this.instanceProp = 2;
+        }
     }
-}
-/*comment*/
-Clazz.staticProp = 1;
+    /*comment*/
+    Clazz.staticProp = 1;
+    return Clazz;
+})();
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index 6cbb7a5f0300d..cdc688545f786 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -38,12 +38,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import './b';
-let A = class A {
-    constructor(p) { }
-};
-A = __decorate([
-    ((_) => { })
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+        constructor(p) { }
+    };
+    A = __decorate([
+        ((_) => { })
+    ], A);
+    return A;
+})();
 export { A };
 
 
@@ -155,13 +158,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { B } from './b';
-let A = class A {
-    constructor(p) { }
-};
-A = __decorate([
-    ((_) => { }),
-    __metadata("design:paramtypes", [B])
-], A);
+let A = /** @class */ (() => {
+    let A = class A {
+        constructor(p) { }
+    };
+    A = __decorate([
+        ((_) => { }),
+        __metadata("design:paramtypes", [B])
+    ], A);
+    return A;
+})();
 export { A };
 
 
diff --git a/tests/baselines/reference/uniqueSymbols.js b/tests/baselines/reference/uniqueSymbols.js
index 54f59e8e217b6..70372d894baed 100644
--- a/tests/baselines/reference/uniqueSymbols.js
+++ b/tests/baselines/reference/uniqueSymbols.js
@@ -314,15 +314,18 @@ async function* asyncGenFuncYieldConstCall() { yield constCall; }
 async function* asyncGenFuncYieldLetCall() { yield letCall; }
 async function* asyncGenFuncYieldVarCall() { yield varCall; }
 // classes
-class C {
-    constructor() {
-        this.readonlyCall = Symbol();
-        this.readwriteCall = Symbol();
+let C = /** @class */ (() => {
+    class C {
+        constructor() {
+            this.readonlyCall = Symbol();
+            this.readwriteCall = Symbol();
+        }
     }
-}
-C.readonlyStaticCall = Symbol();
-C.readonlyStaticTypeAndCall = Symbol();
-C.readwriteStaticCall = Symbol();
+    C.readonlyStaticCall = Symbol();
+    C.readonlyStaticTypeAndCall = Symbol();
+    C.readwriteStaticCall = Symbol();
+    return C;
+})();
 const constInitToCReadonlyStaticCall = C.readonlyStaticCall;
 const constInitToCReadonlyStaticType = C.readonlyStaticType;
 const constInitToCReadonlyStaticTypeAndCall = C.readonlyStaticTypeAndCall;
@@ -370,27 +373,30 @@ const o2 = {
     method5(p = s) { return p; },
 };
 // property initializers
-class C0 {
-    constructor() {
-        this.a = s;
-        this.b = N.s;
-        this.c = N["s"];
-        this.d = s;
-        this.e = N.s;
-        this.f = N["s"];
+let C0 = /** @class */ (() => {
+    class C0 {
+        constructor() {
+            this.a = s;
+            this.b = N.s;
+            this.c = N["s"];
+            this.d = s;
+            this.e = N.s;
+            this.f = N["s"];
+        }
+        method1() { return s; }
+        async method2() { return s; }
+        async *method3() { yield s; }
+        *method4() { yield s; }
+        method5(p = s) { return p; }
     }
-    method1() { return s; }
-    async method2() { return s; }
-    async *method3() { yield s; }
-    *method4() { yield s; }
-    method5(p = s) { return p; }
-}
-C0.a = s;
-C0.b = N.s;
-C0.c = N["s"];
-C0.d = s;
-C0.e = N.s;
-C0.f = N["s"];
+    C0.a = s;
+    C0.b = N.s;
+    C0.c = N["s"];
+    C0.d = s;
+    C0.e = N.s;
+    C0.f = N["s"];
+    return C0;
+})();
 // non-widening positions
 // element access
 o[s];
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.js b/tests/baselines/reference/uniqueSymbolsDeclarations.js
index 15342a0bd97fc..5f9223ef2b322 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarations.js
+++ b/tests/baselines/reference/uniqueSymbolsDeclarations.js
@@ -282,15 +282,18 @@ async function* asyncGenFuncYieldConstCall() { yield constCall; }
 async function* asyncGenFuncYieldLetCall() { yield letCall; }
 async function* asyncGenFuncYieldVarCall() { yield varCall; }
 // classes
-class C {
-    constructor() {
-        this.readonlyCall = Symbol();
-        this.readwriteCall = Symbol();
+let C = /** @class */ (() => {
+    class C {
+        constructor() {
+            this.readonlyCall = Symbol();
+            this.readwriteCall = Symbol();
+        }
     }
-}
-C.readonlyStaticCall = Symbol();
-C.readonlyStaticTypeAndCall = Symbol();
-C.readwriteStaticCall = Symbol();
+    C.readonlyStaticCall = Symbol();
+    C.readonlyStaticTypeAndCall = Symbol();
+    C.readwriteStaticCall = Symbol();
+    return C;
+})();
 const constInitToCReadonlyStaticCall = C.readonlyStaticCall;
 const constInitToCReadonlyStaticType = C.readonlyStaticType;
 const constInitToCReadonlyStaticTypeAndCall = C.readonlyStaticTypeAndCall;
@@ -338,27 +341,30 @@ const o2 = {
     method5(p = s) { return p; }
 };
 // property initializers
-class C0 {
-    constructor() {
-        this.a = s;
-        this.b = N.s;
-        this.c = N["s"];
-        this.d = s;
-        this.e = N.s;
-        this.f = N["s"];
+let C0 = /** @class */ (() => {
+    class C0 {
+        constructor() {
+            this.a = s;
+            this.b = N.s;
+            this.c = N["s"];
+            this.d = s;
+            this.e = N.s;
+            this.f = N["s"];
+        }
+        method1() { return s; }
+        async method2() { return s; }
+        async *method3() { yield s; }
+        *method4() { yield s; }
+        method5(p = s) { return p; }
     }
-    method1() { return s; }
-    async method2() { return s; }
-    async *method3() { yield s; }
-    *method4() { yield s; }
-    method5(p = s) { return p; }
-}
-C0.a = s;
-C0.b = N.s;
-C0.c = N["s"];
-C0.d = s;
-C0.e = N.s;
-C0.f = N["s"];
+    C0.a = s;
+    C0.b = N.s;
+    C0.c = N["s"];
+    C0.d = s;
+    C0.e = N.s;
+    C0.f = N["s"];
+    return C0;
+})();
 // non-widening positions
 // element access
 o[s];
diff --git a/tests/baselines/reference/useBeforeDeclaration_jsx.js b/tests/baselines/reference/useBeforeDeclaration_jsx.js
index e95bf25464413..7f443a826c5f7 100644
--- a/tests/baselines/reference/useBeforeDeclaration_jsx.js
+++ b/tests/baselines/reference/useBeforeDeclaration_jsx.js
@@ -16,13 +16,16 @@ class C {
 
 
 //// [useBeforeDeclaration_jsx.jsx]
-class C {
-}
-C.a = <C.z></C.z>;
-C.b = <C.z />;
-C.c = <span {...C.x}></span>;
-C.d = <span id={C.y}></span>;
-C.e = <span>{C.y}</span>;
-C.x = {};
-C.y = '';
-C.z = () => <b></b>;
+let C = /** @class */ (() => {
+    class C {
+    }
+    C.a = <C.z></C.z>;
+    C.b = <C.z />;
+    C.c = <span {...C.x}></span>;
+    C.d = <span id={C.y}></span>;
+    C.e = <span>{C.y}</span>;
+    C.x = {};
+    C.y = '';
+    C.z = () => <b></b>;
+    return C;
+})();
diff --git a/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js b/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js
index 4ee81065518e1..d3ab479be50be 100644
--- a/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js
+++ b/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js
@@ -25,13 +25,16 @@ export class C {
         this.c = { c: this.b };
     }
 }
-class D {
-}
-D.A = class extends D.B {
-    [D.D]() { } // should be an error
-};
-D.B = class {
-};
-D.C = Object.assign({ [D.D]: 1 }, { get [D.D]() { return 0; } } // should be an error
-);
-D.D = '';
+let D = /** @class */ (() => {
+    class D {
+    }
+    D.A = class extends D.B {
+        [D.D]() { } // should be an error
+    };
+    D.B = class {
+    };
+    D.C = Object.assign({ [D.D]: 1 }, { get [D.D]() { return 0; } } // should be an error
+    );
+    D.D = '';
+    return D;
+})();