diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types
index fdcf0be447..c937187f04 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types
@@ -53,7 +53,7 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x
 >f : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
-><{ x: IHasVisualizationModel }>null ? { x: moduleA } : null : { x: IHasVisualizationModel; }
+><{ x: IHasVisualizationModel }>null ? { x: moduleA } : null : { x: typeof moduleA; }
 ><{ x: IHasVisualizationModel }>null : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
index 18fe6efb8c..2c3ba8bc7c 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
@@ -72,7 +72,7 @@ var r7: (x: Object) => void = true ? (x: number) => { } : (x: Object) => { };
 >r7 : (x: Object) => void
 >x : Object
 >Object : Object
->true ? (x: number) => { } : (x: Object) => { } : (x: Object) => void
+>true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
 >(x: number) => { } : (x: number) => void
 >x : number
 >(x: Object) => { } : (x: Object) => void
@@ -91,7 +91,7 @@ var r8 = true ? (x: Object) => { } : (x: number) => { }; // returns Object => vo
 var r10: Base = true ? derived : derived2; // no error since we use the contextual type in BCT
 >r10 : Base
 >Base : Base
->true ? derived : derived2 : Base
+>true ? derived : derived2 : Derived | Derived2
 >derived : Derived
 >derived2 : Derived2
 
@@ -112,7 +112,7 @@ function foo5<T, U>(t: T, u: U): Object {
 >Object : Object
 
     return true ? t : u; // BCT is Object
->true ? t : u : Object
+>true ? t : u : T | U
 >t : T
 >u : U
 }
diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types
index 8ad918936d..edef88acfc 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types
@@ -80,7 +80,7 @@ var result4: (t: A) => any = true ? (m) => m.propertyX : (n) => n.propertyA;
 >result4 : (t: A) => any
 >t : A
 >A : A
->true ? (m) => m.propertyX : (n) => n.propertyA : (t: A) => any
+>true ? (m) => m.propertyX : (n) => n.propertyA : (m: A) => any
 >(m) => m.propertyX : (m: A) => any
 >m : A
 >m.propertyX : any
@@ -144,7 +144,7 @@ var result8: (t: A) => any = true ? (m) => m.propertyA : (n) => n.propertyX;
 >result8 : (t: A) => any
 >t : A
 >A : A
->true ? (m) => m.propertyA : (n) => n.propertyX : (t: A) => any
+>true ? (m) => m.propertyA : (n) => n.propertyX : (n: A) => any
 >(m) => m.propertyA : (m: A) => number
 >m : A
 >m.propertyA : number
@@ -161,7 +161,7 @@ var result8: (t: A) => any = true ? (m) => m.propertyA : (n) => n.propertyX;
 var resultIsX3: X = true ? a : b;
 >resultIsX3 : X
 >X : X
->true ? a : b : X
+>true ? a : b : A | B
 >a : A
 >b : B
 
@@ -169,7 +169,7 @@ var result10: (t: X) => any = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 >result10 : (t: X) => any
 >t : X
 >X : X
->true ? (m) => m.propertyX1 : (n) => n.propertyX2 : (t: X) => any
+>true ? (m) => m.propertyX1 : (n) => n.propertyX2 : { (m: X): number; } | { (n: X): string; }
 >(m) => m.propertyX1 : (m: X) => number
 >m : X
 >m.propertyX1 : number
@@ -184,5 +184,5 @@ var result10: (t: X) => any = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 //Expr1 and Expr2 are literals
 var result11: any = true ? 1 : 'string';
 >result11 : any
->true ? 1 : 'string' : any
+>true ? 1 : 'string' : string | number
 
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression.types b/tests/baselines/reference/contextualTypingOfConditionalExpression.types
index 6c6f9b0445..2cd2b671b4 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.types
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.types
@@ -2,7 +2,7 @@
 var x: (a: number) => void = true ? (a) => a.toExponential() : (b) => b.toFixed();
 >x : (a: number) => void
 >a : number
->true ? (a) => a.toExponential() : (b) => b.toFixed() : (a: number) => void
+>true ? (a) => a.toExponential() : (b) => b.toFixed() : (a: number) => string
 >(a) => a.toExponential() : (a: number) => string
 >a : number
 >a.toExponential() : string
@@ -41,7 +41,7 @@ var x2: (a: A) => void = true ? (a) => a.foo : (b) => b.foo;
 >x2 : (a: A) => void
 >a : A
 >A : A
->true ? (a) => a.foo : (b) => b.foo : (a: A) => void
+>true ? (a) => a.foo : (b) => b.foo : (a: A) => number
 >(a) => a.foo : (a: A) => number
 >a : A
 >a.foo : number
diff --git a/tests/baselines/reference/contextuallyTypingOrOperator.types b/tests/baselines/reference/contextuallyTypingOrOperator.types
index 5a20b2b921..4b47ea763b 100644
--- a/tests/baselines/reference/contextuallyTypingOrOperator.types
+++ b/tests/baselines/reference/contextuallyTypingOrOperator.types
@@ -3,7 +3,7 @@ var v: { a: (_: string) => number } = { a: s => s.length } || { a: s => 1 };
 >v : { a: (_: string) => number; }
 >a : (_: string) => number
 >_ : string
->{ a: s => s.length } || { a: s => 1 } : { a: (_: string) => number; }
+>{ a: s => s.length } || { a: s => 1 } : { a: (s: string) => number; }
 >{ a: s => s.length } : { a: (s: string) => number; }
 >a : (s: string) => number
 >s => s.length : (s: string) => number
diff --git a/tests/baselines/reference/contextuallyTypingOrOperator2.types b/tests/baselines/reference/contextuallyTypingOrOperator2.types
index b46d0c0aed..c233066d6d 100644
--- a/tests/baselines/reference/contextuallyTypingOrOperator2.types
+++ b/tests/baselines/reference/contextuallyTypingOrOperator2.types
@@ -3,7 +3,7 @@ var v: { a: (_: string) => number } = { a: s => s.length } || { a: s => 1 };
 >v : { a: (_: string) => number; }
 >a : (_: string) => number
 >_ : string
->{ a: s => s.length } || { a: s => 1 } : { a: (_: string) => number; }
+>{ a: s => s.length } || { a: s => 1 } : { a: (s: string) => number; }
 >{ a: s => s.length } : { a: (s: string) => number; }
 >a : (s: string) => number
 >s => s.length : (s: string) => number
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index c609c6aec9..658d4a0bff 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -2616,7 +2616,7 @@ var x267: { [n: number]: Base; } = [d1, d2] || undefined;
 >x267 : { [x: number]: Base; }
 >n : number
 >Base : Base
->[d1, d2] || undefined : { [x: number]: Base; }
+>[d1, d2] || undefined : Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
@@ -2699,7 +2699,7 @@ var x275: { [n: number]: Base; } = undefined || [d1, d2];
 >x275 : { [x: number]: Base; }
 >n : number
 >Base : Base
->undefined || [d1, d2] : { [x: number]: Base; }
+>undefined || [d1, d2] : Base[]
 >undefined : undefined
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -2800,7 +2800,7 @@ var x283: { [n: number]: Base; } = [d1, d2] || [d1, d2];
 >x283 : { [x: number]: Base; }
 >n : number
 >Base : Base
->[d1, d2] || [d1, d2] : { [x: number]: Base; }
+>[d1, d2] || [d1, d2] : Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
@@ -2933,7 +2933,7 @@ var x293: { [n: number]: Base; } = true ? [d1, d2] : [d1, d2];
 >x293 : { [x: number]: Base; }
 >n : number
 >Base : Base
->true ? [d1, d2] : [d1, d2] : { [x: number]: Base; }
+>true ? [d1, d2] : [d1, d2] : Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
@@ -2961,7 +2961,7 @@ var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n =
 >x295 : (s: Base[]) => any
 >s : Base[]
 >Base : Base
->true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; } : (s: Base[]) => any
+>true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
@@ -2975,7 +2975,7 @@ var x296: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : { func: n
 >x296 : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
->true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } } : Genric<Base>
+>true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => Array<Derived1 | Derived2>; }
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => Array<Derived1 | Derived2>; }
 >func : (n: Base[]) => Array<Derived1 | Derived2>
 >n => { return [d1, d2]; } : (n: Base[]) => Array<Derived1 | Derived2>
@@ -3076,7 +3076,7 @@ var x305: { [n: number]: Base; } = true ? undefined : [d1, d2];
 >x305 : { [x: number]: Base; }
 >n : number
 >Base : Base
->true ? undefined : [d1, d2] : { [x: number]: Base; }
+>true ? undefined : [d1, d2] : Base[]
 >undefined : undefined
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -3098,7 +3098,7 @@ var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return n
 >x307 : (s: Base[]) => any
 >s : Base[]
 >Base : Base
->true ? undefined : n => { var n: Base[]; return null; } : (s: Base[]) => any
+>true ? undefined : n => { var n: Base[]; return null; } : (n: Base[]) => any
 >undefined : undefined
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
@@ -3109,7 +3109,7 @@ var x308: Genric<Base> = true ? undefined : { func: n => { return [d1, d2]; } };
 >x308 : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
->true ? undefined : { func: n => { return [d1, d2]; } } : Genric<Base>
+>true ? undefined : { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => Array<Derived1 | Derived2>; }
 >undefined : undefined
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => Array<Derived1 | Derived2>; }
 >func : (n: Base[]) => Array<Derived1 | Derived2>
@@ -3204,7 +3204,7 @@ var x317: { [n: number]: Base; } = true ? [d1, d2] : undefined;
 >x317 : { [x: number]: Base; }
 >n : number
 >Base : Base
->true ? [d1, d2] : undefined : { [x: number]: Base; }
+>true ? [d1, d2] : undefined : Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
@@ -3226,7 +3226,7 @@ var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : und
 >x319 : (s: Base[]) => any
 >s : Base[]
 >Base : Base
->true ? n => { var n: Base[]; return null; } : undefined : (s: Base[]) => any
+>true ? n => { var n: Base[]; return null; } : undefined : (n: Base[]) => any
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
@@ -3237,7 +3237,7 @@ var x320: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : undefined;
 >x320 : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
->true ? { func: n => { return [d1, d2]; } } : undefined : Genric<Base>
+>true ? { func: n => { return [d1, d2]; } } : undefined : { func: (n: Base[]) => Array<Derived1 | Derived2>; }
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => Array<Derived1 | Derived2>; }
 >func : (n: Base[]) => Array<Derived1 | Derived2>
 >n => { return [d1, d2]; } : (n: Base[]) => Array<Derived1 | Derived2>
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
index 6c8ed4e468..aa1eeaf467 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
@@ -57,7 +57,7 @@ var r = f({ x: new Derived(), y: new Derived2() }); // {}[]
 
 var r2 = f({ x: new Base(), y: new Derived2() }); // {}[]
 >r2 : Base[]
->f({ x: new Base(), y: new Derived2() }) : Base[]
+>f({ x: new Base(), y: new Derived2() }) : Array<Base | Derived2>
 >f : <T extends Base, U extends Base>(a: { x: T; y: U; }) => Array<T | U>
 >{ x: new Base(), y: new Derived2() } : { x: Base; y: Derived2; }
 >x : Base
diff --git a/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types b/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types
index d44b220e81..95c9643c29 100644
--- a/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types
+++ b/tests/baselines/reference/logicalOrExpressionIsContextuallyTyped.types
@@ -7,7 +7,7 @@
 var r: { a: string } = { a: '', b: 123 } || { a: '', b: true };
 >r : { a: string; }
 >a : string
->{ a: '', b: 123 } || { a: '', b: true } : { a: string; }
+>{ a: '', b: 123 } || { a: '', b: true } : { a: string; b: number; } | { a: string; b: boolean; }
 >{ a: '', b: 123 } : { a: string; b: number; }
 >a : string
 >b : number
diff --git a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
index 9a450b8778..4008fbbff5 100644
--- a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
+++ b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
@@ -29,7 +29,7 @@ function fn1<T, U>(t: T, u: U) {
 
     var r4: {} = t || u;
 >r4 : {}
->t || u : {}
+>t || u : T | U
 >t : T
 >u : U
 }
@@ -74,7 +74,7 @@ function fn2<T, U/* extends T*/, V/* extends T*/>(t: T, u: U, v: V) {
 
     var r6: {} = u || v;
 >r6 : {}
->u || v : {}
+>u || v : U | V
 >u : U
 >v : V
 
@@ -102,7 +102,7 @@ function fn3<T extends { a: string; b: string }, U extends { a: string; b: numbe
 
     var r2: {} = t || u;
 >r2 : {}
->t || u : {}
+>t || u : T | U
 >t : T
 >u : U
 
@@ -116,7 +116,7 @@ function fn3<T extends { a: string; b: string }, U extends { a: string; b: numbe
     var r4: { a: string } = t || u;
 >r4 : { a: string; }
 >a : string
->t || u : { a: string; }
+>t || u : T | U
 >t : T
 >u : U
 }
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index adcc1b4bce..4be0efcd2a 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -21,7 +21,7 @@ module M1 {
 >reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >apply : (thisArg: any, argArray?: any) => any
 >ar : any
->e ? [f, e] : [f] : any
+>e ? [f, e] : [f] : any[]
 >e : any
 >[f, e] : any[]
 >f : any
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index a23eff1f8e..c73c63aee2 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -309,7 +309,7 @@ _.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd');
 >[1, 2, 3, 4, 5] : number[]
 >(num) => num % 2 == 0 ? 'even' : 'odd' : (num: number) => string
 >num : number
->num % 2 == 0 ? 'even' : 'odd' : any
+>num % 2 == 0 ? 'even' : 'odd' : string
 >num % 2 == 0 : boolean
 >num % 2 : number
 >num : number