diff --git a/src/babel/generation/whitespace.js b/src/babel/generation/whitespace.js
index 90709597e0..c1351f01e8 100644
--- a/src/babel/generation/whitespace.js
+++ b/src/babel/generation/whitespace.js
@@ -38,12 +38,11 @@ export default class Whitespace {
     var startToken;
     var endToken;
     var tokens = this.tokens;
-    var token;
 
     for (var j = 0; j < tokens.length; j++) {
       // optimize for forward traversal by shifting for loop index
       var i = getLookupIndex(j, this._lastFoundIndex, this.tokens.length);
-      token = tokens[i];
+      var token = tokens[i];
 
       // this is the token this node starts with
       if (node.start === token.start) {
@@ -62,17 +61,17 @@ export default class Whitespace {
     var startToken;
     var endToken;
     var tokens = this.tokens;
-    var token;
 
     for (var j = 0; j < tokens.length; j++) {
       // optimize for forward traversal by shifting for loop index
       var i = getLookupIndex(j, this._lastFoundIndex, this.tokens.length);
-      token = tokens[i];
+      var token = tokens[i];
 
       // this is the token this node ends with
       if (node.end === token.end) {
         startToken = token;
         endToken = tokens[i + 1];
+        if (endToken.type.label === ",") endToken = tokens[i + 2];
 
         this._lastFoundIndex = i;
         break;
diff --git a/src/babel/helpers/parse.js b/src/babel/helpers/parse.js
index b07145307b..28b8b7af74 100644
--- a/src/babel/helpers/parse.js
+++ b/src/babel/helpers/parse.js
@@ -14,7 +14,6 @@ export default function (code, opts = {}) {
     strictMode:                  opts.strictMode,
     sourceType:                  opts.sourceType,
     locations:                   true,
-    onComment:                   comments,
     features:                    opts.features || {},
     plugins:                     opts.plugins || {},
     onToken:                     tokens,
diff --git a/test/core/fixtures/transformation/es6.properties.computed/two/expected.js b/test/core/fixtures/transformation/es6.properties.computed/two/expected.js
index 86a0871d8a..ea2e468d81 100644
--- a/test/core/fixtures/transformation/es6.properties.computed/two/expected.js
+++ b/test/core/fixtures/transformation/es6.properties.computed/two/expected.js
@@ -1,4 +1,5 @@
 "use strict";
 
 var obj = babelHelpers.defineProperty({
-  first: "first" }, "second", "second");
+  first: "first"
+}, "second", "second");
diff --git a/test/core/fixtures/transformation/spec.proto-to-assign/object-literal/expected.js b/test/core/fixtures/transformation/spec.proto-to-assign/object-literal/expected.js
index de88a93d98..d6e2b72e94 100644
--- a/test/core/fixtures/transformation/spec.proto-to-assign/object-literal/expected.js
+++ b/test/core/fixtures/transformation/spec.proto-to-assign/object-literal/expected.js
@@ -5,7 +5,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 var foo = _extends({}, bar);
 
 var foo = _extends({}, bar, {
-  bar: "foo" });
+  bar: "foo"
+});
 
 var foo = _extends({}, bar, {
   bar: "foo"