diff --git a/tests/baselines/reference/asyncMethodWithSuper_es5.types b/tests/baselines/reference/asyncMethodWithSuper_es5.types
index 4d14528409c..4622d83a679 100644
--- a/tests/baselines/reference/asyncMethodWithSuper_es5.types
+++ b/tests/baselines/reference/asyncMethodWithSuper_es5.types
@@ -27,7 +27,7 @@ class B extends A {
 >super["x"]() : void
 >super["x"] : () => void
 >super : A
->"x" : string
+>"x" : "x"
 
         // property access (read)
         const a = super.x;
@@ -41,7 +41,7 @@ class B extends A {
 >b : () => void
 >super["x"] : () => void
 >super : A
->"x" : string
+>"x" : "x"
     }
 
     // async method with assignment/destructuring on 'super' requires a binding
@@ -64,7 +64,7 @@ class B extends A {
 >super["x"]() : void
 >super["x"] : () => void
 >super : A
->"x" : string
+>"x" : "x"
 
         // property access (read)
         const a = super.x;
@@ -78,7 +78,7 @@ class B extends A {
 >b : () => void
 >super["x"] : () => void
 >super : A
->"x" : string
+>"x" : "x"
 
         // property access (assign)
         super.x = f;
@@ -93,7 +93,7 @@ class B extends A {
 >super["x"] = f : () => void
 >super["x"] : () => void
 >super : A
->"x" : string
+>"x" : "x"
 >f : () => void
 
         // destructuring assign with property access
@@ -116,7 +116,7 @@ class B extends A {
 >f : () => void
 >super["x"] : () => void
 >super : A
->"x" : string
+>"x" : "x"
 >{ f } : { f: () => void; }
 >f : () => void
     }
diff --git a/tests/baselines/reference/asyncUseStrict_es5.types b/tests/baselines/reference/asyncUseStrict_es5.types
index c7eafb3433c..a8744a60559 100644
--- a/tests/baselines/reference/asyncUseStrict_es5.types
+++ b/tests/baselines/reference/asyncUseStrict_es5.types
@@ -11,7 +11,7 @@ async function func(): Promise<void> {
 >Promise : Promise<T>
 
     "use strict";
->"use strict" : string
+>"use strict" : "use strict"
 
     var b = await p || a;
 >b : boolean
diff --git a/tests/baselines/reference/asyncUseStrict_es6.types b/tests/baselines/reference/asyncUseStrict_es6.types
index 7e6fd872081..e92da865316 100644
--- a/tests/baselines/reference/asyncUseStrict_es6.types
+++ b/tests/baselines/reference/asyncUseStrict_es6.types
@@ -11,7 +11,7 @@ async function func(): Promise<void> {
 >Promise : Promise<T>
 
     "use strict";
->"use strict" : string
+>"use strict" : "use strict"
 
     var b = await p || a;
 >b : boolean
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties1.types b/tests/baselines/reference/classExpressionWithStaticProperties1.types
index d70fe6c8bc3..2cdcd1581b1 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties1.types
+++ b/tests/baselines/reference/classExpressionWithStaticProperties1.types
@@ -6,7 +6,7 @@ var v = class C {
 
     static a = 1;
 >a : number
->1 : number
+>1 : 1
 
     static b = 2;
 >b : number
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties2.types b/tests/baselines/reference/classExpressionWithStaticProperties2.types
index 221b4794111..2db30ff3105 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties2.types
+++ b/tests/baselines/reference/classExpressionWithStaticProperties2.types
@@ -6,7 +6,7 @@ var v = class C {
 
     static a = 1;
 >a : number
->1 : number
+>1 : 1
 
     static b
 >b : any
@@ -17,7 +17,7 @@ var v = class C {
 
         x: "hi"
 >x : string
->"hi" : string
+>"hi" : "hi"
     }
     static d = C.c.x + " world";
 >d : string
@@ -27,6 +27,6 @@ var v = class C {
 >C : typeof C
 >c : { x: string; }
 >x : string
->" world" : string
+>" world" : " world"
 
  };
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties3.types b/tests/baselines/reference/classExpressionWithStaticProperties3.types
index c6ff6d1b56b..b7f6102c8b7 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties3.types
+++ b/tests/baselines/reference/classExpressionWithStaticProperties3.types
@@ -10,10 +10,10 @@ const arr: {y(): number}[] = [];
 
 for (let i = 0; i < 3; i++) {
 >i : number
->0 : number
+>0 : 0
 >i < 3 : boolean
 >i : number
->3 : number
+>3 : 3
 >i++ : number
 >i : number
 
@@ -36,7 +36,7 @@ for (let i = 0; i < 3; i++) {
 >C.x : number
 >C : typeof C
 >x : number
->2 : number
+>2 : 2
 
     });
 }
diff --git a/tests/baselines/reference/commentsOnRequireStatement.types b/tests/baselines/reference/commentsOnRequireStatement.types
index 2cc6154ed60..cd146c731f7 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.types
+++ b/tests/baselines/reference/commentsOnRequireStatement.types
@@ -2,12 +2,12 @@
 
 export var subject = 10;
 >subject : number
->10 : number
+>10 : 10
 
 === tests/cases/compiler/1.ts ===
 export var subject1 = 10;
 >subject1 : number
->10 : number
+>10 : 10
 
 === tests/cases/compiler/2.ts ===
 /* blah0 */
diff --git a/tests/baselines/reference/es5-asyncFunctionDoStatements.types b/tests/baselines/reference/es5-asyncFunctionDoStatements.types
index cfec3eebcfb..811c3cae02a 100644
--- a/tests/baselines/reference/es5-asyncFunctionDoStatements.types
+++ b/tests/baselines/reference/es5-asyncFunctionDoStatements.types
@@ -53,7 +53,7 @@ async function doStatement5() {
 >doStatement5 : () => Promise<void>
 
     do { if (1) continue; await x; } while (y);
->1 : number
+>1 : 1
 >await x : any
 >x : any
 >y : any
@@ -92,7 +92,7 @@ async function doStatement9() {
 
     C: do { if (1) continue C; await x; } while (y);
 >C : any
->1 : number
+>1 : 1
 >C : any
 >await x : any
 >x : any
@@ -129,7 +129,7 @@ async function doStatement13() {
 >doStatement13 : () => Promise<void>
 
     do { if (1) break; await x; } while (y);
->1 : number
+>1 : 1
 >await x : any
 >x : any
 >y : any
@@ -168,7 +168,7 @@ async function doStatement17() {
 
     G: do { if (1) break G; await x; } while (y);
 >G : any
->1 : number
+>1 : 1
 >G : any
 >await x : any
 >x : any
diff --git a/tests/baselines/reference/es5-asyncFunctionHoisting.types b/tests/baselines/reference/es5-asyncFunctionHoisting.types
index 04b968c571d..933f4fc5c30 100644
--- a/tests/baselines/reference/es5-asyncFunctionHoisting.types
+++ b/tests/baselines/reference/es5-asyncFunctionHoisting.types
@@ -8,7 +8,7 @@ async function hoisting() {
     var a0, a1 = 1;
 >a0 : any
 >a1 : number
->1 : number
+>1 : 1
 
     function z() {
 >z : () => void
@@ -16,21 +16,21 @@ async function hoisting() {
         var b0, b1 = 1;
 >b0 : any
 >b1 : number
->1 : number
+>1 : 1
     }
 
     if (true) {
->true : boolean
+>true : true
 
         var c0, c1 = 1;
 >c0 : any
 >c1 : number
->1 : number
+>1 : 1
     }
 
     for (var a = 0; y;) {
 >a : number
->0 : number
+>0 : 0
 >y : any
 
     }
@@ -54,7 +54,7 @@ async function hoistingWithAwait() {
     var a0, a1 = 1;
 >a0 : any
 >a1 : number
->1 : number
+>1 : 1
 
     function z() {
 >z : () => void
@@ -62,25 +62,25 @@ async function hoistingWithAwait() {
         var b0, b1 = 1;
 >b0 : any
 >b1 : number
->1 : number
+>1 : 1
     }
 
     await 0;
->await 0 : number
->0 : number
+>await 0 : 0
+>0 : 0
 
     if (true) {
->true : boolean
+>true : true
 
         var c0, c1 = 1;
 >c0 : any
 >c1 : number
->1 : number
+>1 : 1
     }
 
     for (var a = 0; y;) {
 >a : number
->0 : number
+>0 : 0
 >y : any
 
     }
diff --git a/tests/baselines/reference/es5-asyncFunctionWhileStatements.types b/tests/baselines/reference/es5-asyncFunctionWhileStatements.types
index 2410befa043..5148543bf34 100644
--- a/tests/baselines/reference/es5-asyncFunctionWhileStatements.types
+++ b/tests/baselines/reference/es5-asyncFunctionWhileStatements.types
@@ -62,7 +62,7 @@ async function whileStatement6() {
 
     while (x) { if (1) continue; await y; }
 >x : any
->1 : number
+>1 : 1
 >await y : any
 >y : any
 }
@@ -103,7 +103,7 @@ async function whileStatement10() {
     D: while (x) { if (1) continue D; await y; }
 >D : any
 >x : any
->1 : number
+>1 : 1
 >D : any
 >await y : any
 >y : any
@@ -138,7 +138,7 @@ async function whileStatement14() {
 
     while (x) { if (1) break; await y; }
 >x : any
->1 : number
+>1 : 1
 >await y : any
 >y : any
 }
@@ -179,7 +179,7 @@ async function whileStatement18() {
     H: while (x) { if (1) break H; await y; }
 >H : any
 >x : any
->1 : number
+>1 : 1
 >H : any
 >await y : any
 >y : any