diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 85e27ea08e4..f70ea4cc9ca 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3441,7 +3441,9 @@ var __awaiter = (this && this.__awaiter) || function (generator, thisArg, args,
                 emitFunctionBody(node);
                 
                 // Emit the current `this` binding.
-                write(", this");
+                write(",");
+                writeLine();
+                write("this");
                 
                 // Optionally emit the lexical arguments.
                 if (hasLexicalArguments) {
diff --git a/tests/baselines/reference/asyncArrowFunction1_es6.js b/tests/baselines/reference/asyncArrowFunction1_es6.js
index 4ce29929de8..257b147dbc7 100644
--- a/tests/baselines/reference/asyncArrowFunction1_es6.js
+++ b/tests/baselines/reference/asyncArrowFunction1_es6.js
@@ -5,4 +5,5 @@ var foo = async (): Promise<void> => {
 
 //// [asyncArrowFunction1_es6.js]
 var foo = () => __awaiter(function* () {
-}, this, void 0, Promise);
+},
+this, void 0, Promise);
diff --git a/tests/baselines/reference/asyncArrowFunction6_es6.js b/tests/baselines/reference/asyncArrowFunction6_es6.js
index 1554e895d14..48035057fe0 100644
--- a/tests/baselines/reference/asyncArrowFunction6_es6.js
+++ b/tests/baselines/reference/asyncArrowFunction6_es6.js
@@ -5,4 +5,5 @@ var foo = async (a = await): Promise<void> => {
 
 //// [asyncArrowFunction6_es6.js]
 var foo = (a = await) => __awaiter(function* () {
-}, this, void 0, Promise);
+},
+this, void 0, Promise);
diff --git a/tests/baselines/reference/asyncArrowFunction7_es6.js b/tests/baselines/reference/asyncArrowFunction7_es6.js
index 459ec413da5..6f8cf6141a8 100644
--- a/tests/baselines/reference/asyncArrowFunction7_es6.js
+++ b/tests/baselines/reference/asyncArrowFunction7_es6.js
@@ -10,5 +10,7 @@ var bar = async (): Promise<void> => {
 var bar = () => __awaiter(function* () {
     // 'await' here is an identifier, and not an await expression.
     var foo = (a = await) => __awaiter(function* () {
-    }, this, void 0, Promise);
-}, this, void 0, Promise);
+    },
+    this, void 0, Promise);
+},
+this, void 0, Promise);
diff --git a/tests/baselines/reference/asyncArrowFunction8_es6.js b/tests/baselines/reference/asyncArrowFunction8_es6.js
index b32541fdda6..e4383a16220 100644
--- a/tests/baselines/reference/asyncArrowFunction8_es6.js
+++ b/tests/baselines/reference/asyncArrowFunction8_es6.js
@@ -7,4 +7,5 @@ var foo = async (): Promise<void> => {
 //// [asyncArrowFunction8_es6.js]
 var foo = () => __awaiter(function* () {
     var v = { [yield ]: foo };
-}, this, void 0, Promise);
+},
+this, void 0, Promise);
diff --git a/tests/baselines/reference/asyncArrowFunction9_es6.js b/tests/baselines/reference/asyncArrowFunction9_es6.js
index 8a9b663266c..42511dd87f5 100644
--- a/tests/baselines/reference/asyncArrowFunction9_es6.js
+++ b/tests/baselines/reference/asyncArrowFunction9_es6.js
@@ -4,4 +4,5 @@ var foo = async (a = await => await): Promise<void> => {
 
 //// [asyncArrowFunction9_es6.js]
 var foo = (a = await => await) => __awaiter(function* () {
-}, this, void 0, Promise);
+},
+this, void 0, Promise);
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js
index 86a1b6e110c..888c935cc3f 100644
--- a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js
@@ -11,6 +11,7 @@ class C {
 class C {
     method() {
         function other() { }
-        var fn = () => __awaiter(function* (arguments) { return yield other.apply(this, arguments); }, this, arguments);
+        var fn = () => __awaiter(function* (arguments) { return yield other.apply(this, arguments); },
+        this, arguments);
     }
 }
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js
index afcd73b32dc..67279d7f1be 100644
--- a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js
@@ -9,6 +9,7 @@ class C {
 //// [asyncArrowFunctionCapturesThis_es6.js]
 class C {
     method() {
-        var fn = () => __awaiter(function* () { return yield this; }, this);
+        var fn = () => __awaiter(function* () { return yield this; },
+        this);
     }
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration10_es6.js b/tests/baselines/reference/asyncFunctionDeclaration10_es6.js
index 25319680ceb..7048ca2ffa4 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration10_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration10_es6.js
@@ -5,5 +5,6 @@ async function foo(a = await => await): Promise<void> {
 //// [asyncFunctionDeclaration10_es6.js]
 function foo(a = await => await) {
     return __awaiter(function* () {
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es6.js b/tests/baselines/reference/asyncFunctionDeclaration11_es6.js
index 37cb4bbc0d4..dbf2d489a92 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration11_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es6.js
@@ -5,5 +5,6 @@ async function await(): Promise<void> {
 //// [asyncFunctionDeclaration11_es6.js]
 function await() {
     return __awaiter(function* () {
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration13_es6.js b/tests/baselines/reference/asyncFunctionDeclaration13_es6.js
index 0423ca2341b..35f6af6b2ff 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration13_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration13_es6.js
@@ -10,5 +10,6 @@ function foo() {
     return __awaiter(function* () {
         // Legal to use 'await' in a type context.
         var v;
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es6.js b/tests/baselines/reference/asyncFunctionDeclaration14_es6.js
index eccf374cdc3..3610cabbdec 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration14_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es6.js
@@ -7,5 +7,6 @@ async function foo(): Promise<void> {
 function foo() {
     return __awaiter(function* () {
         return;
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es6.js b/tests/baselines/reference/asyncFunctionDeclaration1_es6.js
index 386e1e76241..e3e1fb65096 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration1_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es6.js
@@ -5,5 +5,6 @@ async function foo(): Promise<void> {
 //// [asyncFunctionDeclaration1_es6.js]
 function foo() {
     return __awaiter(function* () {
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration6_es6.js b/tests/baselines/reference/asyncFunctionDeclaration6_es6.js
index 9bd17a7cd0e..a74d55c35ca 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration6_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration6_es6.js
@@ -5,5 +5,6 @@ async function foo(a = await): Promise<void> {
 //// [asyncFunctionDeclaration6_es6.js]
 function foo(a = await) {
     return __awaiter(function* () {
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration7_es6.js b/tests/baselines/reference/asyncFunctionDeclaration7_es6.js
index b32c90664ac..fcc2394a1d1 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration7_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration7_es6.js
@@ -11,7 +11,9 @@ function bar() {
         // 'await' here is an identifier, and not a yield expression.
         function foo(a = await) {
             return __awaiter(function* () {
-            }, this, void 0, Promise);
+            },
+            this, void 0, Promise);
         }
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration9_es6.js b/tests/baselines/reference/asyncFunctionDeclaration9_es6.js
index 3fcf3f2f7ca..7f23510f942 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration9_es6.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration9_es6.js
@@ -7,5 +7,6 @@ async function foo(): Promise<void> {
 function foo() {
     return __awaiter(function* () {
         var v = { [yield ]: foo };
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.js b/tests/baselines/reference/awaitBinaryExpression1_es6.js
index 889e9373368..0531f7643fc 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.js
@@ -13,5 +13,6 @@ function func() {
         "before";
         var b = (yield p) || a;
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.js b/tests/baselines/reference/awaitBinaryExpression2_es6.js
index 5a156d6d0d3..36545440f1f 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.js
@@ -13,5 +13,6 @@ function func() {
         "before";
         var b = (yield p) && a;
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.js b/tests/baselines/reference/awaitBinaryExpression3_es6.js
index 8b150a9fcbf..bfe95956ebc 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.js
@@ -13,5 +13,6 @@ function func() {
         "before";
         var b = (yield p) + a;
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.js b/tests/baselines/reference/awaitBinaryExpression4_es6.js
index c8f42d191c0..fa2dd17143e 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.js
@@ -13,5 +13,6 @@ function func() {
         "before";
         var b = yield p, a;
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.js b/tests/baselines/reference/awaitBinaryExpression5_es6.js
index 1c867a8abbf..615320e8ebb 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.js
@@ -15,5 +15,6 @@ function func() {
         var o;
         o.a = yield p;
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.js b/tests/baselines/reference/awaitCallExpression1_es6.js
index dc73da972ac..9e329e14ad2 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.js
+++ b/tests/baselines/reference/awaitCallExpression1_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = fn(a, a, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.js b/tests/baselines/reference/awaitCallExpression2_es6.js
index a0f0944d796..4f8e088b55d 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.js
+++ b/tests/baselines/reference/awaitCallExpression2_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = fn(yield p, a, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.js b/tests/baselines/reference/awaitCallExpression3_es6.js
index 75e77883993..54b5d8411d7 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.js
+++ b/tests/baselines/reference/awaitCallExpression3_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = fn(a, yield p, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.js b/tests/baselines/reference/awaitCallExpression4_es6.js
index 8f1756393cb..9e32395df83 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.js
+++ b/tests/baselines/reference/awaitCallExpression4_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = (yield pfn)(a, a, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.js b/tests/baselines/reference/awaitCallExpression5_es6.js
index 0752c02758b..76ccf06b105 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.js
+++ b/tests/baselines/reference/awaitCallExpression5_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = o.fn(a, a, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.js b/tests/baselines/reference/awaitCallExpression6_es6.js
index 3fc683dc399..90b96a06ad7 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.js
+++ b/tests/baselines/reference/awaitCallExpression6_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = o.fn(yield p, a, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.js b/tests/baselines/reference/awaitCallExpression7_es6.js
index 8618313587a..e9a2edb8a91 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.js
+++ b/tests/baselines/reference/awaitCallExpression7_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = o.fn(a, yield p, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.js b/tests/baselines/reference/awaitCallExpression8_es6.js
index ceab826c58a..e172dde417d 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.js
+++ b/tests/baselines/reference/awaitCallExpression8_es6.js
@@ -17,5 +17,6 @@ function func() {
         "before";
         var b = (yield po).fn(a, a, a);
         "after";
-    }, this, void 0, Promise);
+    },
+    this, void 0, Promise);
 }