diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
index 36eb17665d6..49349079cb6 100644
--- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
@@ -1,11 +1,11 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var outer;
     (function (outer) {
         var inner;
         (function (inner) {
             var local = 1;
             inner.a = local;
         })(inner = outer.inner || (outer.inner = {}));
-    })(outer = exports.outer || (exports.outer = {}));
+    })(exports.outer || (exports.outer = {}));
+    var outer = exports.outer;
 });
diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js
index 1d5c5c9d534..cc284f59a2c 100644
--- a/tests/baselines/reference/project/baseline3/node/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js
@@ -1,9 +1,9 @@
 "use strict";
-var outer;
 (function (outer) {
     var inner;
     (function (inner) {
         var local = 1;
         inner.a = local;
     })(inner = outer.inner || (outer.inner = {}));
-})(outer = exports.outer || (exports.outer = {}));
+})(exports.outer || (exports.outer = {}));
+var outer = exports.outer;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
index a5da0ab9314..59eeafd4f26 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
@@ -1,9 +1,9 @@
 define(["require", "exports", "private_m4"], function (require, exports, private_m4) {
     "use strict";
-    var usePrivate_m4_m1;
     (function (usePrivate_m4_m1) {
         var x3 = private_m4.x;
         var d3 = private_m4.d;
         var f3 = private_m4.foo();
-    })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
+    })(exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
+    var usePrivate_m4_m1 = exports.usePrivate_m4_m1;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
index 3cc7f82feb7..61ef810283e 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
@@ -1,9 +1,9 @@
 "use strict";
 // only used privately no need to emit
 var private_m4 = require("private_m4");
-var usePrivate_m4_m1;
 (function (usePrivate_m4_m1) {
     var x3 = private_m4.x;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
-})(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
+})(exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
+var usePrivate_m4_m1 = exports.usePrivate_m4_m1;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
index 0ec3a0d8331..8d483c57b45 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
@@ -3,7 +3,6 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
-    var m1;
     (function (m1) {
         m1.x2 = m4.x;
         m1.d2 = m4.d;
@@ -11,7 +10,8 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi
         var x3 = m4.x;
         var d3 = m4.d;
         var f3 = m4.foo();
-    })(m1 = exports.m1 || (exports.m1 = {}));
+    })(exports.m1 || (exports.m1 = {}));
+    var m1 = exports.m1;
     exports.useMultiImport_m4_x4 = multiImport_m4.x;
     exports.useMultiImport_m4_d4 = multiImport_m4.d;
     exports.useMultiImport_m4_f4 = multiImport_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
index 64b9438d96e..a583808a689 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
@@ -3,7 +3,6 @@ var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
 exports.f4 = m4.foo();
-var m1;
 (function (m1) {
     m1.x2 = m4.x;
     m1.d2 = m4.d;
@@ -11,7 +10,8 @@ var m1;
     var x3 = m4.x;
     var d3 = m4.d;
     var f3 = m4.foo();
-})(m1 = exports.m1 || (exports.m1 = {}));
+})(exports.m1 || (exports.m1 = {}));
+var m1 = exports.m1;
 // Do not emit multiple used import statements
 var multiImport_m4 = require("m4"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
index cc2eecd2208..d720acca026 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
@@ -3,7 +3,6 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
-    var m1;
     (function (m1) {
         m1.x2 = m4.x;
         m1.d2 = m4.d;
@@ -11,6 +10,7 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
         var x3 = m4.x;
         var d3 = m4.d;
         var f3 = m4.foo();
-    })(m1 = exports.m1 || (exports.m1 = {}));
+    })(exports.m1 || (exports.m1 = {}));
+    var m1 = exports.m1;
     exports.d = m5.foo2();
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
index b4132f79b1f..7fc32be5bb1 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
@@ -3,7 +3,6 @@ var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
 exports.f4 = m4.foo();
-var m1;
 (function (m1) {
     m1.x2 = m4.x;
     m1.d2 = m4.d;
@@ -11,7 +10,8 @@ var m1;
     var x3 = m4.x;
     var d3 = m4.d;
     var f3 = m4.foo();
-})(m1 = exports.m1 || (exports.m1 = {}));
+})(exports.m1 || (exports.m1 = {}));
+var m1 = exports.m1;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
index 634a988c1b8..4dcb2821cc0 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
@@ -3,7 +3,6 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
-    var m1;
     (function (m1) {
         m1.x2 = m4.x;
         m1.d2 = m4.d;
@@ -11,5 +10,6 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
         var x3 = m4.x;
         var d3 = m4.d;
         var f3 = m4.foo();
-    })(m1 = exports.m1 || (exports.m1 = {}));
+    })(exports.m1 || (exports.m1 = {}));
+    var m1 = exports.m1;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
index 40df471507c..d6764a5f56f 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
@@ -3,7 +3,6 @@ var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
 exports.f4 = m4.foo();
-var m1;
 (function (m1) {
     m1.x2 = m4.x;
     m1.d2 = m4.d;
@@ -11,4 +10,5 @@ var m1;
     var x3 = m4.x;
     var d3 = m4.d;
     var f3 = m4.foo();
-})(m1 = exports.m1 || (exports.m1 = {}));
+})(exports.m1 || (exports.m1 = {}));
+var m1 = exports.m1;