diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index c9d23ec5cee..29e684d965d 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2229,9 +2229,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
                 emitEmbeddedStatement(node.statement);
             }
 
-            /* Returns true if start of variable declaration list was emitted.
-             * Return false if nothing was written - this can happen for source file level variable declarations
-             * in system modules - such variable declarations are hoisted.
+            /**
+             * Returns true if start of variable declaration list was emitted.
+             * Returns false if nothing was written - this can happen for source file level variable declarations
+             *     in system modules where such variable declarations are hoisted.
              */
             function tryEmitStartOfVariableDeclarationList(decl: VariableDeclarationList, startPos?: number): boolean {
                 if (shouldHoistVariable(decl, /*checkIfSourceFileLevelDecl*/ true)) {
@@ -3060,6 +3061,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 
             function emitVariableStatement(node: VariableStatement) {
                 let startIsEmitted = false;
+
                 if (node.flags & NodeFlags.Export) {
                     if (isES6ExportedDeclaration(node)) {
                         // Exported ES6 module member
@@ -3070,6 +3072,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
                 else {
                     startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
                 }
+
                 if (startIsEmitted) {
                     emitCommaList(node.declarationList.declarations);
                     write(";");
@@ -3085,6 +3088,28 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
                 }
             }
 
+            function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node: VariableStatement) {
+                // If we're not exporting the variables, there's nothing special here.
+                // Always emit comments for these nodes.
+                if (!(node.flags & NodeFlags.Export)) {
+                    return true;
+                }
+
+                // If we are exporting, but it's a top-level ES6 module exports,
+                // we'll emit the declaration list verbatim, so emit comments too.
+                if (isES6ExportedDeclaration(node)) {
+                    return true;
+                }
+
+                // Otherwise, only emit if we have at least one initializer present.
+                for (let declaration of node.declarationList.declarations) {
+                    if (declaration.initializer) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
             function emitParameter(node: ParameterDeclaration) {
                 if (languageVersion < ScriptTarget.ES6) {
                     if (isBindingPattern(node.name)) {
@@ -5747,6 +5772,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
                     case SyntaxKind.ExportAssignment:
                         return false;
 
+                    case SyntaxKind.VariableStatement:
+                        return shouldEmitLeadingAndTrailingCommentsForVariableStatement(<VariableStatement>node);
+
                     case SyntaxKind.ModuleDeclaration:
                         // Only emit the leading/trailing comments for a module if we're actually
                         // emitting the module as well.
diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.js b/tests/baselines/reference/commentsBeforeVariableStatement1.js
index 1413f8bc415..c82909f8cd4 100644
--- a/tests/baselines/reference/commentsBeforeVariableStatement1.js
+++ b/tests/baselines/reference/commentsBeforeVariableStatement1.js
@@ -5,5 +5,4 @@ export var b: number;
 
 //// [commentsBeforeVariableStatement1.js]
 define(["require", "exports"], function (require, exports) {
-    /** b's comment*/
 });
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 47f24f53570..c982e66bf72 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -66,7 +66,6 @@ define(["require", "exports"], function (require, exports) {
     /** Module comment*/
     var m1;
     (function (m1) {
-        /** b's comment*/
         /** foo's comment*/
         function foo() {
             return m1.b;
@@ -96,7 +95,6 @@ define(["require", "exports"], function (require, exports) {
     /** Module comment */
     var m4;
     (function (m4) {
-        /** b's comment */
         /** foo's comment
         */
         function foo() {
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 179d3f9f88e..2c8b811d754 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -66,7 +66,6 @@ define(["require", "exports"], function (require, exports) {
     /** Module comment*/
     var m1;
     (function (m1) {
-        /** b's comment*/
         /** foo's comment*/
         function foo() {
             return m1.b;
@@ -96,7 +95,6 @@ define(["require", "exports"], function (require, exports) {
     /** Module comment */
     var m4;
     (function (m4) {
-        /** b's comment */
         /** foo's comment
         */
         function foo() {
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index 2572a153a14..283e07ebc7f 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -65,7 +65,6 @@ export var newVar2 = new extMod.m4.m2.c();
 /** Module comment*/
 var m1;
 (function (m1) {
-    /** b's comment*/
     /** foo's comment*/
     function foo() {
         return m1.b;
@@ -95,7 +94,6 @@ var myvar = new m1.m2.c();
 /** Module comment */
 var m4;
 (function (m4) {
-    /** b's comment */
     /** foo's comment
     */
     function foo() {
diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js
index 4406e609ead..aa5cd2fb7fa 100644
--- a/tests/baselines/reference/commentsModules.js
+++ b/tests/baselines/reference/commentsModules.js
@@ -101,7 +101,6 @@ new m7.m8.m9.c();
 /** Module comment*/
 var m1;
 (function (m1) {
-    /** b's comment*/
     /** foo's comment*/
     function foo() {
         return m1.b;
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
index 4210cc13925..ebad7156617 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
@@ -52,7 +52,6 @@ var M;
             return Window;
         })();
         N.Window = Window;
-         // Should report error that W is private
     })(N = M.N || (M.N = {}));
 })(M || (M = {}));
 var M1;
@@ -65,7 +64,6 @@ var M1;
             return Window;
         })();
         N.Window = Window;
-         // No error
     })(N = M1.N || (M1.N = {}));
 })(M1 || (M1 = {}));
 var M2;
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
index 959d82917f7..19bdce50cd7 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
@@ -59,8 +59,6 @@ var m;
         }
     };
     m.x3 = m.x;
-    // Function type
     m.y2 = m.y;
-    // constructor type
     m.z2 = m.z;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js
index db5a0a05cfd..ee21d9a408d 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js
@@ -74,7 +74,6 @@ var M;
             D[D["f"] = 0] = "f";
         })(P.D || (P.D = {}));
         var D = P.D;
-         // ok
         P.w = M.D.f; // error, should be typeof M.D.f
         P.x = M.C.f; // error, should be typeof M.C.f
         P.x = M.E.f; // error, should be typeof M.E.f
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
index 55535e9ec29..e5532291946 100644
--- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
+++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
@@ -9,7 +9,6 @@ export module M {
 //// [declarationEmit_nameConflictsWithAlias.js]
 var M;
 (function (M) {
-     // Gets emitted as C.I, which is the wrong interface
 })(M = exports.M || (exports.M = {}));
 
 
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
index 170740458d7..944ef4e3d5f 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
@@ -117,7 +117,6 @@ var Foo = (function () {
 })();
 var Foo;
 (function (Foo) {
-     // error for redeclaring var in a different parent
 })(Foo || (Foo = {}));
 var N;
 (function (N) {
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 06e37d0d5bb..45aee387cda 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -83,9 +83,7 @@ define(["require", "exports"], function (require, exports) {
     var M2;
     (function (M2) {
         var v;
-         // one error (visibility)
         var w;
-         // two errors (visibility and type mismatch)
     })(M2 || (M2 = {}));
     var M;
     (function (M) {
diff --git a/tests/baselines/reference/exportPrivateType.js b/tests/baselines/reference/exportPrivateType.js
index 87dc16968f6..14267730dfb 100644
--- a/tests/baselines/reference/exportPrivateType.js
+++ b/tests/baselines/reference/exportPrivateType.js
@@ -44,6 +44,5 @@ var foo;
         C2.prototype.test = function () { return true; };
         return C2;
     })();
-    // None of the types are exported, so per section 10.3, should all be errors
 })(foo || (foo = {}));
 var y = foo.g; // Exported variable 'y' has or is using private type 'foo.C2'.
diff --git a/tests/baselines/reference/invalidNestedModules.js b/tests/baselines/reference/invalidNestedModules.js
index 5f3a19aaec8..bec6491a636 100644
--- a/tests/baselines/reference/invalidNestedModules.js
+++ b/tests/baselines/reference/invalidNestedModules.js
@@ -73,6 +73,5 @@ var M2;
 (function (M2) {
     var X;
     (function (X) {
-         // Error
     })(X = M2.X || (M2.X = {}));
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
index 0301b7b9e4b..6dd486e87d2 100644
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
+++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js
@@ -14,5 +14,4 @@ var Outer;
     var Inner;
     (function (Inner) {
     })(Inner || (Inner = {}));
-     // Since we dont unwind inner any more, it is error here
 })(Outer || (Outer = {}));
diff --git a/tests/baselines/reference/privacyGloVar.js b/tests/baselines/reference/privacyGloVar.js
index 871407428f2..e4bda49698f 100644
--- a/tests/baselines/reference/privacyGloVar.js
+++ b/tests/baselines/reference/privacyGloVar.js
@@ -125,7 +125,6 @@ var m1;
     })();
     var m1_v1_private;
     var m1_v3_private;
-     // error
     var m1_v11_private = new C1_public();
     m1.m1_v12_public = new C1_public();
     var m1_v13_private = new C2_private();
diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js
index 2dc78dd3d2b..17c7b1a74d1 100644
--- a/tests/baselines/reference/privacyVar.js
+++ b/tests/baselines/reference/privacyVar.js
@@ -219,7 +219,6 @@ var m1;
     })();
     var m1_v1_private;
     var m1_v3_private;
-     // error
     var m1_v11_private = new C1_public();
     m1.m1_v12_public = new C1_public();
     var m1_v13_private = new C2_private();
@@ -324,7 +323,6 @@ var glo_C4_public = (function () {
 })();
 var glo_v1_private;
 var glo_v3_private;
- // error
 var glo_v11_private = new glo_C1_public();
 exports.glo_v12_public = new glo_C1_public();
 var glo_v13_private = new glo_C2_private();
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
index d080b9d7b24..4632ef8c60a 100644
--- a/tests/baselines/reference/privacyVarDeclFile.js
+++ b/tests/baselines/reference/privacyVarDeclFile.js
@@ -459,7 +459,6 @@ var privateClassWithWithPublicPropertyTypes = (function () {
     }
     return privateClassWithWithPublicPropertyTypes;
 })();
- // Error
 var privateVarWithPrivatePropertyTypes;
 var privateVarWithPublicPropertyTypes;
 var publicClassWithPrivateModulePropertyTypes = (function () {
@@ -468,7 +467,6 @@ var publicClassWithPrivateModulePropertyTypes = (function () {
     return publicClassWithPrivateModulePropertyTypes;
 })();
 exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
- // Error
 var privateClassWithPrivateModulePropertyTypes = (function () {
     function privateClassWithPrivateModulePropertyTypes() {
     }
@@ -510,7 +508,6 @@ var publicModule;
         }
         return privateClassWithWithPublicPropertyTypes;
     })();
-     // Error
     var privateVarWithPrivatePropertyTypes;
     var privateVarWithPublicPropertyTypes;
     var publicClassWithPrivateModulePropertyTypes = (function () {
@@ -519,7 +516,6 @@ var publicModule;
         return publicClassWithPrivateModulePropertyTypes;
     })();
     publicModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-     // Error
     var privateClassWithPrivateModulePropertyTypes = (function () {
         function privateClassWithPrivateModulePropertyTypes() {
         }
@@ -674,7 +670,6 @@ var publicModuleInGlobal;
         }
         return privateClassWithWithPublicPropertyTypes;
     })();
-     // Error
     var privateVarWithPrivatePropertyTypes;
     var privateVarWithPublicPropertyTypes;
     var publicClassWithPrivateModulePropertyTypes = (function () {
@@ -683,7 +678,6 @@ var publicModuleInGlobal;
         return publicClassWithPrivateModulePropertyTypes;
     })();
     publicModuleInGlobal.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-     // Error
     var privateClassWithPrivateModulePropertyTypes = (function () {
         function privateClassWithPrivateModulePropertyTypes() {
         }
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
index d886fb39eaf..866a54e964f 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -27,5 +27,4 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
 define(["require", "exports"], function (require, exports) {
-     // This should result in type ClassB
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
index 5b2992b02fd..8398d252c87 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -31,5 +31,4 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
 define(["require", "exports"], function (require, exports) {
-     // This should result in type ClassB
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
index acf9075f6db..9d992596f40 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -35,5 +35,4 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
 define(["require", "exports"], function (require, exports) {
-     // This should result in type ClassB
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
index 8f6b76aa059..109950d0301 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
@@ -27,5 +27,4 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
 define(["require", "exports"], function (require, exports) {
-     // This should result in type ClassB
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
index 1d6e7f729a0..2b5353f2796 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
@@ -34,5 +34,4 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
 define(["require", "exports"], function (require, exports) {
-     // This should result in type ClassB
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
index c8fd463c2fe..6ae03f9c9b8 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
@@ -41,5 +41,4 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
 define(["require", "exports"], function (require, exports) {
-     // This should result in type ClassB
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
index aa82e463ce7..8e87b0bc3a0 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
@@ -46,5 +46,4 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
 define(["require", "exports"], function (require, exports) {
-     // This should result in type ClassB
 });
diff --git a/tests/baselines/reference/typeGuardsInModule.js b/tests/baselines/reference/typeGuardsInModule.js
index af87fae17ca..6c1ccdbb5af 100644
--- a/tests/baselines/reference/typeGuardsInModule.js
+++ b/tests/baselines/reference/typeGuardsInModule.js
@@ -107,7 +107,6 @@ var m1;
     else {
         num = var2; // number
     }
-    // exported variable in the module
     if (typeof m1.var3 === "string") {
         strOrNum = m1.var3; // string | number
     }
@@ -135,7 +134,6 @@ var m2;
         else {
             num = var4; // number
         }
-        // exported variable in the module
         if (typeof m3.var5 === "string") {
             strOrNum = m3.var5; // string | number
         }
@@ -159,7 +157,6 @@ var m3;
         else {
             num = var2; // number
         }
-        // exported variable in the module
         if (typeof m4.var3 === "string") {
             strOrNum = m4.var3; // string | number
         }