diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index ac9e360c21c..ca6adc53169 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2546,32 +2546,6 @@ module ts {
                 }
             }
 
-            function emitObjectLiteralBody(node: ObjectLiteralExpression, numElements: number) {
-                write("{");
-
-                var multiLine = (node.flags & NodeFlags.MultiLine) !== 0;
-
-                if (numElements > 0) {
-                    var properties = node.properties;
-                    if (!multiLine) {
-                        write(" ");
-                    }
-                    else {
-                        increaseIndent();
-                    }
-                    emitList(properties, 0, numElements, /*multiLine*/ multiLine,
-                        /*trailingComma*/ properties.hasTrailingComma && languageVersion >= ScriptTarget.ES5);
-                    if (!multiLine) {
-                        write(" ");
-                    }
-                    else {
-                        decreaseIndent();
-                    }
-                }
-
-                write("}");
-            }
-
             function createSynthesizedNode(kind: SyntaxKind): Node {
                 var node = createNode(kind);
                 node.pos = -1;
@@ -2801,7 +2775,14 @@ module ts {
 
                 // Ordinary case: either the object has no computed properties
                 // or we're compiling with an ES6+ target.
-                emitObjectLiteralBody(node, properties.length);
+                write("{");
+
+                var properties = node.properties;
+                if (properties.length) {
+                    emitLinePreservingList(node, properties, /*allowTrailingComma:*/ languageVersion >= ScriptTarget.ES5, /*spacesBetweenBraces:*/ true)
+                }
+
+                write("}");
             }
 
             function emitComputedPropertyName(node: ComputedPropertyName) {
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index edc4ee297aa..b7ae84a2312 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -1965,8 +1965,6 @@ function compile(fileNames, options) {
 }
 exports.compile = compile;
 compile(process.argv.slice(2), {
-    noEmitOnError: true,
-    noImplicitAny: true,
-    target: 1 /* ES5 */,
-    module: 1 /* CommonJS */
+    noEmitOnError: true, noImplicitAny: true,
+    target: 1 /* ES5 */, module: 1 /* CommonJS */
 });
diff --git a/tests/baselines/reference/YieldExpression10_es6.js b/tests/baselines/reference/YieldExpression10_es6.js
index f111e6e1bdf..3bae1b645fe 100644
--- a/tests/baselines/reference/YieldExpression10_es6.js
+++ b/tests/baselines/reference/YieldExpression10_es6.js
@@ -7,5 +7,6 @@ var v = { * foo() {
 
 //// [YieldExpression10_es6.js]
 var v = { foo: function () {
-    ;
-} };
+        ;
+    }
+};
diff --git a/tests/baselines/reference/classExpression.js b/tests/baselines/reference/classExpression.js
index 9d902abbf52..6bcf0f46f74 100644
--- a/tests/baselines/reference/classExpression.js
+++ b/tests/baselines/reference/classExpression.js
@@ -20,9 +20,7 @@ var C = (function () {
     return C;
 })();
 var y = {
-    foo: ,
-    class: C2
-}, _a = void 0;
+    foo: , class: C2 }, _a = void 0;
 var M;
 (function (M) {
     var z = ;
diff --git a/tests/baselines/reference/computedPropertyNames49_ES5.js b/tests/baselines/reference/computedPropertyNames49_ES5.js
index 8aefd49a4a8..a64d9431a9a 100644
--- a/tests/baselines/reference/computedPropertyNames49_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames49_ES5.js
@@ -30,17 +30,17 @@ var x = (_a = {
     p1: 10
 }, _a.p1 =
 10, _a[1 + 1] = Object.defineProperty({ get: function () {
-    throw 10;
-}, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ get: function () {
-    return 10;
-}, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ set: function () {
-    // just throw
-    throw 10;
-}, enumerable: true, configurable: true }), _a.foo = Object.defineProperty({ get: function () {
-    if (1 == 1) {
+        throw 10;
+    }, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ get: function () {
         return 10;
-    }
-}, enumerable: true, configurable: true }), _a.p2 =
+    }, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ set: function () {
+        // just throw
+        throw 10;
+    }, enumerable: true, configurable: true }), _a.foo = Object.defineProperty({ get: function () {
+        if (1 == 1) {
+            return 10;
+        }
+    }, enumerable: true, configurable: true }), _a.p2 =
 20,
 _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames50_ES5.js b/tests/baselines/reference/computedPropertyNames50_ES5.js
index e0fd3dfbcd7..a0703eeac05 100644
--- a/tests/baselines/reference/computedPropertyNames50_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames50_ES5.js
@@ -35,17 +35,17 @@ var x = (_a = {
     }
 }, _a.p1 =
 10, _a.foo = Object.defineProperty({ get: function () {
-    if (1 == 1) {
+        if (1 == 1) {
+            return 10;
+        }
+    }, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ get: function () {
+        throw 10;
+    }, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ set: function () {
+        // just throw
+        throw 10;
+    }, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ get: function () {
         return 10;
-    }
-}, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ get: function () {
-    throw 10;
-}, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ set: function () {
-    // just throw
-    throw 10;
-}, enumerable: true, configurable: true }), _a[1 + 1] = Object.defineProperty({ get: function () {
-    return 10;
-}, enumerable: true, configurable: true }), _a.p2 =
+    }, enumerable: true, configurable: true }), _a.p2 =
 20,
 _a);
 var _a;
diff --git a/tests/baselines/reference/nestedClassDeclaration.js b/tests/baselines/reference/nestedClassDeclaration.js
index fa69ef5950e..70445b3372f 100644
--- a/tests/baselines/reference/nestedClassDeclaration.js
+++ b/tests/baselines/reference/nestedClassDeclaration.js
@@ -37,5 +37,4 @@ var C3 = (function () {
     return C3;
 })();
 var x = {
-    class: C4
-}, _a = void 0;
+    class: C4 }, _a = void 0;
diff --git a/tests/baselines/reference/objectLiteralWithSemicolons4.js b/tests/baselines/reference/objectLiteralWithSemicolons4.js
index 9e1e3dea4b9..a01d52548ee 100644
--- a/tests/baselines/reference/objectLiteralWithSemicolons4.js
+++ b/tests/baselines/reference/objectLiteralWithSemicolons4.js
@@ -5,5 +5,4 @@ var v = {
 
 //// [objectLiteralWithSemicolons4.js]
 var v = {
-    a: 
-};
+    a:  };
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.js b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
index 7a237223d7c..cf0d113c244 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.js
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
@@ -42,6 +42,5 @@ var C2 = (function () {
     return C2;
 })();
 var b = {
-    x: function () { },
-    1:  // error
+    x: function () { }, 1:  // error
 };
diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js
index 08dc96d38ef..6a703759fff 100644
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.js
@@ -3,4 +3,5 @@ var v = { a
 return;
 
 //// [parserErrorRecovery_ObjectLiteral2.js]
-var v = { a: , return:  };
+var v = { a: ,
+    return:  };
diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js
index 1ea23d59112..eecf45fea4f 100644
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.js
@@ -3,4 +3,5 @@ var v = { a:
 return;
 
 //// [parserErrorRecovery_ObjectLiteral3.js]
-var v = { a: , return:  };
+var v = { a: ,
+    return:  };
diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js
index 4fe49788740..87a1a31437e 100644
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.js
@@ -3,4 +3,5 @@ var v = { a: 1
 return;
 
 //// [parserErrorRecovery_ObjectLiteral4.js]
-var v = { a: 1, return:  };
+var v = { a: 1,
+    return:  };
diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js
index cf55b59c711..97e618946a0 100644
--- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.js
@@ -3,4 +3,5 @@ var v = { a: 1,
 return;
 
 //// [parserErrorRecovery_ObjectLiteral5.js]
-var v = { a: 1, return:  };
+var v = { a: 1,
+    return:  };
diff --git a/tests/baselines/reference/parserSymbolIndexer5.js b/tests/baselines/reference/parserSymbolIndexer5.js
index 43c456b64aa..3aa046e2114 100644
--- a/tests/baselines/reference/parserSymbolIndexer5.js
+++ b/tests/baselines/reference/parserSymbolIndexer5.js
@@ -5,6 +5,5 @@ var x = {
 
 //// [parserSymbolIndexer5.js]
 var x = {
-    [s]: symbol,
-    "": 
+    [s]: symbol, "": 
 };
diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js
index 64e8b13ab9d..02304380013 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2627,9 +2627,7 @@ var Harness;
                     var description = b.description + (prop ? ": " + prop : '');
                     emitLog('testStart', { desc: description });
                     emitLog('pass', {
-                        desc: description,
-                        pass: true,
-                        perfResults: {
+                        desc: description, pass: true, perfResults: {
                             mean: b.results[prop].mean(),
                             min: b.results[prop].min(),
                             max: b.results[prop].max(),
diff --git a/tests/baselines/reference/targetTypeTest1.js b/tests/baselines/reference/targetTypeTest1.js
index 38ca34843e8..8f9657ee9d0 100644
--- a/tests/baselines/reference/targetTypeTest1.js
+++ b/tests/baselines/reference/targetTypeTest1.js
@@ -109,6 +109,9 @@ function C(a, b) {
     this.b = b;
 }
 C.prototype =
-    { a: 0, b: 0, C1M1: function (c, d) {
-        return (this.a + c) + (this.b + d);
-    } };
+    { a: 0,
+        b: 0,
+        C1M1: function (c, d) {
+            return (this.a + c) + (this.b + d);
+        }
+    };
diff --git a/tests/baselines/reference/templateStringInObjectLiteral.js b/tests/baselines/reference/templateStringInObjectLiteral.js
index b026aedf4d3..6df5a64d78a 100644
--- a/tests/baselines/reference/templateStringInObjectLiteral.js
+++ b/tests/baselines/reference/templateStringInObjectLiteral.js
@@ -6,6 +6,5 @@ var x = {
 
 //// [templateStringInObjectLiteral.js]
 var x = {
-    a: "abc" + 123 + "def"
-} "b";
+    a: "abc" + 123 + "def" } "b";
 321;
diff --git a/tests/baselines/reference/templateStringInObjectLiteralES6.js b/tests/baselines/reference/templateStringInObjectLiteralES6.js
index 22144e75247..7de012185a9 100644
--- a/tests/baselines/reference/templateStringInObjectLiteralES6.js
+++ b/tests/baselines/reference/templateStringInObjectLiteralES6.js
@@ -6,6 +6,5 @@ var x = {
 
 //// [templateStringInObjectLiteralES6.js]
 var x = {
-    a: `abc${123}def`,
-} `b`;
+    a: `abc${123}def`, } `b`;
 321;
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints3.js b/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
index 01f591de323..fb0f5388aaa 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
@@ -30,6 +30,6 @@ var C = (function () {
 })();
 var c = new C({ length: 2 });
 var r = c.foo({ length: 3, charAt: function (x) {
-    '';
-} });
+        '';
+    } });
 var r2 = r('');
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
index da4117860a7..998c16a9f87 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
@@ -28,5 +28,5 @@ var C = (function () {
 var c = new C({ length: 2 });
 var r = c.foo('');
 var r2 = r({ length: 3, charAt: function (x) {
-    '';
-} }); // error
+        '';
+    } }); // error