diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index 58c2763048..045fb6c9c5 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -15027,7 +15027,7 @@ func (c *Checker) getTypeOfVariableOrParameterOrPropertyWorker(symbol *ast.Symbo
 	case ast.KindPropertyAssignment:
 		result = c.checkPropertyAssignment(declaration, CheckModeNormal)
 	case ast.KindShorthandPropertyAssignment:
-		result = c.checkExpressionForMutableLocation(declaration, CheckModeNormal)
+		result = c.checkExpressionForMutableLocation(declaration.Name(), CheckModeNormal)
 	case ast.KindMethodDeclaration:
 		result = c.checkObjectLiteralMethod(declaration, CheckModeNormal)
 	case ast.KindExportAssignment:
diff --git a/testdata/baselines/reference/submodule/compiler/abstractPropertyInConstructor.types b/testdata/baselines/reference/submodule/compiler/abstractPropertyInConstructor.types
index 76ae6789cb..79952bea0f 100644
--- a/testdata/baselines/reference/submodule/compiler/abstractPropertyInConstructor.types
+++ b/testdata/baselines/reference/submodule/compiler/abstractPropertyInConstructor.types
@@ -276,7 +276,7 @@ abstract class C1 {
 >({ x, y: y1, "y": y1 } = this) : this
 >{ x, y: y1, "y": y1 } = this : this
 >{ x, y: y1, "y": y1 } : { x: string; y: string; }
->x : any
+>x : string
 >y : string
 >y1 : string
 >"y" : string
@@ -309,7 +309,7 @@ class C2 {
 >({ x, y: y1, "y": y1 } = this) : this
 >{ x, y: y1, "y": y1 } = this : this
 >{ x, y: y1, "y": y1 } : { x: string; y: string; }
->x : any
+>x : string
 >y : string
 >y1 : string
 >"y" : string
diff --git a/testdata/baselines/reference/submodule/compiler/abstractPropertyInConstructor.types.diff b/testdata/baselines/reference/submodule/compiler/abstractPropertyInConstructor.types.diff
deleted file mode 100644
index c1ca061871..0000000000
--- a/testdata/baselines/reference/submodule/compiler/abstractPropertyInConstructor.types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.abstractPropertyInConstructor.types
-+++ new.abstractPropertyInConstructor.types
-@@= skipped -275, +275 lines =@@
- >({ x, y: y1, "y": y1 } = this) : this
- >{ x, y: y1, "y": y1 } = this : this
- >{ x, y: y1, "y": y1 } : { x: string; y: string; }
-->x : string
-+>x : any
- >y : string
- >y1 : string
- >"y" : string
-@@= skipped -33, +33 lines =@@
- >({ x, y: y1, "y": y1 } = this) : this
- >{ x, y: y1, "y": y1 } = this : this
- >{ x, y: y1, "y": y1 } : { x: string; y: string; }
-->x : string
-+>x : any
- >y : string
- >y1 : string
- >"y" : string
diff --git a/testdata/baselines/reference/submodule/compiler/argumentsAsPropertyName2.types b/testdata/baselines/reference/submodule/compiler/argumentsAsPropertyName2.types
index dafbe01b2a..d8c7344958 100644
--- a/testdata/baselines/reference/submodule/compiler/argumentsAsPropertyName2.types
+++ b/testdata/baselines/reference/submodule/compiler/argumentsAsPropertyName2.types
@@ -35,7 +35,7 @@ function foo() {
         ({ arguments });
 >({ arguments }) : { arguments: IArguments; }
 >{ arguments } : { arguments: IArguments; }
->arguments : any
+>arguments : IArguments
 
         ({ arguments: arguments });
 >({ arguments: arguments }) : { arguments: IArguments; }
diff --git a/testdata/baselines/reference/submodule/compiler/argumentsAsPropertyName2.types.diff b/testdata/baselines/reference/submodule/compiler/argumentsAsPropertyName2.types.diff
deleted file mode 100644
index f314adbc53..0000000000
--- a/testdata/baselines/reference/submodule/compiler/argumentsAsPropertyName2.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.argumentsAsPropertyName2.types
-+++ new.argumentsAsPropertyName2.types
-@@= skipped -34, +34 lines =@@
-         ({ arguments });
- >({ arguments }) : { arguments: IArguments; }
- >{ arguments } : { arguments: IArguments; }
-->arguments : IArguments
-+>arguments : any
- 
-         ({ arguments: arguments });
- >({ arguments: arguments }) : { arguments: IArguments; }
diff --git a/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types b/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types
index 876e70aedc..571779a48e 100644
--- a/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types
+++ b/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types
@@ -15,10 +15,10 @@ var results: string[];
 >{        a,        b    } : { a: string; b: string; }
 
         a,
->a : any
+>a : string
 
         b
->b : any
+>b : string
     }
 }
 
diff --git a/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types.diff b/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types.diff
index 874b2d3db1..fffdade34e 100644
--- a/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/arrayBindingPatternOmittedExpressions.types.diff
@@ -10,18 +10,7 @@
  >a : string
  >results : string[]
  
-@@= skipped -11, +9 lines =@@
- >{        a,        b    } : { a: string; b: string; }
- 
-         a,
-->a : string
-+>a : any
- 
-         b
-->b : string
-+>b : any
-     }
- }
+@@= skipped -20, +18 lines =@@
  
  
  function f([, a, , b, , , , s, , , ] = results) {
diff --git a/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types b/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types
index 48f6a1b845..b52e782584 100644
--- a/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types
+++ b/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types
@@ -285,6 +285,6 @@ const withIndexResult = await Array.fromAsync(["a", "b"], (str, index) => ({ ind
 >index : number
 >({ index, str }) : { index: number; str: string; }
 >{ index, str } : { index: number; str: string; }
->index : any
->str : any
+>index : number
+>str : string
 
diff --git a/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types.diff b/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types.diff
index c26ac41a57..2776e69fc1 100644
--- a/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/arrayFromAsync.types.diff
@@ -152,12 +152,3 @@
  >["a", "b"] : string[]
  >"a" : "a"
  >"b" : "b"
-@@= skipped -20, +20 lines =@@
- >index : number
- >({ index, str }) : { index: number; str: string; }
- >{ index, str } : { index: number; str: string; }
-->index : number
-->str : string
-+>index : any
-+>str : any
- 
diff --git a/testdata/baselines/reference/submodule/compiler/awaitedType.types b/testdata/baselines/reference/submodule/compiler/awaitedType.types
index 65d1b7c812..f4a7276140 100644
--- a/testdata/baselines/reference/submodule/compiler/awaitedType.types
+++ b/testdata/baselines/reference/submodule/compiler/awaitedType.types
@@ -415,7 +415,7 @@ async function f17_usage() {
 
     return { x };
 >{ x } : { x: 123; }
->x : any
+>x : 123
 }
 
 // https://github.com/microsoft/TypeScript/issues/47144
diff --git a/testdata/baselines/reference/submodule/compiler/awaitedType.types.diff b/testdata/baselines/reference/submodule/compiler/awaitedType.types.diff
index a9287ab44b..d9ef8dcaf2 100644
--- a/testdata/baselines/reference/submodule/compiler/awaitedType.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/awaitedType.types.diff
@@ -153,16 +153,7 @@
  >args : any[]
  >fn : T
  
-@@= skipped -33, +36 lines =@@
- 
-     return { x };
- >{ x } : { x: 123; }
-->x : 123
-+>x : any
- }
- 
- // https://github.com/microsoft/TypeScript/issues/47144
-@@= skipped -8, +8 lines =@@
+@@= skipped -41, +44 lines =@@
  >GenericStructure : GenericStructure<AcceptableKeyType>
  
    AcceptableKeyType extends string = string
diff --git a/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types b/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types
index 0a484204b3..af7f268ea5 100644
--- a/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types
+++ b/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types
@@ -30,11 +30,11 @@ const c: C = isIt ? { isIt, text: 'hey' } : { isIt, value: 123 };
 >isIt ? { isIt, text: 'hey' } : { isIt, value: 123 } : { isIt: true; text: string; } | { isIt: false; value: number; }
 >isIt : boolean
 >{ isIt, text: 'hey' } : { isIt: true; text: string; }
->isIt : any
+>isIt : true
 >text : string
 >'hey' : "hey"
 >{ isIt, value: 123 } : { isIt: false; value: number; }
->isIt : any
+>isIt : false
 >value : number
 >123 : 123
 
diff --git a/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types.diff b/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types.diff
index 9c5e0a22a1..dbfb1cbadf 100644
--- a/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/booleanLiteralsContextuallyTypedFromUnion.types.diff
@@ -14,21 +14,7 @@
  >isIt : false
  >false : false
  >value : number
-@@= skipped -26, +28 lines =@@
- >isIt ? { isIt, text: 'hey' } : { isIt, value: 123 } : { isIt: true; text: string; } | { isIt: false; value: number; }
- >isIt : boolean
- >{ isIt, text: 'hey' } : { isIt: true; text: string; }
-->isIt : true
-+>isIt : any
- >text : string
- >'hey' : "hey"
- >{ isIt, value: 123 } : { isIt: false; value: number; }
-->isIt : false
-+>isIt : any
- >value : number
- >123 : 123
- 
-@@= skipped -42, +42 lines =@@
+@@= skipped -68, +70 lines =@@
      };
  
  let Funk = (_props: ComponentProps) => <div>Hello</div>;
diff --git a/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types b/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types
index fc3869902c..08ed981141 100644
--- a/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types
+++ b/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types
@@ -50,7 +50,7 @@ function foo4(y = {z}, z = 1) {
 >foo4 : (y?: { z: number; }, z?: number) => void
 >y : { z: number; }
 >{z} : { z: number; }
->z : any
+>z : number
 >z : number
 >1 : 1
 }
diff --git a/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types.diff b/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types.diff
index 3a14e2d20a..c7d55524a2 100644
--- a/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/capturedParametersInInitializers1.types.diff
@@ -32,13 +32,3 @@
  >a : any
  >z : number
  >1 : 1
-@@= skipped -17, +16 lines =@@
- >foo4 : (y?: { z: number; }, z?: number) => void
- >y : { z: number; }
- >{z} : { z: number; }
-+>z : any
- >z : number
-->z : number
- >1 : 1
- }
- 
diff --git a/testdata/baselines/reference/submodule/compiler/capturedShorthandPropertyAssignmentNoCheck.types b/testdata/baselines/reference/submodule/compiler/capturedShorthandPropertyAssignmentNoCheck.types
index d61802ea67..27f9e11a7d 100644
--- a/testdata/baselines/reference/submodule/compiler/capturedShorthandPropertyAssignmentNoCheck.types
+++ b/testdata/baselines/reference/submodule/compiler/capturedShorthandPropertyAssignmentNoCheck.types
@@ -20,7 +20,7 @@ for (const value of [1, 2, 3]) {
 >() => ({ value }) : () => { value: number; }
 >({ value }) : { value: number; }
 >{ value } : { value: number; }
->value : any
+>value : number
 }
 const result = fns.map(fn => fn());
 >result : any[]
diff --git a/testdata/baselines/reference/submodule/compiler/capturedShorthandPropertyAssignmentNoCheck.types.diff b/testdata/baselines/reference/submodule/compiler/capturedShorthandPropertyAssignmentNoCheck.types.diff
deleted file mode 100644
index 1191107512..0000000000
--- a/testdata/baselines/reference/submodule/compiler/capturedShorthandPropertyAssignmentNoCheck.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.capturedShorthandPropertyAssignmentNoCheck.types
-+++ new.capturedShorthandPropertyAssignmentNoCheck.types
-@@= skipped -19, +19 lines =@@
- >() => ({ value }) : () => { value: number; }
- >({ value }) : { value: number; }
- >{ value } : { value: number; }
-->value : number
-+>value : any
- }
- const result = fns.map(fn => fn());
- >result : any[]
diff --git a/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types b/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types
index 32a94ce0ad..0e7c5de252 100644
--- a/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types
+++ b/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types
@@ -20,8 +20,8 @@ function M() {
 
             return { t, x };
 >{ t, x } : { t: T; x: X; }
->t : any
->x : any
+>t : T
+>x : X
         }
     }
 
diff --git a/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types.diff b/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types.diff
index df9b05be40..ad57f837bc 100644
--- a/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/classExpressionTest1.types.diff
@@ -12,14 +12,3 @@
  
              var t: T;
  >t : T
-@@= skipped -12, +14 lines =@@
- 
-             return { t, x };
- >{ t, x } : { t: T; x: X; }
-->t : T
-->x : X
-+>t : any
-+>x : any
-         }
-     }
- 
diff --git a/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types b/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types
index 8eadd78992..d03f7e5eb3 100644
--- a/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types
+++ b/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types
@@ -22,8 +22,8 @@ function M() {
 
             return { t, x };
 >{ t, x } : { t: T; x: X; }
->t : any
->x : any
+>t : T
+>x : X
         }
     }
 
diff --git a/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types.diff b/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types.diff
index 35bca7f269..e434e993df 100644
--- a/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/classExpressionTest2.types.diff
@@ -12,14 +12,3 @@
  
              var t: T;
  >t : T
-@@= skipped -12, +14 lines =@@
- 
-             return { t, x };
- >{ t, x } : { t: T; x: X; }
-->t : T
-->x : X
-+>t : any
-+>x : any
-         }
-     }
- 
diff --git a/testdata/baselines/reference/submodule/compiler/classPropInitializationInferenceWithElementAccess.types b/testdata/baselines/reference/submodule/compiler/classPropInitializationInferenceWithElementAccess.types
index 6f444350f0..47752a9793 100644
--- a/testdata/baselines/reference/submodule/compiler/classPropInitializationInferenceWithElementAccess.types
+++ b/testdata/baselines/reference/submodule/compiler/classPropInitializationInferenceWithElementAccess.types
@@ -34,7 +34,7 @@ export class Cls {
 >this : this
 >'y' : "y"
 >{ seed } : { seed: number; }
->seed : any
+>seed : number
 
         this['z'] = `${seed}`;
 >this['z'] = `${seed}` : string
diff --git a/testdata/baselines/reference/submodule/compiler/classPropInitializationInferenceWithElementAccess.types.diff b/testdata/baselines/reference/submodule/compiler/classPropInitializationInferenceWithElementAccess.types.diff
deleted file mode 100644
index 0b3031cf58..0000000000
--- a/testdata/baselines/reference/submodule/compiler/classPropInitializationInferenceWithElementAccess.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.classPropInitializationInferenceWithElementAccess.types
-+++ new.classPropInitializationInferenceWithElementAccess.types
-@@= skipped -33, +33 lines =@@
- >this : this
- >'y' : "y"
- >{ seed } : { seed: number; }
-->seed : number
-+>seed : any
- 
-         this['z'] = `${seed}`;
- >this['z'] = `${seed}` : string
diff --git a/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types b/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types
index 8969218099..5bfe5a0d5c 100644
--- a/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types
+++ b/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types
@@ -21,10 +21,10 @@ function f(
 >{        options,        onChange,    } : { options: SelectOptions<Thing>; onChange: (status: Thing | null) => void; }
 
         options,
->options : any
+>options : SelectOptions<Thing>
 
         onChange,
->onChange : any
+>onChange : (status: Thing | null) => void
 
     });
 }
diff --git a/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types.diff b/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types.diff
index 88cd005461..cdc7c07ffd 100644
--- a/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/coAndContraVariantInferences5.types.diff
@@ -1,18 +1,6 @@
 --- old.coAndContraVariantInferences5.types
 +++ new.coAndContraVariantInferences5.types
-@@= skipped -20, +20 lines =@@
- >{        options,        onChange,    } : { options: SelectOptions<Thing>; onChange: (status: Thing | null) => void; }
- 
-         options,
-->options : SelectOptions<Thing>
-+>options : any
- 
-         onChange,
-->onChange : (status: Thing | null) => void
-+>onChange : any
- 
-     });
- }
+@@= skipped -30, +30 lines =@@
  
  declare function select<KeyT extends string>(props: SelectProps<KeyT>): void;
  >select : <KeyT extends string>(props: SelectProps<KeyT>) => void
@@ -25,7 +13,7 @@
  
      options?: SelectOptions<KeyT>;
  >options : SelectOptions<KeyT> | undefined
-@@= skipped -26, +28 lines =@@
+@@= skipped -16, +18 lines =@@
  
  type SelectOptions<KeyT extends string> =
  >SelectOptions : SelectOptions<KeyT>
diff --git a/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types b/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types
index f073aa023a..d370c7edef 100644
--- a/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types
+++ b/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types
@@ -77,8 +77,8 @@ export function makeNewChannel<T extends ChannelType>(type: T): NewChannel<Chann
 
     return { type, localChannelId };
 >{ type, localChannelId } : { type: T; localChannelId: string; }
->type : any
->localChannelId : any
+>type : T
+>localChannelId : string
 }
 
 const newTextChannel = makeNewChannel('text');
diff --git a/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types.diff b/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types.diff
index b221f2d8be..869b5dbc43 100644
--- a/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types.diff
@@ -64,16 +64,7 @@
  >type : T
  
      const localChannelId = `blahblahblah`;
-@@= skipped -15, +17 lines =@@
- 
-     return { type, localChannelId };
- >{ type, localChannelId } : { type: T; localChannelId: string; }
-->type : T
-->localChannelId : string
-+>type : any
-+>localChannelId : any
- }
- 
+@@= skipped -22, +24 lines =@@
  const newTextChannel = makeNewChannel('text');
  >newTextChannel : NewChannel<TextChannel>
  >makeNewChannel('text') : NewChannel<TextChannel>
@@ -82,7 +73,7 @@
  >'text' : "text"
  
  // This should work
-@@= skipped -21, +21 lines =@@
+@@= skipped -14, +14 lines =@@
  const newTextChannel2 : NewChannel<TextChannel> = makeNewChannel('text');
  >newTextChannel2 : NewChannel<TextChannel>
  >makeNewChannel('text') : NewChannel<TextChannel>
diff --git a/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types b/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types
index 3d8119affe..91c6d21b56 100644
--- a/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types
+++ b/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types
@@ -26,7 +26,7 @@ app.foo.bar = (function () {
 
   return { someFun };
 >{ someFun } : { someFun: (arg: number) => void; }
->someFun : any
+>someFun : (arg: number) => void
 
 })();
 
diff --git a/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types.diff b/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types.diff
index c22183e306..2b85d0a1c5 100644
--- a/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/contextualReturnTypeOfIIFE2.types.diff
@@ -22,13 +22,7 @@
  >(function () {  const someFun = (arg: number) => {};  return { someFun };})() : { someFun: (arg: number) => void; }
  >(function () {  const someFun = (arg: number) => {};  return { someFun };}) : () => { someFun: (arg: number) => void; }
  >function () {  const someFun = (arg: number) => {};  return { someFun };} : () => { someFun: (arg: number) => void; }
-@@= skipped -21, +21 lines =@@
- 
-   return { someFun };
- >{ someFun } : { someFun: (arg: number) => void; }
-->someFun : (arg: number) => void
-+>someFun : any
- 
+@@= skipped -26, +26 lines =@@
  })();
  
  app.foo.bar.someFun(1);
diff --git a/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types b/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types
index 9fa68988a2..108a8a3d53 100644
--- a/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types
+++ b/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types
@@ -79,7 +79,7 @@ invoke({
 >{    kind,    method(a) {        return +a;    }} : { kind: "a"; method: (a: string) => number; }
 
     kind,
->kind : any
+>kind : "a"
 
     method(a) {
 >method : (a: string) => number
diff --git a/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types.diff b/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types.diff
index 0e665fb3fc..52ee62f9ed 100644
--- a/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/contextuallyTypedByDiscriminableUnion.types.diff
@@ -35,8 +35,4 @@
 +>{    kind,    method(a) {        return +a;    }} : { kind: "a"; method: (a: string) => number; }
  
      kind,
-->kind : "a"
-+>kind : any
- 
-     method(a) {
- >method : (a: string) => number
+ >kind : "a"
diff --git a/testdata/baselines/reference/submodule/compiler/correlatedUnions.types b/testdata/baselines/reference/submodule/compiler/correlatedUnions.types
index 1b28374223..5b04ea6e4c 100644
--- a/testdata/baselines/reference/submodule/compiler/correlatedUnions.types
+++ b/testdata/baselines/reference/submodule/compiler/correlatedUnions.types
@@ -402,9 +402,9 @@ function createEventListener<K extends keyof DocumentEventMap>({ name, once = fa
 
     return { name, once, callback };
 >{ name, once, callback } : { name: K; once: boolean; callback: (ev: DocumentEventMap[K]) => void; }
->name : any
->once : any
->callback : any
+>name : K
+>once : boolean
+>callback : (ev: DocumentEventMap[K]) => void
 }
 
 const clickEvent = createEventListener({
diff --git a/testdata/baselines/reference/submodule/compiler/correlatedUnions.types.diff b/testdata/baselines/reference/submodule/compiler/correlatedUnions.types.diff
index ac41af799b..6d6ca7f106 100644
--- a/testdata/baselines/reference/submodule/compiler/correlatedUnions.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/correlatedUnions.types.diff
@@ -187,16 +187,7 @@
  >name : K
  >once : boolean
  >false : false
-@@= skipped -8, +9 lines =@@
- 
-     return { name, once, callback };
- >{ name, once, callback } : { name: K; once: boolean; callback: (ev: DocumentEventMap[K]) => void; }
-->name : K
-->once : boolean
-->callback : (ev: DocumentEventMap[K]) => void
-+>name : any
-+>once : any
-+>callback : any
+@@= skipped -14, +15 lines =@@
  }
  
  const clickEvent = createEventListener({
@@ -209,7 +200,7 @@
  >{    name: "click",    callback: ev => console.log(ev),} : { name: "click"; callback: (ev: MouseEvent) => void; }
  
      name: "click",
-@@= skipped -28, +28 lines =@@
+@@= skipped -22, +22 lines =@@
  });
  
  const scrollEvent = createEventListener({
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
index beefbc6bd6..a9837ee191 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
@@ -32,5 +32,5 @@ import {e} from "../projC";
 export const d = {e};
 >d : { e: { f: (foo: Foo) => boolean; }; }
 >{e} : { e: { f: (foo: Foo) => boolean; }; }
->e : any
+>e : { f: (foo: Foo) => boolean; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
index 3ef2b2af24..abae0762ee 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
@@ -25,5 +25,5 @@
 ->e : { f: (foo: import("projA/index").Foo) => boolean; }
 +>d : { e: { f: (foo: Foo) => boolean; }; }
 +>{e} : { e: { f: (foo: Foo) => boolean; }; }
-+>e : any
++>e : { f: (foo: Foo) => boolean; }
  
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern.types b/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern.types
index 27fba13957..14a907c150 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern.types
@@ -100,9 +100,9 @@ function f15() {
 
     return { a4, b4, c4 };
 >{ a4, b4, c4 } : { a4: string; b4: number; c4: boolean; }
->a4 : any
->b4 : any
->c4 : any
+>a4 : string
+>b4 : number
+>c4 : boolean
 }
 var { a4, b4, c4 } = f15();
 >a4 : string
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern.types.diff
deleted file mode 100644
index 645adbc5d7..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern.types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.declarationEmitDestructuringObjectLiteralPattern.types
-+++ new.declarationEmitDestructuringObjectLiteralPattern.types
-@@= skipped -99, +99 lines =@@
- 
-     return { a4, b4, c4 };
- >{ a4, b4, c4 } : { a4: string; b4: number; c4: boolean; }
-->a4 : string
-->b4 : number
-->c4 : boolean
-+>a4 : any
-+>b4 : any
-+>c4 : any
- }
- var { a4, b4, c4 } = f15();
- >a4 : string
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern2.types
index 24c496c9aa..b527329628 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern2.types
@@ -39,9 +39,9 @@ function f15() {
 
     return { a4, b4, c4 };
 >{ a4, b4, c4 } : { a4: string; b4: number; c4: boolean; }
->a4 : any
->b4 : any
->c4 : any
+>a4 : string
+>b4 : number
+>c4 : boolean
 }
 var { a4, b4, c4 } = f15();
 >a4 : string
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern2.types.diff
deleted file mode 100644
index 31bc31003b..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDestructuringObjectLiteralPattern2.types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.declarationEmitDestructuringObjectLiteralPattern2.types
-+++ new.declarationEmitDestructuringObjectLiteralPattern2.types
-@@= skipped -38, +38 lines =@@
- 
-     return { a4, b4, c4 };
- >{ a4, b4, c4 } : { a4: string; b4: number; c4: boolean; }
-->a4 : string
-->b4 : number
-->c4 : boolean
-+>a4 : any
-+>b4 : any
-+>c4 : any
- }
- var { a4, b4, c4 } = f15();
- >a4 : string
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types b/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types
index c3a51271ec..2255b9eb75 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types
@@ -29,8 +29,8 @@ export const Point = (x: number, y: number): Point => ({ x, y });
 >y : number
 >({ x, y }) : { x: number; y: number; }
 >{ x, y } : { x: number; y: number; }
->x : any
->y : any
+>x : number
+>y : number
 
 export const Rect = <p extends Point>(a: p, b: p): Rect<p> => ({ a, b });
 >Rect : <p extends Point>(a: p, b: p) => Rect<p>
@@ -40,8 +40,8 @@ export const Rect = <p extends Point>(a: p, b: p): Rect<p> => ({ a, b });
 >b : p
 >({ a, b }) : { a: p; b: p; }
 >{ a, b } : { a: p; b: p; }
->a : any
->b : any
+>a : p
+>b : p
 
 Point.zero = (): Point => Point(0, 0);
 >Point.zero = (): Point => Point(0, 0) : () => Point
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types.diff
index 49900a061b..46f8ab35ae 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.types.diff
@@ -30,12 +30,7 @@
  >x : number
  >y : number
  >({ x, y }) : { x: number; y: number; }
- >{ x, y } : { x: number; y: number; }
-->x : number
-->y : number
-+>x : any
-+>y : any
- 
+@@= skipped -12, +12 lines =@@
  export const Rect = <p extends Point>(a: p, b: p): Rect<p> => ({ a, b });
  >Rect : <p extends Point>(a: p, b: p) => Rect<p>
  ><p extends Point>(a: p, b: p): Rect<p> => ({ a, b }) : <p extends Point>(a: p, b: p) => Rect<p>
@@ -43,12 +38,7 @@
  >a : p
  >b : p
  >({ a, b }) : { a: p; b: p; }
- >{ a, b } : { a: p; b: p; }
-->a : p
-->b : p
-+>a : any
-+>b : any
- 
+@@= skipped -10, +11 lines =@@
  Point.zero = (): Point => Point(0, 0);
  >Point.zero = (): Point => Point(0, 0) : () => Point
  >Point.zero : () => Point
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types
index 6cc5333fcb..a17ca0122a 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types
@@ -22,8 +22,8 @@ export default (suit: Suit, rank: Rank) => ({suit, rank});
 >rank : Rank
 >({suit, rank}) : { suit: Suit; rank: Rank; }
 >{suit, rank} : { suit: Suit; rank: Rank; }
->suit : any
->rank : any
+>suit : Suit
+>rank : Rank
 
 === index.ts ===
 export let lazyCard = () => import('./Card').then(a => a.default);
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff
index 2c8395bed4..65d7e6bcbe 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff
@@ -1,13 +1,6 @@
 --- old.declarationEmitExportAliasVisibiilityMarking.types
 +++ new.declarationEmitExportAliasVisibiilityMarking.types
-@@= skipped -21, +21 lines =@@
- >rank : Rank
- >({suit, rank}) : { suit: Suit; rank: Rank; }
- >{suit, rank} : { suit: Suit; rank: Rank; }
-->suit : Suit
-->rank : Rank
-+>suit : any
-+>rank : any
+@@= skipped -26, +26 lines =@@
  
  === index.ts ===
  export let lazyCard = () => import('./Card').then(a => a.default);
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types b/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types
index 0f323b73ec..0413137f34 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types
@@ -363,7 +363,7 @@ export function fromParameter(isNaN: number, bar: typeof globalThis.isNaN) {
     return function() { return { bar } };
 >function() { return { bar } } : () => { bar: (number: number) => boolean; }
 >{ bar } : { bar: (number: number) => boolean; }
->bar : any
+>bar : (number: number) => boolean
 }
 
 // Non-inference cases.
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types.diff
index 695d7d6003..9a62009aed 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitGlobalThisPreserved.types.diff
@@ -494,11 +494,7 @@
  
      return function() { return { bar } };
  >function() { return { bar } } : () => { bar: (number: number) => boolean; }
- >{ bar } : { bar: (number: number) => boolean; }
-->bar : (number: number) => boolean
-+>bar : any
- }
- 
+@@= skipped -16, +14 lines =@@
  // Non-inference cases.
  
  export const explicitlyTypedVariable: (isNaN: typeof globalThis.isNaN) => typeof globalThis.isNaN = (isNaN) => isNaN;
@@ -528,7 +524,7 @@
  
      return isNaN;
  >isNaN : (number: number) => boolean
-@@= skipped -48, +38 lines =@@
+@@= skipped -32, +24 lines =@@
  
      isNaN: typeof globalThis.isNaN;
  >isNaN : (number: number) => boolean
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types b/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types
index b7a21e3c5d..c43944e3c4 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types
@@ -11,7 +11,7 @@ const utilityFunctions = {
 >{  doSomethingWithKeys} : { doSomethingWithKeys: <T>(...keys: (keyof T)[]) => void; }
 
   doSomethingWithKeys
->doSomethingWithKeys : any
+>doSomethingWithKeys : <T>(...keys: (keyof T)[]) => void
 
 };
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types.diff
index f5d2e7b6df..5bc81ee9a6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitIndexTypeArray.types.diff
@@ -8,12 +8,3 @@
  >keys : (keyof T)[]
  
  const utilityFunctions = {
-@@= skipped -7, +8 lines =@@
- >{  doSomethingWithKeys} : { doSomethingWithKeys: <T>(...keys: (keyof T)[]) => void; }
- 
-   doSomethingWithKeys
-->doSomethingWithKeys : <T>(...keys: (keyof T)[]) => void
-+>doSomethingWithKeys : any
- 
- };
- 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types
index 6ed027fab2..a4694f501e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types
@@ -27,7 +27,7 @@ function fn<T extends { x: Map<T['x']> }>(sliceIndex: T): AllArg<T['x']> {
 
 export default { fn };
 >{ fn } : { fn: <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>; }
->fn : any
+>fn : <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>
 
 === reexport.ts ===
 import test from "./types";
@@ -35,5 +35,5 @@ import test from "./types";
 
 export default { test };
 >{ test } : { test: { fn: <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>; }; }
->test : any
+>test : { fn: <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types.diff
index 8200875606..e40d80bba5 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.types.diff
@@ -18,12 +18,7 @@
  >x : Map<T["x"]>
  >sliceIndex : T
  
-@@= skipped -15, +20 lines =@@
- 
- export default { fn };
- >{ fn } : { fn: <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>; }
-->fn : <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>
-+>fn : any
+@@= skipped -19, +24 lines =@@
  
  === reexport.ts ===
  import test from "./types";
@@ -34,5 +29,5 @@
 ->{ test } : { test: { fn: <T extends { x: T["x"] extends infer T_1 extends { [x: string]: (...params: unknown[]) => unknown; } ? { [K in keyof T_1]: T["x"][K]; } : never; }>(sliceIndex: T) => T["x"] extends infer T_2 extends { [x: string]: (...params: unknown[]) => unknown; } ? { [K_1 in keyof T_2]: Parameters<T["x"][K_1]>; } : never; }; }
 ->test : { fn: <T extends { x: T["x"] extends infer T_1 extends { [x: string]: (...params: unknown[]) => unknown; } ? { [K in keyof T_1]: T["x"][K]; } : never; }>(sliceIndex: T) => T["x"] extends infer T_2 extends { [x: string]: (...params: unknown[]) => unknown; } ? { [K_1 in keyof T_2]: Parameters<T["x"][K_1]>; } : never; }
 +>{ test } : { test: { fn: <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>; }; }
-+>test : any
++>test : { fn: <T extends { x: Map<T["x"]>; }>(sliceIndex: T) => AllArg<T["x"]>; }
  
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types
index e15dbd58a2..d93fcd0e25 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types
@@ -107,10 +107,10 @@ export default Object.assign(A, {
 >{    B,    C} : { B: StyledComponent<"div", DefaultTheme, {}, never>; C: StyledComponent<"div", DefaultTheme, {}, never>; }
 
     B,
->B : any
+>B : StyledComponent<"div", DefaultTheme, {}, never>
 
     C
->C : any
+>C : StyledComponent<"div", DefaultTheme, {}, never>
 
 });
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff
index bf3d55bffb..b373ca0dc8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff
@@ -118,11 +118,11 @@
  
      B,
 ->B : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
-+>B : any
++>B : StyledComponent<"div", DefaultTheme, {}, never>
  
      C
 ->C : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
-+>C : any
++>C : StyledComponent<"div", DefaultTheme, {}, never>
  
  });
  
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types
index 4b0922725b..657844851f 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types
@@ -19,7 +19,7 @@ export function useRef<T>(current: T): MutableRefObject<T> {
 
     return { current };
 >{ current } : { current: T; }
->current : any
+>current : T
 }
 export const useCsvParser = () => {
 >useCsvParser : () => MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff
index 5e71f993b2..a5f380b25e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff
@@ -16,9 +16,3 @@
  >current : T
  
      return { current };
- >{ current } : { current: T; }
-->current : T
-+>current : any
- }
- export const useCsvParser = () => {
- >useCsvParser : () => MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
diff --git a/testdata/baselines/reference/submodule/compiler/declarationFunctionTypeNonlocalShouldNotBeAnError.types b/testdata/baselines/reference/submodule/compiler/declarationFunctionTypeNonlocalShouldNotBeAnError.types
index 212e2ff824..25782bda4c 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationFunctionTypeNonlocalShouldNotBeAnError.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationFunctionTypeNonlocalShouldNotBeAnError.types
@@ -12,7 +12,7 @@ namespace foo {
 >{        bar    } : { bar: () => void; }
 
         bar
->bar : any
+>bar : () => void
     }
 }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationFunctionTypeNonlocalShouldNotBeAnError.types.diff b/testdata/baselines/reference/submodule/compiler/declarationFunctionTypeNonlocalShouldNotBeAnError.types.diff
deleted file mode 100644
index 33bf7edfa0..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationFunctionTypeNonlocalShouldNotBeAnError.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.declarationFunctionTypeNonlocalShouldNotBeAnError.types
-+++ new.declarationFunctionTypeNonlocalShouldNotBeAnError.types
-@@= skipped -11, +11 lines =@@
- >{        bar    } : { bar: () => void; }
- 
-         bar
-->bar : () => void
-+>bar : any
-     }
- }
- 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types b/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
index 3aaec6de0f..f55703a711 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
@@ -99,7 +99,7 @@ export const updateIfChanged = <T>(t: T) => {
 >updater(u) : U
 >updater : (u: U) => U
 >u : U
->set : any
+>set : (newU: U) => T
 
     };
     return reduce<T>(t, (t: T) => t);
diff --git a/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types.diff b/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types.diff
index 6b0a668b4d..396f976996 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types.diff
@@ -75,12 +75,7 @@
  >Array.isArray(u) ? [] : {} : undefined[] | {}
  >Array.isArray(u) : boolean
  >Array.isArray : (arg: any) => arg is any[]
-@@= skipped -29, +29 lines =@@
- >updater(u) : U
- >updater : (u: U) => U
- >u : U
-->set : (newU: U) => T
-+>set : any
+@@= skipped -33, +33 lines =@@
  
      };
      return reduce<T>(t, (t: T) => t);
@@ -91,7 +86,7 @@
  >t : T
  >(t: T) => t : (t: T) => T
  >t : T
-@@= skipped -16, +16 lines =@@
+@@= skipped -12, +12 lines =@@
  // example from https://github.com/microsoft/TypeScript/issues/31605
  
  export const testRecFun = <T extends Object>(parent: T) => {
diff --git a/testdata/baselines/reference/submodule/compiler/destructionAssignmentError.types b/testdata/baselines/reference/submodule/compiler/destructionAssignmentError.types
index c5ab53bb60..371b43afb7 100644
--- a/testdata/baselines/reference/submodule/compiler/destructionAssignmentError.types
+++ b/testdata/baselines/reference/submodule/compiler/destructionAssignmentError.types
@@ -16,8 +16,8 @@ let b: number;
 >({ a, b } = fn()) : { a: 1; b: 2; }
 >{ a, b } = fn() : { a: 1; b: 2; }
 >{ a, b } : { a: number; b: number; }
->a : any
->b : any
+>a : number
+>b : number
 >fn() : { a: 1; b: 2; }
 >fn : () => { a: 1; b: 2; }
 
@@ -32,8 +32,8 @@ let b: number;
 >({ a, b } =fn()) : { a: 1; b: 2; }
 >{ a, b } =fn() : { a: 1; b: 2; }
 >{ a, b } : { a: number; b: number; }
->a : any
->b : any
+>a : number
+>b : number
 
 fn());
 >fn() : { a: 1; b: 2; }
diff --git a/testdata/baselines/reference/submodule/compiler/destructionAssignmentError.types.diff b/testdata/baselines/reference/submodule/compiler/destructionAssignmentError.types.diff
deleted file mode 100644
index 2d8cfe3dd4..0000000000
--- a/testdata/baselines/reference/submodule/compiler/destructionAssignmentError.types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.destructionAssignmentError.types
-+++ new.destructionAssignmentError.types
-@@= skipped -15, +15 lines =@@
- >({ a, b } = fn()) : { a: 1; b: 2; }
- >{ a, b } = fn() : { a: 1; b: 2; }
- >{ a, b } : { a: number; b: number; }
-->a : number
-->b : number
-+>a : any
-+>b : any
- >fn() : { a: 1; b: 2; }
- >fn : () => { a: 1; b: 2; }
- 
-@@= skipped -16, +16 lines =@@
- >({ a, b } =fn()) : { a: 1; b: 2; }
- >{ a, b } =fn() : { a: 1; b: 2; }
- >{ a, b } : { a: number; b: number; }
-->a : number
-->b : number
-+>a : any
-+>b : any
- 
- fn());
- >fn() : { a: 1; b: 2; }
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types
index 19c4d6341d..8f6d90df29 100644
--- a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types
+++ b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types
@@ -14,7 +14,7 @@ let x = 0;
 >({x = 1} = a) : { x?: number | undefined; }
 >{x = 1} = a : { x?: number | undefined; }
 >{x = 1} : { x?: number; }
->x : any
+>x : number
 >1 : 1
 >a : { x?: number | undefined; }
 
@@ -37,8 +37,8 @@ function f1(options?: { color?: string, width?: number }) {
 >({ color, width } = options || {}) : { color?: string | undefined; width?: number | undefined; }
 >{ color, width } = options || {} : { color?: string | undefined; width?: number | undefined; }
 >{ color, width } : { color: string | undefined; width: number | undefined; }
->color : any
->width : any
+>color : string | undefined
+>width : number | undefined
 >options || {} : { color?: string | undefined; width?: number | undefined; }
 >options : { color?: string | undefined; width?: number | undefined; } | undefined
 >{} : {}
@@ -109,8 +109,8 @@ function f3(options?: { color: string, width: number }) {
 >({ color, width } = options || {}) : { color: string; width: number; } | {}
 >{ color, width } = options || {} : { color: string; width: number; } | {}
 >{ color, width } : { color: string | undefined; width: number | undefined; }
->color : any
->width : any
+>color : string | undefined
+>width : number | undefined
 >options || {} : { color: string; width: number; } | {}
 >options : { color: string; width: number; } | undefined
 >{} : {}
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types.diff b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types.diff
index c339db3e63..839047a5c6 100644
--- a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault.types.diff
@@ -18,8 +18,7 @@
 +>({x = 1} = a) : { x?: number | undefined; }
 +>{x = 1} = a : { x?: number | undefined; }
  >{x = 1} : { x?: number; }
-->x : number
-+>x : any
+ >x : number
  >1 : 1
 ->a : { x?: number; }
 +>a : { x?: number | undefined; }
@@ -49,12 +48,10 @@
 +>({ color, width } = options || {}) : { color?: string | undefined; width?: number | undefined; }
 +>{ color, width } = options || {} : { color?: string | undefined; width?: number | undefined; }
  >{ color, width } : { color: string | undefined; width: number | undefined; }
-->color : string | undefined
-->width : number | undefined
+ >color : string | undefined
+ >width : number | undefined
 ->options || {} : { color?: string; width?: number; }
 ->options : { color?: string; width?: number; } | undefined
-+>color : any
-+>width : any
 +>options || {} : { color?: string | undefined; width?: number | undefined; }
 +>options : { color?: string | undefined; width?: number | undefined; } | undefined
  >{} : {}
@@ -109,18 +106,7 @@
  >options : { color: string; width: number; } | undefined
  >color : string
  >width : number
-@@= skipped -24, +24 lines =@@
- >({ color, width } = options || {}) : { color: string; width: number; } | {}
- >{ color, width } = options || {} : { color: string; width: number; } | {}
- >{ color, width } : { color: string | undefined; width: number | undefined; }
-->color : string | undefined
-->width : number | undefined
-+>color : any
-+>width : any
- >options || {} : { color: string; width: number; } | {}
- >options : { color: string; width: number; } | undefined
- >{} : {}
-@@= skipped -26, +26 lines =@@
+@@= skipped -50, +50 lines =@@
  }
  
  function f4(options?: [string, number]) {
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types
index e2e2ea8180..88987641d4 100644
--- a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types
+++ b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types
@@ -15,7 +15,7 @@ let x: number;
 >({ x = 0 } = a) : { x?: number | undefined; y?: number | undefined; }
 >{ x = 0 } = a : { x?: number | undefined; y?: number | undefined; }
 >{ x = 0 } : { x?: number; }
->x : any
+>x : number
 >0 : 0
 >a : { x?: number | undefined; y?: number | undefined; }
 
@@ -44,7 +44,7 @@ let x: number;
 >({ x = undefined } = a) : { x?: number | undefined; y?: number | undefined; }
 >{ x = undefined } = a : { x?: number | undefined; y?: number | undefined; }
 >{ x = undefined } : { x?: number; }
->x : any
+>x : number
 >undefined : undefined
 >a : { x?: number | undefined; y?: number | undefined; }
 
@@ -99,7 +99,7 @@ let value;
 >({ done = false, value } = r.next()) : IteratorResult<number, any>
 >{ done = false, value } = r.next() : IteratorResult<number, any>
 >{ done = false, value } : { done?: boolean; value: any; }
->done : any
+>done : boolean
 >false : false
 >value : any
 >r.next() : IteratorResult<number, any>
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types.diff b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types.diff
index 66a8daa43e..0a38bf4ed5 100644
--- a/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/destructuringAssignmentWithDefault2.types.diff
@@ -18,8 +18,7 @@
 +>({ x = 0 } = a) : { x?: number | undefined; y?: number | undefined; }
 +>{ x = 0 } = a : { x?: number | undefined; y?: number | undefined; }
  >{ x = 0 } : { x?: number; }
-->x : number
-+>x : any
+ >x : number
  >0 : 0
 ->a : { x?: number; y?: number; }
 +>a : { x?: number | undefined; y?: number | undefined; }
@@ -57,8 +56,7 @@
 +>({ x = undefined } = a) : { x?: number | undefined; y?: number | undefined; }
 +>{ x = undefined } = a : { x?: number | undefined; y?: number | undefined; }
  >{ x = undefined } : { x?: number; }
-->x : number
-+>x : any
+ >x : number
  >undefined : undefined
 ->a : { x?: number; y?: number; }
 +>a : { x?: number | undefined; y?: number | undefined; }
@@ -111,12 +109,7 @@
  
  
  declare const r: Iterator<number>;
-@@= skipped -87, +87 lines =@@
- >({ done = false, value } = r.next()) : IteratorResult<number, any>
- >{ done = false, value } = r.next() : IteratorResult<number, any>
- >{ done = false, value } : { done?: boolean; value: any; }
-->done : boolean
-+>done : any
+@@= skipped -91, +91 lines =@@
  >false : false
  >value : any
  >r.next() : IteratorResult<number, any>
@@ -128,7 +121,7 @@
  
  ({ done: done = false, value } = r.next());
  >({ done: done = false, value } = r.next()) : IteratorResult<number, any>
-@@= skipped -18, +18 lines =@@
+@@= skipped -14, +14 lines =@@
  >false : false
  >value : any
  >r.next() : IteratorResult<number, any>
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringAssignment_private.types b/testdata/baselines/reference/submodule/compiler/destructuringAssignment_private.types
index fb67e736a3..57a1a16f9a 100644
--- a/testdata/baselines/reference/submodule/compiler/destructuringAssignment_private.types
+++ b/testdata/baselines/reference/submodule/compiler/destructuringAssignment_private.types
@@ -25,7 +25,7 @@ let x: number;
 >{ a: { x } } : { a: { x: number; }; }
 >a : { x: number; }
 >{ x } : { x: number; }
->x : any
+>x : number
 >[{ a: new C() }] : [{ a: C; }]
 >{ a: new C() } : { a: C; }
 >a : C
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringAssignment_private.types.diff b/testdata/baselines/reference/submodule/compiler/destructuringAssignment_private.types.diff
deleted file mode 100644
index 2ac835ec5a..0000000000
--- a/testdata/baselines/reference/submodule/compiler/destructuringAssignment_private.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.destructuringAssignment_private.types
-+++ new.destructuringAssignment_private.types
-@@= skipped -24, +24 lines =@@
- >{ a: { x } } : { a: { x: number; }; }
- >a : { x: number; }
- >{ x } : { x: number; }
-->x : number
-+>x : any
- >[{ a: new C() }] : [{ a: C; }]
- >{ a: new C() } : { a: C; }
- >a : C
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types b/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types
index 7a15ec396e..f2cd74a450 100644
--- a/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types
+++ b/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types
@@ -35,7 +35,7 @@ const Parent: SFC<Props> = ({
 >Child({name, ...props}) : any
 >Child : SFC<Props>
 >{name, ...props} : { name: "Apollo" | "Artemis" | "Dionysus" | "Persephone"; }
->name : any
+>name : "Apollo" | "Artemis" | "Dionysus" | "Persephone"
 >props : {}
 
 const Child: SFC<Props> = ({
diff --git a/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types.diff b/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types.diff
index 0b18a29faa..88ef618d80 100644
--- a/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/destructuringInitializerContextualTypeFromContext.types.diff
@@ -26,13 +26,7 @@
  
      children,
  >children : any
-@@= skipped -28, +33 lines =@@
- >Child({name, ...props}) : any
- >Child : SFC<Props>
- >{name, ...props} : { name: "Apollo" | "Artemis" | "Dionysus" | "Persephone"; }
-->name : "Apollo" | "Artemis" | "Dionysus" | "Persephone"
-+>name : any
- >props : {}
+@@= skipped -33, +38 lines =@@
  
  const Child: SFC<Props> = ({
  >Child : SFC<Props>
@@ -41,7 +35,7 @@
  
      children,
  >children : any
-@@= skipped -21, +21 lines =@@
+@@= skipped -16, +16 lines =@@
  >`name: ${name} props: ${JSON.stringify(props)}` : string
  >name : "Apollo" | "Artemis" | "Dionysus" | "Persephone"
  >JSON.stringify(props) : string
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types
index 0af4025307..fcdf8efc07 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types
@@ -240,7 +240,7 @@ const iterable = {
 >0 : 0
 
       value,
->value : any
+>value : number
 
     });
   },
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types.diff b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types.diff
index 8a58811497..c5f5f1b358 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=false).types.diff
@@ -109,16 +109,7 @@
  
    },
    next() {
-@@= skipped -44, +44 lines =@@
- >0 : 0
- 
-       value,
-->value : number
-+>value : any
- 
-     });
-   },
-@@= skipped -9, +9 lines =@@
+@@= skipped -53, +53 lines =@@
  const doubles = mapAsyncIterable(iterable, (x) => x + x);
  >doubles : AsyncGenerator<number, number, void>
  >mapAsyncIterable(iterable, (x) => x + x) : AsyncGenerator<number, number, void>
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types
index 0af4025307..fcdf8efc07 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types
@@ -240,7 +240,7 @@ const iterable = {
 >0 : 0
 
       value,
->value : any
+>value : number
 
     });
   },
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types.diff b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types.diff
index 241686dae7..25b57616c3 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty2(exactoptionalpropertytypes=true).types.diff
@@ -109,16 +109,7 @@
  
    },
    next() {
-@@= skipped -44, +44 lines =@@
- >0 : 0
- 
-       value,
-->value : number
-+>value : any
- 
-     });
-   },
-@@= skipped -9, +9 lines =@@
+@@= skipped -53, +53 lines =@@
  const doubles = mapAsyncIterable(iterable, (x) => x + x);
  >doubles : AsyncGenerator<number, number, void>
  >mapAsyncIterable(iterable, (x) => x + x) : AsyncGenerator<number, number, void>
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types
index 7250dac9b3..57bef5fb40 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types
@@ -12,7 +12,7 @@ export function main(a: string[] | undefined) {
 >a ? { a } : { b: ["there"] } : { a: string[]; } | { b: string[]; }
 >a : string[] | undefined
 >{ a } : { a: string[]; }
->a : any
+>a : string[]
 >{ b: ["there"] } : { b: string[]; }
 >b : string[]
 >["there"] : string[]
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types.diff b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types.diff
index 16d22cbb45..293cff4c39 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=false).types.diff
@@ -9,11 +9,6 @@
  >a ? { a } : { b: ["there"] } : { a: string[]; } | { b: string[]; }
  >a : string[] | undefined
  >{ a } : { a: string[]; }
-->a : string[]
-+>a : any
- >{ b: ["there"] } : { b: string[]; }
- >b : string[]
- >["there"] : string[]
 @@= skipped -13, +13 lines =@@
    z.a //
  >z.a //    ? z.a.toString()    : z.b.toString() : string
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types
index 348483d670..eccb0574ff 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types
@@ -12,7 +12,7 @@ export function main(a: string[] | undefined) {
 >a ? { a } : { b: ["there"] } : { a: string[]; } | { b: string[]; }
 >a : string[] | undefined
 >{ a } : { a: string[]; }
->a : any
+>a : string[]
 >{ b: ["there"] } : { b: string[]; }
 >b : string[]
 >["there"] : string[]
diff --git a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types.diff b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types.diff
index 6a4c7bef1b..52bc44fab7 100644
--- a/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/discriminateWithOptionalProperty4(exactoptionalpropertytypes=true).types.diff
@@ -9,11 +9,6 @@
  >a ? { a } : { b: ["there"] } : { a: string[]; } | { b: string[]; }
  >a : string[] | undefined
  >{ a } : { a: string[]; }
-->a : string[]
-+>a : any
- >{ b: ["there"] } : { b: string[]; }
- >b : string[]
- >["there"] : string[]
 @@= skipped -13, +13 lines =@@
    z.a //
  >z.a //    ? z.a.toString()    : z.b.toString() : string
diff --git a/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types b/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types
index 1e6e7f664a..4874c433ed 100644
--- a/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types
+++ b/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types
@@ -118,8 +118,8 @@ export class IterableWeakMap<K extends object, V> implements WeakMap<K, V> {
 >set : (key: K, value: { readonly ref: WeakRef<K>; value: V; }) => WeakMap<K, { readonly ref: WeakRef<K>; value: V; }>
 >key : K
 >{ ref, value } : { ref: WeakRef<K>; value: V; }
->ref : any
->value : any
+>ref : WeakRef<K>
+>value : V
 
             this.#refSet.add(ref);
 >this.#refSet.add(ref) : Set<WeakRef<K>>
@@ -144,7 +144,7 @@ export class IterableWeakMap<K extends object, V> implements WeakMap<K, V> {
 >this : this
 
                 ref,
->ref : any
+>ref : WeakRef<K>
 
             }, ref);
 >ref : WeakRef<K>
diff --git a/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types.diff b/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types.diff
index 29c35846fb..6c04448e0c 100644
--- a/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/esNextWeakRefs_IterableWeakMap.types.diff
@@ -50,18 +50,7 @@
  
                  this.set(key, value);
  >this.set(key, value) : this
-@@= skipped -66, +66 lines =@@
- >set : (key: K, value: { readonly ref: WeakRef<K>; value: V; }) => WeakMap<K, { readonly ref: WeakRef<K>; value: V; }>
- >key : K
- >{ ref, value } : { ref: WeakRef<K>; value: V; }
-->ref : WeakRef<K>
-->value : V
-+>ref : any
-+>value : any
- 
-             this.#refSet.add(ref);
- >this.#refSet.add(ref) : Set<WeakRef<K>>
-@@= skipped -13, +13 lines =@@
+@@= skipped -79, +79 lines =@@
  
              this.#finalizationGroup.register(key, {
  >this.#finalizationGroup.register(key, {                set: this.#refSet,                ref,            }, ref) : void
@@ -74,16 +63,7 @@
  >key : K
  >{                set: this.#refSet,                ref,            } : { set: Set<WeakRef<K>>; ref: WeakRef<K>; }
  
-@@= skipped -13, +13 lines =@@
- >this : this
- 
-                 ref,
-->ref : WeakRef<K>
-+>ref : any
- 
-             }, ref);
- >ref : WeakRef<K>
-@@= skipped -98, +98 lines =@@
+@@= skipped -111, +111 lines =@@
  >iterator : unique symbol
  
      *entries(): Generator<[key: K, value: V], void> {
diff --git a/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types b/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types
index d96b12830c..a1bb94446d 100644
--- a/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types
+++ b/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types
@@ -424,10 +424,10 @@ F1({
 >{        prop1,        prop2,    } : { prop1: string; prop2: string | undefined; }
 
         prop1,
->prop1 : any
+>prop1 : string
 
         prop2,
->prop2 : any
+>prop2 : string | undefined
 
     },
 });
@@ -442,10 +442,10 @@ F2({
 >{    prop1,    prop2,} : { prop1: string; prop2: string | undefined; }
 
     prop1,
->prop1 : any
+>prop1 : string
 
     prop2,
->prop2 : any
+>prop2 : string | undefined
 
 });
 
diff --git a/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types.diff b/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types.diff
index 1c3e96dcae..05d98537a5 100644
--- a/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/excessPropertyCheckWithUnions.types.diff
@@ -46,29 +46,3 @@
  
  }
  
-@@= skipped -46, +51 lines =@@
- >{        prop1,        prop2,    } : { prop1: string; prop2: string | undefined; }
- 
-         prop1,
-->prop1 : string
-+>prop1 : any
- 
-         prop2,
-->prop2 : string | undefined
-+>prop2 : any
- 
-     },
- });
-@@= skipped -18, +18 lines =@@
- >{    prop1,    prop2,} : { prop1: string; prop2: string | undefined; }
- 
-     prop1,
-->prop1 : string
-+>prop1 : any
- 
-     prop2,
-->prop2 : string | undefined
-+>prop2 : any
- 
- });
- 
diff --git a/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types b/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types
index 5e32089649..be10ac083d 100644
--- a/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types
+++ b/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types
@@ -33,7 +33,7 @@ const myReducer1: Reducer<MyState> = combineReducers({
 >combineReducers({ foo }) : Reducer<{ foo: number; }>
 >combineReducers : <S>(reducers: { [K in keyof S]: Reducer<S[K]> }) => Reducer<S>
 >{ foo } : { foo: Reducer<number>; }
->foo : any
+>foo : Reducer<number>
 
 });
 
@@ -48,7 +48,7 @@ const myReducer2 = combineReducers({
 >combineReducers({ foo }) : Reducer<{ foo: number; }>
 >combineReducers : <S>(reducers: { [K in keyof S]: Reducer<S[K]> }) => Reducer<S>
 >{ foo } : { foo: Reducer<number>; }
->foo : any
+>foo : Reducer<number>
 
 });
 
diff --git a/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types.diff b/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types.diff
index a3e37f6d12..fea4d1d165 100644
--- a/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/genericFunctionInference2.types.diff
@@ -31,11 +31,9 @@
 ->combineReducers : <S>(reducers: { [K in keyof S]: Reducer<S[K]>; }) => Reducer<S>
 +>combineReducers : <S>(reducers: { [K in keyof S]: Reducer<S[K]> }) => Reducer<S>
  >{ foo } : { foo: Reducer<number>; }
-->foo : Reducer<number>
-+>foo : any
- 
- });
+ >foo : Reducer<number>
  
+@@= skipped -15, +15 lines =@@
  const myReducer2 = combineReducers({
  >myReducer2 : Reducer<{ combined: { foo: number; }; }>
  >combineReducers({    combined: combineReducers({ foo }),}) : Reducer<{ combined: { foo: number; }; }>
@@ -49,12 +47,9 @@
 ->combineReducers : <S>(reducers: { [K in keyof S]: Reducer<S[K]>; }) => Reducer<S>
 +>combineReducers : <S>(reducers: { [K in keyof S]: Reducer<S[K]> }) => Reducer<S>
  >{ foo } : { foo: Reducer<number>; }
-->foo : Reducer<number>
-+>foo : any
- 
- });
+ >foo : Reducer<number>
  
-@@= skipped -31, +31 lines =@@
+@@= skipped -16, +16 lines =@@
  
  declare function withH<T, U>(handlerCreators: HandleCreatorsFactory<T, U>): U;
  >withH : <T, U>(handlerCreators: HandleCreatorsFactory<T, U>) => U
diff --git a/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types b/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types
index eb32275348..f210a23de0 100644
--- a/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types
+++ b/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types
@@ -63,7 +63,7 @@ const tmp = <PATH extends PostPath>(
 >post : <PATH extends "/login" | "/user">(path: PATH, __1: Omit<RequestInit, "body"> & { body: PostBody<PATH>; }) => void
 >path : PATH
 >{ body } : { body: PostBody<PATH>; }
->body : any
+>body : PostBody<PATH>
 }
 
 function fx1<P extends PostPath>(x: { body: PostBody<P> }, y: { body: PostBody<P> }) {
diff --git a/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types.diff b/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types.diff
index 43020a38c3..bf6ed84aa6 100644
--- a/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/identityAndDivergentNormalizedTypes.types.diff
@@ -43,8 +43,7 @@
 +>post : <PATH extends "/login" | "/user">(path: PATH, __1: Omit<RequestInit, "body"> & { body: PostBody<PATH>; }) => void
  >path : PATH
  >{ body } : { body: PostBody<PATH>; }
-->body : PostBody<PATH>
-+>body : any
+ >body : PostBody<PATH>
  }
  
  function fx1<P extends PostPath>(x: { body: PostBody<P> }, y: { body: PostBody<P> }) {
diff --git a/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types b/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types
index a890f7dafa..10fa52ae9b 100644
--- a/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types
+++ b/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types
@@ -30,8 +30,8 @@ const flowtypes = <A>(b: B) => {
 
   return {combined, literal}
 >{combined, literal} : { combined: (fn: (combined: Combined) => void) => any; literal: (fn: (aPlusB: A & B) => void) => any; }
->combined : any
->literal : any
+>combined : (fn: (combined: Combined) => void) => any
+>literal : (fn: (aPlusB: A & B) => void) => any
 }
 
 const {combined, literal} = flowtypes<{a: string}>({b: 'b-value'})
diff --git a/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types.diff b/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types.diff
index 3a247a5b3a..1028a7c588 100644
--- a/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/indirectTypeParameterReferences.types.diff
@@ -33,10 +33,9 @@
    return {combined, literal}
 ->{combined, literal} : { combined: (fn: (combined: A & B) => void) => any; literal: (fn: (aPlusB: A & B) => void) => any; }
 ->combined : (fn: (combined: A & B) => void) => any
-->literal : (fn: (aPlusB: A & B) => void) => any
 +>{combined, literal} : { combined: (fn: (combined: Combined) => void) => any; literal: (fn: (aPlusB: A & B) => void) => any; }
-+>combined : any
-+>literal : any
++>combined : (fn: (combined: Combined) => void) => any
+ >literal : (fn: (aPlusB: A & B) => void) => any
  }
  
  const {combined, literal} = flowtypes<{a: string}>({b: 'b-value'})
diff --git a/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types b/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types
index f952f7a4b2..78e257a2ed 100644
--- a/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types
+++ b/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types
@@ -30,7 +30,7 @@ function wrap<T>(value: T): Wrap<T> {
 
     return { value };
 >{ value } : { value: T; }
->value : any
+>value : T
 }
 
 function wrappedFoo(): Wrap<'foo'> {
@@ -48,7 +48,7 @@ function wrapBar(value: 'bar'): Wrap<'bar'> {
 
     return { value };
 >{ value } : { value: "bar"; }
->value : any
+>value : "bar"
 }
 
 function wrappedBar(): Wrap<'bar'> {
@@ -404,7 +404,7 @@ const a3: I[] = ['a', 'b'].map(name => {
 >'mapped' : "mapped"
 
         name,
->name : any
+>name : string
     }
 });
 
diff --git a/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types.diff b/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types.diff
index 5e390c9449..fe7bd3f430 100644
--- a/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/inferFromGenericFunctionReturnTypes3.types.diff
@@ -26,22 +26,7 @@
  >value : T
  
      return { value };
- >{ value } : { value: T; }
-->value : T
-+>value : any
- }
- 
- function wrappedFoo(): Wrap<'foo'> {
-@@= skipped -28, +32 lines =@@
- 
-     return { value };
- >{ value } : { value: "bar"; }
-->value : "bar"
-+>value : any
- }
- 
- function wrappedBar(): Wrap<'bar'> {
-@@= skipped -54, +54 lines =@@
+@@= skipped -82, +86 lines =@@
  // Repro from #11152
  
  interface FolderContentItem {
@@ -120,16 +105,7 @@
      code: 'mapped',
  >code : "mapped"
  
-@@= skipped -26, +28 lines =@@
- >'mapped' : "mapped"
- 
-         name,
-->name : string
-+>name : any
-     }
- });
- 
-@@= skipped -16, +16 lines =@@
+@@= skipped -42, +44 lines =@@
  >age : number
  
      position: "STRIKER" | "GOALKEEPER",
diff --git a/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types b/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types
index b9361df9ee..246ad3fd80 100644
--- a/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types
+++ b/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types
@@ -77,7 +77,7 @@ const obj = {
 >param2 ? {param2} : {} : { param2: string; } | {}
 >param2 : "value2" | null
 >{param2} : { param2: string; }
->param2 : any
+>param2 : string
 >{} : {}
 
 };
diff --git a/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types.diff b/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types.diff
index da7d8fd569..97772d73d2 100644
--- a/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/inferenceOptionalPropertiesToIndexSignatures.types.diff
@@ -37,16 +37,7 @@
  
      param1: 'value1',
  >param1 : string
-@@= skipped -12, +12 lines =@@
- >param2 ? {param2} : {} : { param2: string; } | {}
- >param2 : "value2" | null
- >{param2} : { param2: string; }
-->param2 : string
-+>param2 : any
- >{} : {}
- 
- };
-@@= skipped -8, +8 lines =@@
+@@= skipped -20, +20 lines =@@
  const query = Object.entries(obj).map(
  >query : string
  >Object.entries(obj).map(    ([k, v]) => `${k}=${encodeURIComponent(v)}`).join('&') : string
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types
index c7f0aaf0eb..84fbe6bbf7 100644
--- a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types
+++ b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types
@@ -235,7 +235,7 @@ export const oWithSpread = {
 >1 : 1
 
     part,
->part : any
+>part : { a: number; }
 }
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types.diff b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types.diff
index 80e919029f..54fd5196c0 100644
--- a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsObjects.types.diff
@@ -58,12 +58,3 @@
  
      b: 1,
  >b : number
-@@= skipped -15, +15 lines =@@
- >1 : 1
- 
-     part,
-->part : { a: number; }
-+>part : any
- }
- 
- 
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types
index 605496e657..6ee967a785 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types
+++ b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types
@@ -16,7 +16,7 @@ module.exports = {
 >{    customSymbol,} : { customSymbol: symbol; }
 
     customSymbol,
->customSymbol : any
+>customSymbol : symbol
 
 };
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types.diff b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types.diff
index 2714eb1950..e8ecc31370 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types.diff
@@ -15,9 +15,7 @@
  >{    customSymbol,} : { customSymbol: symbol; }
  
      customSymbol,
-->customSymbol : symbol
-+>customSymbol : any
- 
+@@= skipped -12, +12 lines =@@
  };
  
  exports.customSymbol2 = Symbol("custom");
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types
index 236066da5d..0de937166e 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types
@@ -17,7 +17,7 @@ module.exports = {
 >{  Abcde} : { Abcde: typeof Abcde; }
 
   Abcde
->Abcde : any
+>Abcde : typeof Abcde
 
 };
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types.diff b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types.diff
index 861ffffa08..bdfaf1abe5 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.types.diff
@@ -20,10 +20,7 @@
  >{  Abcde} : { Abcde: typeof Abcde; }
  
    Abcde
-->Abcde : typeof Abcde
-+>Abcde : any
- 
- };
+@@= skipped -17, +17 lines =@@
  
  === /index.ts ===
  import { Abcde } from "./test";
diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types
index 9c8605a2ee..163af24a00 100644
--- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types
+++ b/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types
@@ -16,10 +16,10 @@ function foo() {
 >{        a,        b    } : { a: number; b: string; }
 
         a,
->a : any
+>a : number
 
         b
->b : any
+>b : string
 
     };
 }
diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types.diff b/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types.diff
deleted file mode 100644
index c85f4ac3b5..0000000000
--- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.jsFileCompilationShortHandProperty.types
-+++ new.jsFileCompilationShortHandProperty.types
-@@= skipped -15, +15 lines =@@
- >{        a,        b    } : { a: number; b: string; }
- 
-         a,
-->a : number
-+>a : any
- 
-         b
-->b : string
-+>b : any
- 
-     };
- }
diff --git a/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types b/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types
index ad1482e5d6..d0ec45d5ff 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types
+++ b/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types
@@ -28,7 +28,7 @@ function FunctionComponent<T extends string>({type}: {type?: T}) {
 >{    type  } : { type: T | undefined; }
 
     type
->type : any
+>type : T | undefined
   }
 }
 FunctionComponent.useThis = function() {
diff --git a/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types.diff b/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types.diff
index 5c126c8ebc..8da35a98f8 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsxComponentTypeErrors.types.diff
@@ -27,12 +27,7 @@
  >type : T | undefined
  >type : T | undefined
  
-@@= skipped -19, +26 lines =@@
- >{    type  } : { type: T | undefined; }
- 
-     type
-->type : T | undefined
-+>type : any
+@@= skipped -23, +30 lines =@@
    }
  }
  FunctionComponent.useThis = function() {
@@ -57,7 +52,7 @@
  }
  
  class ClassComponent {
-@@= skipped -25, +25 lines =@@
+@@= skipped -21, +21 lines =@@
  }
  
  const MixedComponent = Math.random() ? FunctionComponent : ClassComponent;
diff --git a/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types b/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types
index 725395ba6e..ae3a7d2967 100644
--- a/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types
+++ b/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types
@@ -11,7 +11,7 @@ function f1() {
     let obj = { b };
 >obj : { b: boolean; }
 >{ b } : { b: boolean; }
->b : any
+>b : boolean
 
     // Desired: OK
     // 3.0: OK
diff --git a/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types.diff b/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types.diff
index b042674ba3..8a2a295775 100644
--- a/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/literalFreshnessPropagationOnNarrowing.types.diff
@@ -1,15 +1,6 @@
 --- old.literalFreshnessPropagationOnNarrowing.types
 +++ new.literalFreshnessPropagationOnNarrowing.types
-@@= skipped -10, +10 lines =@@
-     let obj = { b };
- >obj : { b: boolean; }
- >{ b } : { b: boolean; }
-->b : boolean
-+>b : any
- 
-     // Desired: OK
-     // 3.0: OK
-@@= skipped -18, +18 lines =@@
+@@= skipped -28, +28 lines =@@
  >f2 : () => void
  
      type Element = (string | false);
diff --git a/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types b/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types
index 366b9fa73b..389b354e49 100644
--- a/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types
+++ b/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types
@@ -53,7 +53,7 @@ export class ObservableValue<T> {
 >this : this
 
             newValue,
->newValue : any
+>newValue : T
 
             oldValue
 >oldValue : any
diff --git a/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types.diff b/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types.diff
index 545b011a7f..6d4645b406 100644
--- a/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/noCrashOnThisTypeUsage.types.diff
@@ -39,16 +39,7 @@
  >this : this
  >{            type: "update",            object: this,            newValue,            oldValue        } : { type: string; object: this; newValue: T; oldValue: any; }
  
-@@= skipped -13, +13 lines =@@
- >this : this
- 
-             newValue,
-->newValue : T
-+>newValue : any
- 
-             oldValue
- >oldValue : any
-@@= skipped -12, +12 lines =@@
+@@= skipped -25, +25 lines =@@
  >[] : never[]
  
      observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean) {}
diff --git a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_destructuringAssignment.types b/testdata/baselines/reference/submodule/compiler/noUnusedLocals_destructuringAssignment.types
index e9528f4e45..cc4dfcaef0 100644
--- a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_destructuringAssignment.types
+++ b/testdata/baselines/reference/submodule/compiler/noUnusedLocals_destructuringAssignment.types
@@ -18,7 +18,7 @@ class C {
 >({ x } = this) : this
 >{ x } = this : this
 >{ x } : { x: number; }
->x : any
+>x : number
 >this : this
 
         return x;
@@ -35,7 +35,7 @@ class C {
 >({ f } = this) : this
 >{ f } = this : this
 >{ f } : { f: Function; }
->f : any
+>f : Function
 >this : this
 
         return f;
diff --git a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_destructuringAssignment.types.diff b/testdata/baselines/reference/submodule/compiler/noUnusedLocals_destructuringAssignment.types.diff
deleted file mode 100644
index ce785d7ed7..0000000000
--- a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_destructuringAssignment.types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.noUnusedLocals_destructuringAssignment.types
-+++ new.noUnusedLocals_destructuringAssignment.types
-@@= skipped -17, +17 lines =@@
- >({ x } = this) : this
- >{ x } = this : this
- >{ x } : { x: number; }
-->x : number
-+>x : any
- >this : this
- 
-         return x;
-@@= skipped -17, +17 lines =@@
- >({ f } = this) : this
- >{ f } = this : this
- >{ f } : { f: Function; }
-->f : Function
-+>f : any
- >this : this
- 
-         return f;
diff --git a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types b/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types
index 2497f9574c..7f8da93cce 100644
--- a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types
+++ b/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types
@@ -26,7 +26,7 @@ function f(x = 0, b = false) {
 >({ x } = { x: 1 }) : { x: number; }
 >{ x } = { x: 1 } : { x: number; }
 >{ x } : { x: number; }
->x : any
+>x : number
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : 1
@@ -61,7 +61,7 @@ function f(x = 0, b = false) {
 >({ x = 2 } = { x: b ? 1 : undefined }) : { x?: number | undefined; }
 >{ x = 2 } = { x: b ? 1 : undefined } : { x?: number | undefined; }
 >{ x = 2 } : { x?: number; }
->x : any
+>x : number
 >2 : 2
 >{ x: b ? 1 : undefined } : { x?: number | undefined; }
 >x : number | undefined
@@ -78,7 +78,7 @@ function f(x = 0, b = false) {
 >({ x = used } = { x: b ? 1 : undefined }) : { x?: number | undefined; }
 >{ x = used } = { x: b ? 1 : undefined } : { x?: number | undefined; }
 >{ x = used } : { x?: number; }
->x : any
+>x : number
 >used : number
 >{ x: b ? 1 : undefined } : { x?: number | undefined; }
 >x : number | undefined
diff --git a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types.diff b/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types.diff
index ece1d577d4..3d438e2d10 100644
--- a/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/noUnusedLocals_writeOnly.types.diff
@@ -1,33 +1,6 @@
 --- old.noUnusedLocals_writeOnly.types
 +++ new.noUnusedLocals_writeOnly.types
-@@= skipped -25, +25 lines =@@
- >({ x } = { x: 1 }) : { x: number; }
- >{ x } = { x: 1 } : { x: number; }
- >{ x } : { x: number; }
-->x : number
-+>x : any
- >{ x: 1 } : { x: number; }
- >x : number
- >1 : 1
-@@= skipped -35, +35 lines =@@
- >({ x = 2 } = { x: b ? 1 : undefined }) : { x?: number | undefined; }
- >{ x = 2 } = { x: b ? 1 : undefined } : { x?: number | undefined; }
- >{ x = 2 } : { x?: number; }
-->x : number
-+>x : any
- >2 : 2
- >{ x: b ? 1 : undefined } : { x?: number | undefined; }
- >x : number | undefined
-@@= skipped -17, +17 lines =@@
- >({ x = used } = { x: b ? 1 : undefined }) : { x?: number | undefined; }
- >{ x = used } = { x: b ? 1 : undefined } : { x?: number | undefined; }
- >{ x = used } : { x?: number; }
-->x : number
-+>x : any
- >used : number
- >{ x: b ? 1 : undefined } : { x?: number | undefined; }
- >x : number | undefined
-@@= skipped -32, +32 lines =@@
+@@= skipped -109, +109 lines =@@
  >1 : 1
  }
  function f2(_: ReadonlyArray<number>): void {}
diff --git a/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types b/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types
index ae17af4f7a..1a36206513 100644
--- a/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types
+++ b/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types
@@ -268,7 +268,7 @@ const simpleAction = (payload: boolean) => ({
 >"SIMPLE_ACTION" : "SIMPLE_ACTION"
 
   payload
->payload : any
+>payload : boolean
 
 });
 const thunkAction = (param1: number, param2: string) => async (
@@ -313,8 +313,8 @@ class TestComponent extends Component<TestComponentProps> {}
 const mapDispatchToProps = { simpleAction, thunkAction };
 >mapDispatchToProps : { simpleAction: (payload: boolean) => { type: string; payload: boolean; }; thunkAction: (param1: number, param2: string) => (dispatch: Dispatch<AnyAction>, __1: OwnProps) => Promise<string>; }
 >{ simpleAction, thunkAction } : { simpleAction: (payload: boolean) => { type: string; payload: boolean; }; thunkAction: (param1: number, param2: string) => (dispatch: Dispatch<AnyAction>, __1: OwnProps) => Promise<string>; }
->simpleAction : any
->thunkAction : any
+>simpleAction : (payload: boolean) => { type: string; payload: boolean; }
+>thunkAction : (param1: number, param2: string) => (dispatch: Dispatch<AnyAction>, __1: OwnProps) => Promise<string>
 
 type Q = HandleThunkActionCreator<typeof simpleAction>;
 >Q : (payload: boolean) => { type: string; payload: boolean; }
diff --git a/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types.diff b/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types.diff
index c707e3c5fc..d2930284bc 100644
--- a/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.types.diff
@@ -206,12 +206,7 @@
    [extraProps: string]: any;
  >extraProps : string
  }
-@@= skipped -32, +44 lines =@@
- >"SIMPLE_ACTION" : "SIMPLE_ACTION"
- 
-   payload
-->payload : boolean
-+>payload : any
+@@= skipped -36, +48 lines =@@
  
  });
  const thunkAction = (param1: number, param2: string) => async (
@@ -226,7 +221,7 @@
  
    dispatch: Dispatch,
  >dispatch : Dispatch<AnyAction>
-@@= skipped -22, +22 lines =@@
+@@= skipped -18, +18 lines =@@
  
  };
  interface OwnProps {
@@ -250,12 +245,11 @@
  const mapDispatchToProps = { simpleAction, thunkAction };
 ->mapDispatchToProps : { simpleAction: (payload: boolean) => { type: string; payload: boolean; }; thunkAction: (param1: number, param2: string) => (dispatch: Dispatch, { foo }: OwnProps) => Promise<string>; }
 ->{ simpleAction, thunkAction } : { simpleAction: (payload: boolean) => { type: string; payload: boolean; }; thunkAction: (param1: number, param2: string) => (dispatch: Dispatch, { foo }: OwnProps) => Promise<string>; }
-->simpleAction : (payload: boolean) => { type: string; payload: boolean; }
-->thunkAction : (param1: number, param2: string) => (dispatch: Dispatch, { foo }: OwnProps) => Promise<string>
 +>mapDispatchToProps : { simpleAction: (payload: boolean) => { type: string; payload: boolean; }; thunkAction: (param1: number, param2: string) => (dispatch: Dispatch<AnyAction>, __1: OwnProps) => Promise<string>; }
 +>{ simpleAction, thunkAction } : { simpleAction: (payload: boolean) => { type: string; payload: boolean; }; thunkAction: (param1: number, param2: string) => (dispatch: Dispatch<AnyAction>, __1: OwnProps) => Promise<string>; }
-+>simpleAction : any
-+>thunkAction : any
+ >simpleAction : (payload: boolean) => { type: string; payload: boolean; }
+->thunkAction : (param1: number, param2: string) => (dispatch: Dispatch, { foo }: OwnProps) => Promise<string>
++>thunkAction : (param1: number, param2: string) => (dispatch: Dispatch<AnyAction>, __1: OwnProps) => Promise<string>
  
  type Q = HandleThunkActionCreator<typeof simpleAction>;
  >Q : (payload: boolean) => { type: string; payload: boolean; }
diff --git a/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types b/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types
index 6f6b04ef10..8371a63a21 100644
--- a/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types
+++ b/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types
@@ -68,7 +68,7 @@ declare function configureStore<S = any, A extends Action = UnknownAction>(
 >configureStore({ reducer }) : void
 >configureStore : <S, A extends Action<string>>(options: ConfigureStoreOptions<S, A>) => void
 >{ reducer } : { reducer: Reducer<number, UnknownAction>; }
->reducer : any
+>reducer : Reducer<number, UnknownAction>
 }
 
 const counterReducer1: Reducer<number> = () => 0;
diff --git a/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types.diff b/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types.diff
index 4011dfacc6..2959c6e49a 100644
--- a/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reverseMappedTypeInferenceSameSource1.types.diff
@@ -59,11 +59,8 @@
 ->configureStore : <S = any, A extends Action = UnknownAction>(options: ConfigureStoreOptions<S, A>) => void
 +>configureStore : <S, A extends Action<string>>(options: ConfigureStoreOptions<S, A>) => void
  >{ reducer } : { reducer: Reducer<number, UnknownAction>; }
-->reducer : Reducer<number, UnknownAction>
-+>reducer : any
+ >reducer : Reducer<number, UnknownAction>
  }
- 
- const counterReducer1: Reducer<number> = () => 0;
 @@= skipped -13, +13 lines =@@
  const store2 = configureStore({
  >store2 : void
diff --git a/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types b/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types
index 75e9e17c40..e8f609dff1 100644
--- a/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types
+++ b/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types
@@ -77,7 +77,7 @@ const identifierExtractor = createExtractor({
 >{      node,      kind: "identifier" as const,      value: node.name,    } : { node: Identifier; kind: "identifier"; value: string; }
 
       node,
->node : any
+>node : Identifier
 
       kind: "identifier" as const,
 >kind : "identifier"
@@ -127,7 +127,7 @@ const stringExtractor = createExtractor({
 >{      node,      kind: "string" as const,      value: node.value,    } : { node: StringLiteral; kind: "string"; value: string; }
 
       node,
->node : any
+>node : StringLiteral
 
       kind: "string" as const,
 >kind : "string"
diff --git a/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types.diff b/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types.diff
index 8939ff61ec..5447b4ba1d 100644
--- a/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reverseMappedUnionInference.types.diff
@@ -39,16 +39,7 @@
    kind: "identifier";
  >kind : "identifier"
  
-@@= skipped -30, +32 lines =@@
- >{      node,      kind: "identifier" as const,      value: node.name,    } : { node: Identifier; kind: "identifier"; value: string; }
- 
-       node,
-->node : Identifier
-+>node : any
- 
-       kind: "identifier" as const,
- >kind : "identifier"
-@@= skipped -18, +18 lines =@@
+@@= skipped -48, +50 lines =@@
  });
  
  interface StringLiteral {
@@ -57,16 +48,7 @@
    kind: "stringLiteral";
  >kind : "stringLiteral"
  
-@@= skipped -30, +32 lines =@@
- >{      node,      kind: "string" as const,      value: node.value,    } : { node: StringLiteral; kind: "string"; value: string; }
- 
-       node,
-->node : StringLiteral
-+>node : any
- 
-       kind: "string" as const,
- >kind : "string"
-@@= skipped -18, +18 lines =@@
+@@= skipped -48, +50 lines =@@
  });
  
  declare function unionType<Result extends readonly unknown[]>(parsers: {
diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.types b/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.types
index 4b498eb202..744bb437e7 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.types
@@ -12,5 +12,5 @@ const bar = { foo, baz };
 >bar : { foo: any; baz: number; }
 >{ foo, baz } : { foo: any; baz: number; }
 >foo : any
->baz : any
+>baz : number
 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.types.diff b/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.types.diff
deleted file mode 100644
index faa1bface1..0000000000
--- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.types.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.shorthand-property-es5-es6.types
-+++ new.shorthand-property-es5-es6.types
-@@= skipped -11, +11 lines =@@
- >bar : { foo: any; baz: number; }
- >{ foo, baz } : { foo: any; baz: number; }
- >foo : any
-->baz : number
-+>baz : any
- 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-amd.types b/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-amd.types
index 35a9b9c8e8..688d01a04d 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-amd.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-amd.types
@@ -12,5 +12,5 @@ const bar = { foo, baz };
 >bar : { foo: any; baz: number; }
 >{ foo, baz } : { foo: any; baz: number; }
 >foo : any
->baz : any
+>baz : number
 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-amd.types.diff b/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-amd.types.diff
deleted file mode 100644
index 33033bf57d..0000000000
--- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-amd.types.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.shorthand-property-es6-amd.types
-+++ new.shorthand-property-es6-amd.types
-@@= skipped -11, +11 lines =@@
- >bar : { foo: any; baz: number; }
- >{ foo, baz } : { foo: any; baz: number; }
- >foo : any
-->baz : number
-+>baz : any
- 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.types b/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.types
index 250f9977cf..142cff66a0 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.types
@@ -12,5 +12,5 @@ const bar = { foo, baz };
 >bar : { foo: any; baz: number; }
 >{ foo, baz } : { foo: any; baz: number; }
 >foo : any
->baz : any
+>baz : number
 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.types.diff b/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.types.diff
deleted file mode 100644
index d6c41657d1..0000000000
--- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.types.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.shorthand-property-es6-es6.types
-+++ new.shorthand-property-es6-es6.types
-@@= skipped -11, +11 lines =@@
- >bar : { foo: any; baz: number; }
- >{ foo, baz } : { foo: any; baz: number; }
- >foo : any
-->baz : number
-+>baz : any
- 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity01_targetES2015_CommonJS.types b/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity01_targetES2015_CommonJS.types
index a0716dd389..d2a4bd2cc3 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity01_targetES2015_CommonJS.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity01_targetES2015_CommonJS.types
@@ -11,6 +11,6 @@ export function foo () {
   const x = { test };
 >x : { test: string; }
 >{ test } : { test: string; }
->test : any
+>test : string
 }
 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity01_targetES2015_CommonJS.types.diff b/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity01_targetES2015_CommonJS.types.diff
deleted file mode 100644
index 273f28c983..0000000000
--- a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity01_targetES2015_CommonJS.types.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.shorthandOfExportedEntity01_targetES2015_CommonJS.types
-+++ new.shorthandOfExportedEntity01_targetES2015_CommonJS.types
-@@= skipped -10, +10 lines =@@
-   const x = { test };
- >x : { test: string; }
- >{ test } : { test: string; }
-->test : string
-+>test : any
- }
- 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity02_targetES5_CommonJS.types b/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity02_targetES5_CommonJS.types
index 549f964d75..4a303a3a7f 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity02_targetES5_CommonJS.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity02_targetES5_CommonJS.types
@@ -11,6 +11,6 @@ export function foo () {
   const x = { test };
 >x : { test: string; }
 >{ test } : { test: string; }
->test : any
+>test : string
 }
 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity02_targetES5_CommonJS.types.diff b/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity02_targetES5_CommonJS.types.diff
deleted file mode 100644
index 160a4c8c19..0000000000
--- a/testdata/baselines/reference/submodule/compiler/shorthandOfExportedEntity02_targetES5_CommonJS.types.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.shorthandOfExportedEntity02_targetES5_CommonJS.types
-+++ new.shorthandOfExportedEntity02_targetES5_CommonJS.types
-@@= skipped -10, +10 lines =@@
-   const x = { test };
- >x : { test: string; }
- >{ test } : { test: string; }
-->test : string
-+>test : any
- }
- 
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentInES6Module.types b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentInES6Module.types
index ad07bc446f..e25d2ccddc 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentInES6Module.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentInES6Module.types
@@ -19,7 +19,7 @@ declare function use(a: any): void;
 const test = { x, foo };
 >test : { x: number; foo: any; }
 >{ x, foo } : { x: number; foo: any; }
->x : any
+>x : number
 >foo : any
 
 use(x);
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentInES6Module.types.diff b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentInES6Module.types.diff
deleted file mode 100644
index ce9c112228..0000000000
--- a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentInES6Module.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.shorthandPropertyAssignmentInES6Module.types
-+++ new.shorthandPropertyAssignmentInES6Module.types
-@@= skipped -18, +18 lines =@@
- const test = { x, foo };
- >test : { x: number; foo: any; }
- >{ x, foo } : { x: number; foo: any; }
-->x : number
-+>x : any
- >foo : any
- 
- use(x);
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types
index 1f489b69c5..c0330cef2a 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types
@@ -119,7 +119,7 @@
 
 	for ({ s3 = 5 } of [{ s3: "" }]) {
 >{ s3 = 5 } : { s3?: string; }
->s3 : any
+>s3 : string
 >5 : 5
 >[{ s3: "" }] : { s3: string; }[]
 >{ s3: "" } : { s3: string; }
@@ -199,7 +199,7 @@
 >({ y0 = 5 } = { y0: 1 }) : { y0?: number; }
 >{ y0 = 5 } = { y0: 1 } : { y0?: number; }
 >{ y0 = 5 } : { y0?: number; }
->y0 : any
+>y0 : number
 >5 : 5
 >{ y0: 1 } : { y0?: number; }
 >y0 : number
@@ -239,7 +239,7 @@
 >({ y1 = 5 } = {}) : {}
 >{ y1 = 5 } = {} : {}
 >{ y1 = 5 } : { y1?: string; }
->y1 : any
+>y1 : string
 >5 : 5
 >{} : {}
 
@@ -277,9 +277,9 @@
 >({ y2 = 5, y3 = { x: 1 } } = {}) : {}
 >{ y2 = 5, y3 = { x: 1 } } = {} : {}
 >{ y2 = 5, y3 = { x: 1 } } : { y2?: string; y3?: { x: string; }; }
->y2 : any
+>y2 : string
 >5 : 5
->y3 : any
+>y3 : { x: string; }
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : 1
@@ -327,9 +327,9 @@
 >({ y4 = 5, y5 = { x: 1 } } = {}) : {}
 >{ y4 = 5, y5 = { x: 1 } } = {} : {}
 >{ y4 = 5, y5 = { x: 1 } } : { y4?: number; y5?: { x: number; }; }
->y4 : any
+>y4 : number
 >5 : 5
->y5 : any
+>y5 : { x: number; }
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : 1
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types.diff b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types.diff
index 07aba4c007..c0fe5f0ae6 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring.types.diff
@@ -1,57 +1,6 @@
 --- old.shorthandPropertyAssignmentsInDestructuring.types
 +++ new.shorthandPropertyAssignmentsInDestructuring.types
-@@= skipped -118, +118 lines =@@
- 
- 	for ({ s3 = 5 } of [{ s3: "" }]) {
- >{ s3 = 5 } : { s3?: string; }
-->s3 : string
-+>s3 : any
- >5 : 5
- >[{ s3: "" }] : { s3: string; }[]
- >{ s3: "" } : { s3: string; }
-@@= skipped -80, +80 lines =@@
- >({ y0 = 5 } = { y0: 1 }) : { y0?: number; }
- >{ y0 = 5 } = { y0: 1 } : { y0?: number; }
- >{ y0 = 5 } : { y0?: number; }
-->y0 : number
-+>y0 : any
- >5 : 5
- >{ y0: 1 } : { y0?: number; }
- >y0 : number
-@@= skipped -40, +40 lines =@@
- >({ y1 = 5 } = {}) : {}
- >{ y1 = 5 } = {} : {}
- >{ y1 = 5 } : { y1?: string; }
-->y1 : string
-+>y1 : any
- >5 : 5
- >{} : {}
- 
-@@= skipped -38, +38 lines =@@
- >({ y2 = 5, y3 = { x: 1 } } = {}) : {}
- >{ y2 = 5, y3 = { x: 1 } } = {} : {}
- >{ y2 = 5, y3 = { x: 1 } } : { y2?: string; y3?: { x: string; }; }
-->y2 : string
-+>y2 : any
- >5 : 5
-->y3 : { x: string; }
-+>y3 : any
- >{ x: 1 } : { x: number; }
- >x : number
- >1 : 1
-@@= skipped -50, +50 lines =@@
- >({ y4 = 5, y5 = { x: 1 } } = {}) : {}
- >{ y4 = 5, y5 = { x: 1 } } = {} : {}
- >{ y4 = 5, y5 = { x: 1 } } : { y4?: number; y5?: { x: number; }; }
-->y4 : number
-+>y4 : any
- >5 : 5
-->y5 : { x: number; }
-+>y5 : any
- >{ x: 1 } : { x: number; }
- >x : number
- >1 : 1
-@@= skipped -100, +100 lines =@@
+@@= skipped -426, +426 lines =@@
  });
  
  function foo({a = 4, b = { x: 5 }}) {
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types
index d9881e95cf..939cb3e40d 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types
+++ b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types
@@ -119,7 +119,7 @@
 
 	for ({ s3 = 5 } of [{ s3: "" }]) {
 >{ s3 = 5 } : { s3?: string; }
->s3 : any
+>s3 : string
 >5 : 5
 >[{ s3: "" }] : { s3: string; }[]
 >{ s3: "" } : { s3: string; }
@@ -199,7 +199,7 @@
 >({ y0 = 5 } = { y0: 1 }) : { y0?: number; }
 >{ y0 = 5 } = { y0: 1 } : { y0?: number; }
 >{ y0 = 5 } : { y0?: number; }
->y0 : any
+>y0 : number
 >5 : 5
 >{ y0: 1 } : { y0?: number; }
 >y0 : number
@@ -239,7 +239,7 @@
 >({ y1 = 5 } = {}) : {}
 >{ y1 = 5 } = {} : {}
 >{ y1 = 5 } : { y1?: string; }
->y1 : any
+>y1 : string
 >5 : 5
 >{} : {}
 
@@ -277,9 +277,9 @@
 >({ y2 = 5, y3 = { x: 1 } } = {}) : {}
 >{ y2 = 5, y3 = { x: 1 } } = {} : {}
 >{ y2 = 5, y3 = { x: 1 } } : { y2?: string; y3?: { x: string; }; }
->y2 : any
+>y2 : string
 >5 : 5
->y3 : any
+>y3 : { x: string; }
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : 1
@@ -327,9 +327,9 @@
 >({ y4 = 5, y5 = { x: 1 } } = {}) : {}
 >{ y4 = 5, y5 = { x: 1 } } = {} : {}
 >{ y4 = 5, y5 = { x: 1 } } : { y4?: number; y5?: { x: number; }; }
->y4 : any
+>y4 : number
 >5 : 5
->y5 : any
+>y5 : { x: number; }
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : 1
diff --git a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types.diff b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types.diff
index a3013a1e81..ea59caae88 100644
--- a/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.types.diff
@@ -1,57 +1,6 @@
 --- old.shorthandPropertyAssignmentsInDestructuring_ES6.types
 +++ new.shorthandPropertyAssignmentsInDestructuring_ES6.types
-@@= skipped -118, +118 lines =@@
- 
- 	for ({ s3 = 5 } of [{ s3: "" }]) {
- >{ s3 = 5 } : { s3?: string; }
-->s3 : string
-+>s3 : any
- >5 : 5
- >[{ s3: "" }] : { s3: string; }[]
- >{ s3: "" } : { s3: string; }
-@@= skipped -80, +80 lines =@@
- >({ y0 = 5 } = { y0: 1 }) : { y0?: number; }
- >{ y0 = 5 } = { y0: 1 } : { y0?: number; }
- >{ y0 = 5 } : { y0?: number; }
-->y0 : number
-+>y0 : any
- >5 : 5
- >{ y0: 1 } : { y0?: number; }
- >y0 : number
-@@= skipped -40, +40 lines =@@
- >({ y1 = 5 } = {}) : {}
- >{ y1 = 5 } = {} : {}
- >{ y1 = 5 } : { y1?: string; }
-->y1 : string
-+>y1 : any
- >5 : 5
- >{} : {}
- 
-@@= skipped -38, +38 lines =@@
- >({ y2 = 5, y3 = { x: 1 } } = {}) : {}
- >{ y2 = 5, y3 = { x: 1 } } = {} : {}
- >{ y2 = 5, y3 = { x: 1 } } : { y2?: string; y3?: { x: string; }; }
-->y2 : string
-+>y2 : any
- >5 : 5
-->y3 : { x: string; }
-+>y3 : any
- >{ x: 1 } : { x: number; }
- >x : number
- >1 : 1
-@@= skipped -50, +50 lines =@@
- >({ y4 = 5, y5 = { x: 1 } } = {}) : {}
- >{ y4 = 5, y5 = { x: 1 } } = {} : {}
- >{ y4 = 5, y5 = { x: 1 } } : { y4?: number; y5?: { x: number; }; }
-->y4 : number
-+>y4 : any
- >5 : 5
-->y5 : { x: number; }
-+>y5 : any
- >{ x: 1 } : { x: number; }
- >x : number
- >1 : 1
-@@= skipped -100, +100 lines =@@
+@@= skipped -426, +426 lines =@@
  });
  
  function foo({a = 4, b = { x: 5 }}) {
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types
index 05cf014372..2db02ec70f 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types
@@ -256,7 +256,7 @@ for ({ name } = robot, i = 0; i < 1; i++) {
 >{ name } = robot, i = 0 : 0
 >{ name } = robot : Robot
 >{ name } : { name: string; }
->name : any
+>name : string
 >robot : Robot
 >i = 0 : 0
 >i : number
@@ -278,7 +278,7 @@ for ({ name } = getRobot(), i = 0; i < 1; i++) {
 >{ name } = getRobot(), i = 0 : 0
 >{ name } = getRobot() : Robot
 >{ name } : { name: string; }
->name : any
+>name : string
 >getRobot() : Robot
 >getRobot : () => Robot
 >i = 0 : 0
@@ -301,7 +301,7 @@ for ({ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++
 >{ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
 >{ name } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name } : { name: string; }
->name : any
+>name : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
@@ -330,8 +330,8 @@ for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >multiRobot : MultiRobot
 >i = 0 : 0
 >i : number
@@ -355,8 +355,8 @@ for ({ skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i++) {
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >getMultiRobot() : MultiRobot
 >getMultiRobot : () => MultiRobot
 >i = 0 : 0
@@ -381,8 +381,8 @@ for ({ skills: { primary, secondary } } =
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
@@ -601,8 +601,8 @@ for ({ name, skill } = robot, i = 0; i < 1; i++) {
 >{ name, skill } = robot, i = 0 : 0
 >{ name, skill } = robot : Robot
 >{ name, skill } : { name: string; skill: string; }
->name : any
->skill : any
+>name : string
+>skill : string
 >robot : Robot
 >i = 0 : 0
 >i : number
@@ -624,8 +624,8 @@ for ({ name, skill } = getRobot(), i = 0; i < 1; i++) {
 >{ name, skill } = getRobot(), i = 0 : 0
 >{ name, skill } = getRobot() : Robot
 >{ name, skill } : { name: string; skill: string; }
->name : any
->skill : any
+>name : string
+>skill : string
 >getRobot() : Robot
 >getRobot : () => Robot
 >i = 0 : 0
@@ -648,8 +648,8 @@ for ({ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i <
 >{ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
 >{ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name, skill } : { name: string; skill: string; }
->name : any
->skill : any
+>name : string
+>skill : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
@@ -676,11 +676,11 @@ for ({ name, skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
 >{ name, skills: { primary, secondary } } = multiRobot, i = 0 : 0
 >{ name, skills: { primary, secondary } } = multiRobot : MultiRobot
 >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : any
+>name : string
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >multiRobot : MultiRobot
 >i = 0 : 0
 >i : number
@@ -702,11 +702,11 @@ for ({ name, skills: { primary, secondary } } = getMultiRobot(), i = 0; i < 1; i
 >{ name, skills: { primary, secondary } } = getMultiRobot(), i = 0 : 0
 >{ name, skills: { primary, secondary } } = getMultiRobot() : MultiRobot
 >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : any
+>name : string
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >getMultiRobot() : MultiRobot
 >getMultiRobot : () => MultiRobot
 >i = 0 : 0
@@ -729,11 +729,11 @@ for ({ name, skills: { primary, secondary } } =
 >{ name, skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
 >{ name, skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
 >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : any
+>name : string
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types.diff b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types.diff
index 8aa9836b93..3f842ab462 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPattern2.types.diff
@@ -80,16 +80,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name } = robot, i = 0 : 0
- >{ name } = robot : Robot
- >{ name } : { name: string; }
-->name : string
-+>name : any
- >robot : Robot
- >i = 0 : 0
- >i : number
-@@= skipped -14, +14 lines =@@
+@@= skipped -22, +22 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -98,16 +89,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name } = getRobot(), i = 0 : 0
- >{ name } = getRobot() : Robot
- >{ name } : { name: string; }
-->name : string
-+>name : any
- >getRobot() : Robot
- >getRobot : () => Robot
- >i = 0 : 0
-@@= skipped -15, +15 lines =@@
+@@= skipped -23, +23 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -116,16 +98,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
- >{ name } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name } : { name: string; }
-->name : string
-+>name : any
- ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
- >name : string
-@@= skipped -19, +19 lines =@@
+@@= skipped -27, +27 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -134,18 +107,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -10, +10 lines =@@
- >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >multiRobot : MultiRobot
- >i = 0 : 0
- >i : number
-@@= skipped -15, +15 lines =@@
+@@= skipped -25, +25 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -154,18 +116,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -10, +10 lines =@@
- >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >getMultiRobot() : MultiRobot
- >getMultiRobot : () => MultiRobot
- >i = 0 : 0
-@@= skipped -16, +16 lines =@@
+@@= skipped -26, +26 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -174,18 +125,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -10, +10 lines =@@
- >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- 
-     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
- ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
-@@= skipped -28, +28 lines =@@
+@@= skipped -38, +38 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -248,18 +188,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name, skill } = robot, i = 0 : 0
- >{ name, skill } = robot : Robot
- >{ name, skill } : { name: string; skill: string; }
-->name : string
-->skill : string
-+>name : any
-+>skill : any
- >robot : Robot
- >i = 0 : 0
- >i : number
-@@= skipped -15, +15 lines =@@
+@@= skipped -23, +23 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -268,18 +197,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name, skill } = getRobot(), i = 0 : 0
- >{ name, skill } = getRobot() : Robot
- >{ name, skill } : { name: string; skill: string; }
-->name : string
-->skill : string
-+>name : any
-+>skill : any
- >getRobot() : Robot
- >getRobot : () => Robot
- >i = 0 : 0
-@@= skipped -16, +16 lines =@@
+@@= skipped -24, +24 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -288,18 +206,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
- >{ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name, skill } : { name: string; skill: string; }
-->name : string
-->skill : string
-+>name : any
-+>skill : any
- ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
- >name : string
-@@= skipped -20, +20 lines =@@
+@@= skipped -28, +28 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -308,22 +215,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name, skills: { primary, secondary } } = multiRobot, i = 0 : 0
- >{ name, skills: { primary, secondary } } = multiRobot : MultiRobot
- >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
-->name : string
-+>name : any
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >multiRobot : MultiRobot
- >i = 0 : 0
- >i : number
-@@= skipped -18, +18 lines =@@
+@@= skipped -26, +26 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -332,22 +224,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name, skills: { primary, secondary } } = getMultiRobot(), i = 0 : 0
- >{ name, skills: { primary, secondary } } = getMultiRobot() : MultiRobot
- >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
-->name : string
-+>name : any
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >getMultiRobot() : MultiRobot
- >getMultiRobot : () => MultiRobot
- >i = 0 : 0
-@@= skipped -19, +19 lines =@@
+@@= skipped -27, +27 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -356,22 +233,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name, skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },    i = 0 : 0
- >{ name, skills: { primary, secondary } } =    <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
- >{ name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
-->name : string
-+>name : any
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- 
-     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
- ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
-@@= skipped -31, +31 lines =@@
+@@= skipped -39, +39 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
index bc59b782a8..f5a51ba17f 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
@@ -321,7 +321,7 @@ for ({ name = "noName" } = robot, i = 0; i < 1; i++) {
 >{ name = "noName" } = robot, i = 0 : 0
 >{ name = "noName" } = robot : Robot
 >{ name = "noName" } : { name?: string; }
->name : any
+>name : string
 >"noName" : "noName"
 >robot : Robot
 >i = 0 : 0
@@ -344,7 +344,7 @@ for ({ name = "noName" } = getRobot(), i = 0; i < 1; i++) {
 >{ name = "noName" } = getRobot(), i = 0 : 0
 >{ name = "noName" } = getRobot() : Robot
 >{ name = "noName" } : { name?: string; }
->name : any
+>name : string
 >"noName" : "noName"
 >getRobot() : Robot
 >getRobot : () => Robot
@@ -368,7 +368,7 @@ for ({ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0;
 >{ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
 >{ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name = "noName" } : { name?: string; }
->name : any
+>name : string
 >"noName" : "noName"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
@@ -403,11 +403,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "none", secondary: "none" }
@@ -446,11 +446,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "none", secondary: "none" }
@@ -490,11 +490,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "none", secondary: "none" }
@@ -804,9 +804,9 @@ for ({ name = "noName", skill = "skill" } = robot, i = 0; i < 1; i++) {
 >{ name = "noName", skill = "skill" } = robot, i = 0 : 0
 >{ name = "noName", skill = "skill" } = robot : Robot
 >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
->name : any
+>name : string
 >"noName" : "noName"
->skill : any
+>skill : string
 >"skill" : "skill"
 >robot : Robot
 >i = 0 : 0
@@ -829,9 +829,9 @@ for ({ name = "noName", skill = "skill" } = getRobot(), i = 0; i < 1; i++) {
 >{ name = "noName", skill = "skill" } = getRobot(), i = 0 : 0
 >{ name = "noName", skill = "skill" } = getRobot() : Robot
 >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
->name : any
+>name : string
 >"noName" : "noName"
->skill : any
+>skill : string
 >"skill" : "skill"
 >getRobot() : Robot
 >getRobot : () => Robot
@@ -855,9 +855,9 @@ for ({ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "tr
 >{ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
 >{ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
->name : any
+>name : string
 >"noName" : "noName"
->skill : any
+>skill : string
 >"skill" : "skill"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
@@ -887,7 +887,7 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : any
+>name : string
 >"noName" : "noName"
 
     skills: {
@@ -896,11 +896,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "none", secondary: "none" }
@@ -934,7 +934,7 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : any
+>name : string
 >"noName" : "noName"
 
     skills: {
@@ -943,11 +943,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "none", secondary: "none" }
@@ -982,7 +982,7 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : any
+>name : string
 >"noName" : "noName"
 
     skills: {
@@ -991,11 +991,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "none", secondary: "none" }
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types.diff b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types.diff
index f2a1ed01d8..01e7575658 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types.diff
@@ -80,16 +80,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -9, +9 lines =@@
- >{ name = "noName" } = robot, i = 0 : 0
- >{ name = "noName" } = robot : Robot
- >{ name = "noName" } : { name?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
- >robot : Robot
- >i = 0 : 0
-@@= skipped -15, +15 lines =@@
+@@= skipped -24, +24 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -98,16 +89,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name = "noName" } = getRobot(), i = 0 : 0
- >{ name = "noName" } = getRobot() : Robot
- >{ name = "noName" } : { name?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
- >getRobot() : Robot
- >getRobot : () => Robot
-@@= skipped -16, +16 lines =@@
+@@= skipped -24, +24 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -116,16 +98,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
- >{ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name = "noName" } : { name?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
- ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
-@@= skipped -20, +20 lines =@@
+@@= skipped -28, +28 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -134,21 +107,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -15, +15 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "none", secondary: "none" }
-@@= skipped -28, +28 lines =@@
+@@= skipped -43, +43 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -157,21 +116,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -15, +15 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "none", secondary: "none" }
-@@= skipped -29, +29 lines =@@
+@@= skipped -44, +44 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -180,21 +125,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -15, +15 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "none", secondary: "none" }
-@@= skipped -39, +39 lines =@@
+@@= skipped -54, +54 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -257,19 +188,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -9, +9 lines =@@
- >{ name = "noName", skill = "skill" } = robot, i = 0 : 0
- >{ name = "noName", skill = "skill" } = robot : Robot
- >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
-->skill : string
-+>skill : any
- >"skill" : "skill"
- >robot : Robot
- >i = 0 : 0
-@@= skipped -17, +17 lines =@@
+@@= skipped -26, +26 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -278,19 +197,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name = "noName", skill = "skill" } = getRobot(), i = 0 : 0
- >{ name = "noName", skill = "skill" } = getRobot() : Robot
- >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
-->skill : string
-+>skill : any
- >"skill" : "skill"
- >getRobot() : Robot
- >getRobot : () => Robot
-@@= skipped -18, +18 lines =@@
+@@= skipped -26, +26 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -299,19 +206,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0 : 0
- >{ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name = "noName", skill = "skill" } : { name?: string; skill?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
-->skill : string
-+>skill : any
- >"skill" : "skill"
- ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
- >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
-@@= skipped -22, +22 lines =@@
+@@= skipped -30, +30 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -320,30 +215,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -10, +10 lines =@@
- >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
- 
-     name = "noName",
-->name : string
-+>name : any
- >"noName" : "noName"
- 
-     skills: {
-@@= skipped -9, +9 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "none", secondary: "none" }
-@@= skipped -28, +28 lines =@@
+@@= skipped -47, +47 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -352,30 +224,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -10, +10 lines =@@
- >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
- 
-     name = "noName",
-->name : string
-+>name : any
- >"noName" : "noName"
- 
-     skills: {
-@@= skipped -9, +9 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "none", secondary: "none" }
-@@= skipped -29, +29 lines =@@
+@@= skipped -48, +48 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -384,30 +233,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -10, +10 lines =@@
- >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "none", secondary: "none" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
- 
-     name = "noName",
-->name : string
-+>name : any
- >"noName" : "noName"
- 
-     skills: {
-@@= skipped -9, +9 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "none", secondary: "none" }
-@@= skipped -39, +39 lines =@@
+@@= skipped -58, +58 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
index 59597b015e..8f7bafe7fe 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
@@ -225,7 +225,7 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } of [{ name: "mower
 }
 for ({name } of robots) {
 >{name } : { name: string; }
->name : any
+>name : string
 >robots : Robot[]
 
     console.log(nameA);
@@ -237,7 +237,7 @@ for ({name } of robots) {
 }
 for ({name } of getRobots()) {
 >{name } : { name: string; }
->name : any
+>name : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
 
@@ -250,7 +250,7 @@ for ({name } of getRobots()) {
 }
 for ({name } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name } : { name: string; }
->name : any
+>name : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -274,8 +274,8 @@ for ({ skills: { primary, secondary } } of multiRobots) {
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >multiRobots : MultiRobot[]
 
     console.log(primaryA);
@@ -289,8 +289,8 @@ for ({ skills: { primary, secondary } } of getMultiRobots()) {
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >getMultiRobots() : MultiRobot[]
 >getMultiRobots : () => MultiRobot[]
 
@@ -305,8 +305,8 @@ for ({ skills: { primary, secondary } } of [{ name: "mower", skills: { primary:
 >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
@@ -474,8 +474,8 @@ for ({name: nameA, skills: { primary: primaryA, secondary: secondaryA } } of [{
 }
 for ({name, skill } of robots) {
 >{name, skill } : { name: string; skill: string; }
->name : any
->skill : any
+>name : string
+>skill : string
 >robots : Robot[]
 
     console.log(nameA);
@@ -487,8 +487,8 @@ for ({name, skill } of robots) {
 }
 for ({name, skill } of getRobots()) {
 >{name, skill } : { name: string; skill: string; }
->name : any
->skill : any
+>name : string
+>skill : string
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
 
@@ -501,8 +501,8 @@ for ({name, skill } of getRobots()) {
 }
 for ({name, skill } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{name, skill } : { name: string; skill: string; }
->name : any
->skill : any
+>name : string
+>skill : string
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -524,11 +524,11 @@ for ({name, skill } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", s
 }
 for ({name, skills: { primary, secondary } } of multiRobots) {
 >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : any
+>name : string
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >multiRobots : MultiRobot[]
 
     console.log(nameA);
@@ -540,11 +540,11 @@ for ({name, skills: { primary, secondary } } of multiRobots) {
 }
 for ({name, skills: { primary, secondary } } of getMultiRobots()) {
 >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : any
+>name : string
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >getMultiRobots() : MultiRobot[]
 >getMultiRobots : () => MultiRobot[]
 
@@ -557,11 +557,11 @@ for ({name, skills: { primary, secondary } } of getMultiRobots()) {
 }
 for ({name, skills: { primary, secondary } } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
->name : any
+>name : string
 >skills : { primary: string; secondary: string; }
 >{ primary, secondary } : { primary: string; secondary: string; }
->primary : any
->secondary : any
+>primary : string
+>secondary : string
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types.diff b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types.diff
index a17dbcf7f3..39e83535da 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPattern2.types.diff
@@ -80,12 +80,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
- for ({name } of robots) {
- >{name } : { name: string; }
-->name : string
-+>name : any
- >robots : Robot[]
- 
+@@= skipped -12, +12 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -94,13 +89,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name } of getRobots()) {
- >{name } : { name: string; }
-->name : string
-+>name : any
- >getRobots() : Robot[]
- >getRobots : () => Robot[]
- 
+@@= skipped -13, +13 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -109,14 +98,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
- >{name } : { name: string; }
-->name : string
-+>name : any
- >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
- >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
- >name : string
-@@= skipped -47, +47 lines =@@
+@@= skipped -22, +22 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -125,16 +107,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >multiRobots : MultiRobot[]
- 
+@@= skipped -15, +15 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -143,17 +116,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -15, +15 lines =@@
- >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >getMultiRobots() : MultiRobot[]
- >getMultiRobots : () => MultiRobot[]
- 
+@@= skipped -16, +16 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -162,18 +125,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -16, +16 lines =@@
- >{ skills: { primary, secondary } } : { skills: { primary: string; secondary: string; }; }
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
- >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
- >name : string
-@@= skipped -27, +27 lines =@@
+@@= skipped -35, +35 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -236,14 +188,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name, skill } of robots) {
- >{name, skill } : { name: string; skill: string; }
-->name : string
-->skill : string
-+>name : any
-+>skill : any
- >robots : Robot[]
- 
+@@= skipped -13, +13 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -252,15 +197,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name, skill } of getRobots()) {
- >{name, skill } : { name: string; skill: string; }
-->name : string
-->skill : string
-+>name : any
-+>skill : any
- >getRobots() : Robot[]
- >getRobots : () => Robot[]
- 
+@@= skipped -14, +14 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -269,16 +206,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name, skill } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
- >{name, skill } : { name: string; skill: string; }
-->name : string
-->skill : string
-+>name : any
-+>skill : any
- >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
- >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
- >name : string
-@@= skipped -50, +50 lines =@@
+@@= skipped -23, +23 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -287,18 +215,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name, skills: { primary, secondary } } of multiRobots) {
- >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
-->name : string
-+>name : any
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >multiRobots : MultiRobot[]
- 
+@@= skipped -16, +16 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -307,19 +224,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name, skills: { primary, secondary } } of getMultiRobots()) {
- >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
-->name : string
-+>name : any
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >getMultiRobots() : MultiRobot[]
- >getMultiRobots : () => MultiRobot[]
- 
+@@= skipped -17, +17 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -328,20 +233,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({name, skills: { primary, secondary } } of [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
- >{name, skills: { primary, secondary } } : { name: string; skills: { primary: string; secondary: string; }; }
-->name : string
-+>name : any
- >skills : { primary: string; secondary: string; }
- >{ primary, secondary } : { primary: string; secondary: string; }
-->primary : string
-->secondary : string
-+>primary : any
-+>secondary : any
- >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
- >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
- >name : string
-@@= skipped -69, +69 lines =@@
+@@= skipped -36, +36 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
index 3b2e01267c..530c1bfb95 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
@@ -271,7 +271,7 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 
 for ({ name = "noName" } of robots) {
 >{ name = "noName" } : { name?: string; }
->name : any
+>name : string
 >"noName" : "noName"
 >robots : Robot[]
 
@@ -284,7 +284,7 @@ for ({ name = "noName" } of robots) {
 }
 for ({ name = "noName" } of getRobots()) {
 >{ name = "noName" } : { name?: string; }
->name : any
+>name : string
 >"noName" : "noName"
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
@@ -298,7 +298,7 @@ for ({ name = "noName" } of getRobots()) {
 }
 for ({ name = "noName" } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{ name = "noName" } : { name?: string; }
->name : any
+>name : string
 >"noName" : "noName"
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
@@ -328,11 +328,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "noSkill", secondary: "noSkill" }
@@ -361,11 +361,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "noSkill", secondary: "noSkill" }
@@ -395,11 +395,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "noSkill", secondary: "noSkill" }
@@ -663,9 +663,9 @@ for ({
 
 for ({ name = "noName", skill  = "noSkill" } of robots) {
 >{ name = "noName", skill  = "noSkill" } : { name?: string; skill?: string; }
->name : any
+>name : string
 >"noName" : "noName"
->skill : any
+>skill : string
 >"noSkill" : "noSkill"
 >robots : Robot[]
 
@@ -678,9 +678,9 @@ for ({ name = "noName", skill  = "noSkill" } of robots) {
 }
 for ({ name = "noName", skill = "noSkill"  } of getRobots()) {
 >{ name = "noName", skill = "noSkill"  } : { name?: string; skill?: string; }
->name : any
+>name : string
 >"noName" : "noName"
->skill : any
+>skill : string
 >"noSkill" : "noSkill"
 >getRobots() : Robot[]
 >getRobots : () => Robot[]
@@ -694,9 +694,9 @@ for ({ name = "noName", skill = "noSkill"  } of getRobots()) {
 }
 for ({ name = "noName", skill  = "noSkill" } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
 >{ name = "noName", skill  = "noSkill" } : { name?: string; skill?: string; }
->name : any
+>name : string
 >"noName" : "noName"
->skill : any
+>skill : string
 >"noSkill" : "noSkill"
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
@@ -721,7 +721,7 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : any
+>name : string
 >"noName" : "noName"
 
     skills: {
@@ -730,11 +730,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "noSkill", secondary: "noSkill" }
@@ -758,7 +758,7 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : any
+>name : string
 >"noName" : "noName"
 
     skills: {
@@ -767,11 +767,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "noSkill", secondary: "noSkill" }
@@ -796,7 +796,7 @@ for ({
 >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
 
     name = "noName",
->name : any
+>name : string
 >"noName" : "noName"
 
     skills: {
@@ -805,11 +805,11 @@ for ({
 >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
 
         primary = "primary",
->primary : any
+>primary : string
 >"primary" : "primary"
 
         secondary = "secondary"
->secondary : any
+>secondary : string
 >"secondary" : "secondary"
 
     } = { primary: "noSkill", secondary: "noSkill" }
diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types.diff b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types.diff
index 98ac96219a..5c08c3a984 100644
--- a/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types.diff
@@ -80,14 +80,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
- 
- for ({ name = "noName" } of robots) {
- >{ name = "noName" } : { name?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
- >robots : Robot[]
- 
+@@= skipped -14, +14 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -96,14 +89,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({ name = "noName" } of getRobots()) {
- >{ name = "noName" } : { name?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
- >getRobots() : Robot[]
- >getRobots : () => Robot[]
-@@= skipped -28, +28 lines =@@
+@@= skipped -14, +14 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -112,13 +98,6 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({ name = "noName" } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
- >{ name = "noName" } : { name?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
- >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
- >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 @@= skipped -23, +23 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
@@ -128,21 +107,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -13, +13 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "noSkill", secondary: "noSkill" }
-@@= skipped -20, +20 lines =@@
+@@= skipped -33, +33 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -151,21 +116,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -13, +13 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "noSkill", secondary: "noSkill" }
-@@= skipped -21, +21 lines =@@
+@@= skipped -34, +34 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -174,21 +125,7 @@
  >log : (msg: any) => void
  >primaryA : string
  }
-@@= skipped -13, +13 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "noSkill", secondary: "noSkill" }
-@@= skipped -40, +40 lines =@@
+@@= skipped -53, +53 lines =@@
      console.log(primaryA);
  >console.log(primaryA) : void
  >console.log : (msg: any) => void
@@ -251,17 +188,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- 
- for ({ name = "noName", skill  = "noSkill" } of robots) {
- >{ name = "noName", skill  = "noSkill" } : { name?: string; skill?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
-->skill : string
-+>skill : any
- >"noSkill" : "noSkill"
- >robots : Robot[]
- 
+@@= skipped -16, +16 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -270,17 +197,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({ name = "noName", skill = "noSkill"  } of getRobots()) {
- >{ name = "noName", skill = "noSkill"  } : { name?: string; skill?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
-->skill : string
-+>skill : any
- >"noSkill" : "noSkill"
- >getRobots() : Robot[]
- >getRobots : () => Robot[]
-@@= skipped -32, +32 lines =@@
+@@= skipped -16, +16 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -289,16 +206,6 @@
  >log : (msg: any) => void
  >nameA : string
  }
- for ({ name = "noName", skill  = "noSkill" } of [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]) {
- >{ name = "noName", skill  = "noSkill" } : { name?: string; skill?: string; }
-->name : string
-+>name : any
- >"noName" : "noName"
-->skill : string
-+>skill : any
- >"noSkill" : "noSkill"
- >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
- >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 @@= skipped -25, +25 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
@@ -308,30 +215,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
- 
-     name = "noName",
-->name : string
-+>name : any
- >"noName" : "noName"
- 
-     skills: {
-@@= skipped -9, +9 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "noSkill", secondary: "noSkill" }
-@@= skipped -20, +20 lines =@@
+@@= skipped -37, +37 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -340,30 +224,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
- 
-     name = "noName",
-->name : string
-+>name : any
- >"noName" : "noName"
- 
-     skills: {
-@@= skipped -9, +9 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "noSkill", secondary: "noSkill" }
-@@= skipped -21, +21 lines =@@
+@@= skipped -38, +38 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
@@ -372,30 +233,7 @@
  >log : (msg: any) => void
  >nameA : string
  }
-@@= skipped -8, +8 lines =@@
- >{    name = "noName",    skills: {        primary = "primary",        secondary = "secondary"    } = { primary: "noSkill", secondary: "noSkill" }} : { name?: string; skills?: { primary?: string; secondary?: string; }; }
- 
-     name = "noName",
-->name : string
-+>name : any
- >"noName" : "noName"
- 
-     skills: {
-@@= skipped -9, +9 lines =@@
- >{        primary = "primary",        secondary = "secondary"    } : { primary?: string; secondary?: string; }
- 
-         primary = "primary",
-->primary : string
-+>primary : any
- >"primary" : "primary"
- 
-         secondary = "secondary"
-->secondary : string
-+>secondary : any
- >"secondary" : "secondary"
- 
-     } = { primary: "noSkill", secondary: "noSkill" }
-@@= skipped -40, +40 lines =@@
+@@= skipped -57, +57 lines =@@
      console.log(nameA);
  >console.log(nameA) : void
  >console.log : (msg: any) => void
diff --git a/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types b/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types
index 9befbc961a..e24fb50912 100644
--- a/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types
+++ b/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types
@@ -24,7 +24,7 @@ recordOfRecords.propA = {...(foo !== undefined ? {foo} : {})} // OK
 >foo : Record<never, never>
 >undefined : undefined
 >{foo} : { foo: Record<never, never>; }
->foo : any
+>foo : Record<never, never>
 >{} : {}
 
 recordOfRecords.propB = {...(foo && {foo})} // OK
@@ -37,7 +37,7 @@ recordOfRecords.propB = {...(foo && {foo})} // OK
 >foo && {foo} : { foo: Record<never, never>; }
 >foo : Record<never, never>
 >{foo} : { foo: Record<never, never>; }
->foo : any
+>foo : Record<never, never>
 
 recordOfRecords.propC = {...(foo !== undefined && {foo})} // error'd in 3.7 beta, should be OK
 >recordOfRecords.propC = {...(foo !== undefined && {foo})} : { foo?: Record<never, never> | undefined; }
@@ -51,7 +51,7 @@ recordOfRecords.propC = {...(foo !== undefined && {foo})} // error'd in 3.7 beta
 >foo : Record<never, never>
 >undefined : undefined
 >{foo} : { foo: Record<never, never>; }
->foo : any
+>foo : Record<never, never>
 
 interface RecordOfRecordsOrEmpty extends Record<keyof any, RecordOfRecordsOrEmpty | {}> {}
 >RecordOfRecordsOrEmpty : RecordOfRecordsOrEmpty
@@ -72,7 +72,7 @@ recordsOfRecordsOrEmpty.propA = {...(foo !== undefined ? {foo} : {})} // OK
 >foo : Record<never, never>
 >undefined : undefined
 >{foo} : { foo: Record<never, never>; }
->foo : any
+>foo : Record<never, never>
 >{} : {}
 
 recordsOfRecordsOrEmpty.propB = {...(foo && {foo})} // OK
@@ -85,7 +85,7 @@ recordsOfRecordsOrEmpty.propB = {...(foo && {foo})} // OK
 >foo && {foo} : { foo: Record<never, never>; }
 >foo : Record<never, never>
 >{foo} : { foo: Record<never, never>; }
->foo : any
+>foo : Record<never, never>
 
 recordsOfRecordsOrEmpty.propC = {...(foo !== undefined && {foo})} // OK
 >recordsOfRecordsOrEmpty.propC = {...(foo !== undefined && {foo})} : { foo?: Record<never, never> | undefined; }
@@ -99,5 +99,5 @@ recordsOfRecordsOrEmpty.propC = {...(foo !== undefined && {foo})} // OK
 >foo : Record<never, never>
 >undefined : undefined
 >{foo} : { foo: Record<never, never>; }
->foo : any
+>foo : Record<never, never>
 
diff --git a/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types.diff b/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types.diff
index e4e9fa257c..4e23a2be9d 100644
--- a/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/spreadOfObjectLiteralAssignableToIndexSignature.types.diff
@@ -9,30 +9,8 @@
  const recordOfRecords: RecordOfRecords = {}
  >recordOfRecords : RecordOfRecords
  >{} : {}
-@@= skipped -16, +18 lines =@@
+@@= skipped -46, +48 lines =@@
  >foo : Record<never, never>
- >undefined : undefined
- >{foo} : { foo: Record<never, never>; }
-->foo : Record<never, never>
-+>foo : any
- >{} : {}
- 
- recordOfRecords.propB = {...(foo && {foo})} // OK
-@@= skipped -13, +13 lines =@@
- >foo && {foo} : { foo: Record<never, never>; }
- >foo : Record<never, never>
- >{foo} : { foo: Record<never, never>; }
-->foo : Record<never, never>
-+>foo : any
- 
- recordOfRecords.propC = {...(foo !== undefined && {foo})} // error'd in 3.7 beta, should be OK
- >recordOfRecords.propC = {...(foo !== undefined && {foo})} : { foo?: Record<never, never> | undefined; }
-@@= skipped -14, +14 lines =@@
- >foo : Record<never, never>
- >undefined : undefined
- >{foo} : { foo: Record<never, never>; }
-->foo : Record<never, never>
-+>foo : any
  
  interface RecordOfRecordsOrEmpty extends Record<keyof any, RecordOfRecordsOrEmpty | {}> {}
 +>RecordOfRecordsOrEmpty : RecordOfRecordsOrEmpty
@@ -51,13 +29,7 @@
  >{...(foo !== undefined ? {foo} : {})} : { foo?: Record<never, never> | undefined; }
  >(foo !== undefined ? {foo} : {}) : { foo: Record<never, never>; } | {}
  >foo !== undefined ? {foo} : {} : { foo: Record<never, never>; } | {}
-@@= skipped -19, +21 lines =@@
- >foo : Record<never, never>
- >undefined : undefined
- >{foo} : { foo: Record<never, never>; }
-->foo : Record<never, never>
-+>foo : any
- >{} : {}
+@@= skipped -21, +23 lines =@@
  
  recordsOfRecordsOrEmpty.propB = {...(foo && {foo})} // OK
  >recordsOfRecordsOrEmpty.propB = {...(foo && {foo})} : { foo: Record<never, never>; }
@@ -69,10 +41,7 @@
  >{...(foo && {foo})} : { foo: Record<never, never>; }
  >(foo && {foo}) : { foo: Record<never, never>; }
  >foo && {foo} : { foo: Record<never, never>; }
- >foo : Record<never, never>
- >{foo} : { foo: Record<never, never>; }
-->foo : Record<never, never>
-+>foo : any
+@@= skipped -12, +12 lines =@@
  
  recordsOfRecordsOrEmpty.propC = {...(foo !== undefined && {foo})} // OK
  >recordsOfRecordsOrEmpty.propC = {...(foo !== undefined && {foo})} : { foo?: Record<never, never> | undefined; }
@@ -84,10 +53,3 @@
  >{...(foo !== undefined && {foo})} : { foo?: Record<never, never> | undefined; }
  >(foo !== undefined && {foo}) : false | { foo: Record<never, never>; }
  >foo !== undefined && {foo} : false | { foo: Record<never, never>; }
-@@= skipped -27, +27 lines =@@
- >foo : Record<never, never>
- >undefined : undefined
- >{foo} : { foo: Record<never, never>; }
-->foo : Record<never, never>
-+>foo : any
- 
diff --git a/testdata/baselines/reference/submodule/compiler/systemObjectShorthandRename.types b/testdata/baselines/reference/submodule/compiler/systemObjectShorthandRename.types
index 42631f8d20..9bc29eec16 100644
--- a/testdata/baselines/reference/submodule/compiler/systemObjectShorthandRename.types
+++ b/testdata/baselines/reference/submodule/compiler/systemObjectShorthandRename.types
@@ -12,12 +12,12 @@ import {x} from './x.js'
 const x2 = {x}
 >x2 : { x: string; }
 >{x} : { x: string; }
->x : any
+>x : string
 
 const a = {x2}
 >a : { x2: { x: string; }; }
 >{x2} : { x2: { x: string; }; }
->x2 : any
+>x2 : { x: string; }
 
 const x3 = x
 >x3 : "X"
@@ -26,5 +26,5 @@ const x3 = x
 const b = {x3}
 >b : { x3: string; }
 >{x3} : { x3: string; }
->x3 : any
+>x3 : string
 
diff --git a/testdata/baselines/reference/submodule/compiler/systemObjectShorthandRename.types.diff b/testdata/baselines/reference/submodule/compiler/systemObjectShorthandRename.types.diff
deleted file mode 100644
index c48ff434fa..0000000000
--- a/testdata/baselines/reference/submodule/compiler/systemObjectShorthandRename.types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.systemObjectShorthandRename.types
-+++ new.systemObjectShorthandRename.types
-@@= skipped -11, +11 lines =@@
- const x2 = {x}
- >x2 : { x: string; }
- >{x} : { x: string; }
-->x : string
-+>x : any
- 
- const a = {x2}
- >a : { x2: { x: string; }; }
- >{x2} : { x2: { x: string; }; }
-->x2 : { x: string; }
-+>x2 : any
- 
- const x3 = x
- >x3 : "X"
-@@= skipped -14, +14 lines =@@
- const b = {x3}
- >b : { x3: string; }
- >{x3} : { x3: string; }
-->x3 : string
-+>x3 : any
- 
diff --git a/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types b/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types
index 35c15f5824..8ab507a5ca 100644
--- a/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types
+++ b/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types
@@ -24,7 +24,7 @@ const b1 = {} as unknown;
 >b1 : unknown
 
     a
->a : any
+>a : { a: number; }
 
 })
 
@@ -46,7 +46,7 @@ const b2 = {} as never;
 >b2 : never
 
     a
->a : any
+>a : { a: number; }
 
 })
 
diff --git a/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types.diff b/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types.diff
index 9a8699fba2..2082f40b57 100644
--- a/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/unusedImportWithSpread.types.diff
@@ -11,14 +11,6 @@
  
      // @ts-ignore
      ...b1,
- >b1 : unknown
- 
-     a
-->a : { a: number; }
-+>a : any
- 
- })
- 
 @@= skipped -22, +22 lines =@@
  >{} : {}
  
@@ -30,11 +22,3 @@
  
      // @ts-ignore
      ...b2,
- >b2 : never
- 
-     a
-->a : { a: number; }
-+>a : any
- 
- })
- 
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types b/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types
index 008bcd888b..3d2cc4a3f9 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types
+++ b/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types
@@ -552,8 +552,8 @@ namespace GH58603 {
 >something({ kind, id }) : void
 >something : (a: MyType) => void
 >{ kind, id } : { kind: MyEnum; id: number; }
->kind : any
->id : any
+>kind : MyEnum
+>id : number
     }
     
     type Foo = { kind: "a" | "b", value: number } | { kind: "a", value: undefined } | { kind: "b", value: undefined };
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types.diff b/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types.diff
index 032eea10da..b5fc3ae596 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/assignmentCompatWithDiscriminatedUnion.types.diff
@@ -133,18 +133,7 @@
  >b === "a" || b === "b" : boolean
  >b === "a" : boolean
  >b : B
-@@= skipped -56, +56 lines =@@
- >something({ kind, id }) : void
- >something : (a: MyType) => void
- >{ kind, id } : { kind: MyEnum; id: number; }
-->kind : MyEnum
-->id : number
-+>kind : any
-+>id : any
-     }
-     
-     type Foo = { kind: "a" | "b", value: number } | { kind: "a", value: undefined } | { kind: "b", value: undefined };
-@@= skipped -14, +14 lines =@@
+@@= skipped -70, +70 lines =@@
  >value : undefined
      
      function test(obj: { kind: "a" | "b", value: number | undefined }) {
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types b/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types
index 75972e255f..842f01ccfa 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types
+++ b/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types
@@ -38,7 +38,7 @@ x; // string | number
 >({x} = {x: true}) : { x: true; }
 >{x} = {x: true} : { x: true; }
 >{x} : { x: string | number | boolean | RegExp; }
->x : any
+>x : string | number | boolean | RegExp
 >{x: true} : { x: true; }
 >x : true
 >true : true
@@ -63,7 +63,7 @@ x; // number
 >({x = ""} = {x: true}) : { x?: true; }
 >{x = ""} = {x: true} : { x?: true; }
 >{x = ""} : { x?: string | number | boolean | RegExp; }
->x : any
+>x : string | number | boolean | RegExp
 >"" : ""
 >{x: true} : { x?: true; }
 >x : true
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types.diff b/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types.diff
index b31204a868..e525a2ad25 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/assignmentTypeNarrowing.types.diff
@@ -1,24 +1,6 @@
 --- old.assignmentTypeNarrowing.types
 +++ new.assignmentTypeNarrowing.types
-@@= skipped -37, +37 lines =@@
- >({x} = {x: true}) : { x: true; }
- >{x} = {x: true} : { x: true; }
- >{x} : { x: string | number | boolean | RegExp; }
-->x : string | number | boolean | RegExp
-+>x : any
- >{x: true} : { x: true; }
- >x : true
- >true : true
-@@= skipped -25, +25 lines =@@
- >({x = ""} = {x: true}) : { x?: true; }
- >{x = ""} = {x: true} : { x?: true; }
- >{x = ""} : { x?: string | number | boolean | RegExp; }
-->x : string | number | boolean | RegExp
-+>x : any
- >"" : ""
- >{x: true} : { x?: true; }
- >x : true
-@@= skipped -39, +39 lines =@@
+@@= skipped -101, +101 lines =@@
  
  type AOrArrA<T> = T | T[];
  >AOrArrA : AOrArrA<T>
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuperConflict_es6.types b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuperConflict_es6.types
index 2daafda700..5eced00235 100644
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuperConflict_es6.types
+++ b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuperConflict_es6.types
@@ -130,7 +130,7 @@ class B extends A {
 >super : A
 >x : () => void
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // destructuring assign with element access
         ({ f: super["x"] } = { f });
@@ -142,7 +142,7 @@ class B extends A {
 >super : A
 >"x" : "x"
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
     }
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuperConflict_es6.types.diff b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuperConflict_es6.types.diff
deleted file mode 100644
index ae34214b06..0000000000
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuperConflict_es6.types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.asyncMethodWithSuperConflict_es6.types
-+++ new.asyncMethodWithSuperConflict_es6.types
-@@= skipped -129, +129 lines =@@
- >super : A
- >x : () => void
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // destructuring assign with element access
-         ({ f: super["x"] } = { f });
-@@= skipped -12, +12 lines =@@
- >super : A
- >"x" : "x"
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
-     }
- }
- 
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es2017.types b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es2017.types
index 60f1c81776..af77827e26 100644
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es2017.types
+++ b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es2017.types
@@ -118,7 +118,7 @@ class B extends A {
 >super : A
 >x : () => void
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // destructuring assign with element access
         ({ f: super["x"] } = { f });
@@ -130,7 +130,7 @@ class B extends A {
 >super : A
 >"x" : "x"
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
     }
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es2017.types.diff b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es2017.types.diff
deleted file mode 100644
index 2b4cdbf927..0000000000
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es2017.types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.asyncMethodWithSuper_es2017.types
-+++ new.asyncMethodWithSuper_es2017.types
-@@= skipped -117, +117 lines =@@
- >super : A
- >x : () => void
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // destructuring assign with element access
-         ({ f: super["x"] } = { f });
-@@= skipped -12, +12 lines =@@
- >super : A
- >"x" : "x"
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
-     }
- }
- 
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es5.types b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es5.types
index d718848e52..14e48f10c7 100644
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es5.types
+++ b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es5.types
@@ -118,7 +118,7 @@ class B extends A {
 >super : A
 >x : () => void
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // destructuring assign with element access
         ({ f: super["x"] } = { f });
@@ -130,7 +130,7 @@ class B extends A {
 >super : A
 >"x" : "x"
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
     }
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es5.types.diff b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es5.types.diff
deleted file mode 100644
index 7d583dc45e..0000000000
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es5.types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.asyncMethodWithSuper_es5.types
-+++ new.asyncMethodWithSuper_es5.types
-@@= skipped -117, +117 lines =@@
- >super : A
- >x : () => void
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // destructuring assign with element access
-         ({ f: super["x"] } = { f });
-@@= skipped -12, +12 lines =@@
- >super : A
- >"x" : "x"
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
-     }
- }
- 
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es6.types b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es6.types
index ab92812e05..314d02dcd9 100644
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es6.types
+++ b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es6.types
@@ -118,7 +118,7 @@ class B extends A {
 >super : A
 >x : () => void
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // destructuring assign with element access
         ({ f: super["x"] } = { f });
@@ -130,7 +130,7 @@ class B extends A {
 >super : A
 >"x" : "x"
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // property access in arrow
         (() => super.x());
@@ -230,7 +230,7 @@ class B extends A {
 >super : A
 >x : () => void
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // property access (assign) in arrow
         (() => super.x = f);
@@ -314,7 +314,7 @@ class B extends A {
 >super : A
 >"x" : "x"
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // element access (assign) in arrow
         (() => super["x"] = f);
@@ -398,7 +398,7 @@ class B extends A {
 >super : A
 >x : () => void
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // property access (assign) in arrow
         (() => super.x = f);
@@ -482,7 +482,7 @@ class B extends A {
 >super : A
 >"x" : "x"
 >{ f } : { f: () => void; }
->f : any
+>f : () => void
 
         // element access (assign) in arrow
         (() => super["x"] = f);
diff --git a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es6.types.diff b/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es6.types.diff
deleted file mode 100644
index cdbc4a2702..0000000000
--- a/testdata/baselines/reference/submodule/conformance/asyncMethodWithSuper_es6.types.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- old.asyncMethodWithSuper_es6.types
-+++ new.asyncMethodWithSuper_es6.types
-@@= skipped -117, +117 lines =@@
- >super : A
- >x : () => void
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // destructuring assign with element access
-         ({ f: super["x"] } = { f });
-@@= skipped -12, +12 lines =@@
- >super : A
- >"x" : "x"
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // property access in arrow
-         (() => super.x());
-@@= skipped -100, +100 lines =@@
- >super : A
- >x : () => void
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // property access (assign) in arrow
-         (() => super.x = f);
-@@= skipped -84, +84 lines =@@
- >super : A
- >"x" : "x"
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // element access (assign) in arrow
-         (() => super["x"] = f);
-@@= skipped -84, +84 lines =@@
- >super : A
- >x : () => void
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // property access (assign) in arrow
-         (() => super.x = f);
-@@= skipped -84, +84 lines =@@
- >super : A
- >"x" : "x"
- >{ f } : { f: () => void; }
-->f : () => void
-+>f : any
- 
-         // element access (assign) in arrow
-         (() => super["x"] = f);
diff --git a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types
index 046218b636..e17acf7760 100644
--- a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types
+++ b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types
@@ -30,7 +30,7 @@ var obj1 = {
 >bin1 : number
 
     bin1,
->bin1 : any
+>bin1 : number
 
     b: 0b11010,
 >b : number
@@ -54,7 +54,7 @@ var obj2 = {
 >bin2 : number
 
     bin2,
->bin2 : any
+>bin2 : number
 
     b: 0B11010,
 >b : number
diff --git a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types.diff b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types.diff
index 0025556a6f..83585cb4db 100644
--- a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteral.types.diff
@@ -11,16 +11,7 @@
  
      0b11010: "Hello",
  >0b11010 : string
-@@= skipped -12, +12 lines =@@
- >bin1 : number
- 
-     bin1,
-->bin1 : number
-+>bin1 : any
- 
-     b: 0b11010,
- >b : number
-@@= skipped -12, +12 lines =@@
+@@= skipped -24, +24 lines =@@
  }
  
  var obj2 = {
@@ -31,16 +22,7 @@
  
      0B11010: "World",
  >0B11010 : string
-@@= skipped -12, +12 lines =@@
- >bin2 : number
- 
-     bin2,
-->bin2 : number
-+>bin2 : any
- 
-     b: 0B11010,
- >b : number
-@@= skipped -13, +13 lines =@@
+@@= skipped -25, +25 lines =@@
  
  obj1[0b11010];    // string
  >obj1[0b11010] : string
diff --git a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types
index 02528f70b0..ca26c9d940 100644
--- a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types
+++ b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types
@@ -30,7 +30,7 @@ var obj1 = {
 >bin1 : number
 
     bin1,
->bin1 : any
+>bin1 : number
 
     b: 0b11010,
 >b : number
@@ -54,7 +54,7 @@ var obj2 = {
 >bin2 : number
 
     bin2,
->bin2 : any
+>bin2 : number
 
     b: 0B11010,
 >b : number
diff --git a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types.diff b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types.diff
index 356d0b9d50..769115bd9a 100644
--- a/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/binaryIntegerLiteralES6.types.diff
@@ -11,16 +11,7 @@
  
      0b11010: "Hello",
  >0b11010 : string
-@@= skipped -12, +12 lines =@@
- >bin1 : number
- 
-     bin1,
-->bin1 : number
-+>bin1 : any
- 
-     b: 0b11010,
- >b : number
-@@= skipped -12, +12 lines =@@
+@@= skipped -24, +24 lines =@@
  }
  
  var obj2 = {
@@ -31,16 +22,7 @@
  
      0B11010: "World",
  >0B11010 : string
-@@= skipped -12, +12 lines =@@
- >bin2 : number
- 
-     bin2,
-->bin2 : number
-+>bin2 : any
- 
-     b: 0B11010,
- >b : number
-@@= skipped -13, +13 lines =@@
+@@= skipped -25, +25 lines =@@
  
  obj1[0b11010];    // string
  >obj1[0b11010] : string
diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types
index 5dd28d4b15..1ac5c17ea0 100644
--- a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types
+++ b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types
@@ -33,7 +33,7 @@ const obj = {
   },
   /** @type {string} */
   lol,
->lol : any
+>lol : string
 
   /** @type {number} */
   ['b' + 'ar1']: 42,
diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types.diff b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types.diff
index 60463bb27d..ce55a84bca 100644
--- a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTagOnObjectProperty1.types.diff
@@ -36,13 +36,6 @@
  >42 : 42
  
    },
-   /** @type {string} */
-   lol,
-->lol : string
-+>lol : any
- 
-   /** @type {number} */
-   ['b' + 'ar1']: 42,
 @@= skipped -38, +38 lines =@@
  
    /** @type {function(number): number} */
diff --git a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types
index 4d6ec896c2..e598ff40c9 100644
--- a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types
+++ b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types
@@ -14,7 +14,7 @@ module.exports = { abc };
 >module : any
 >exports : any
 >{ abc } : { abc: (a: any, b: any, c: any) => number; }
->abc : any
+>abc : (a: any, b: any, c: any) => number
 
 === use.js ===
 import { abc } from './bug24934';
diff --git a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types.diff b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types.diff
index e05e4985d8..5fcdc64a3e 100644
--- a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.types.diff
@@ -9,9 +9,3 @@
  >module.exports : any
  >module : any
  >exports : any
- >{ abc } : { abc: (a: any, b: any, c: any) => number; }
-->abc : (a: any, b: any, c: any) => number
-+>abc : any
- 
- === use.js ===
- import { abc } from './bug24934';
diff --git a/testdata/baselines/reference/submodule/conformance/controlFlowIterationErrorsAsync.types b/testdata/baselines/reference/submodule/conformance/controlFlowIterationErrorsAsync.types
index 6a4b036ca8..927e48e502 100644
--- a/testdata/baselines/reference/submodule/conformance/controlFlowIterationErrorsAsync.types
+++ b/testdata/baselines/reference/submodule/conformance/controlFlowIterationErrorsAsync.types
@@ -371,7 +371,7 @@ async function myFunc(): Promise<void> {
 >{        lastId,    } : { lastId: number | undefined; }
 
         lastId,
->lastId : any
+>lastId : number | undefined
 
     });
 
diff --git a/testdata/baselines/reference/submodule/conformance/controlFlowIterationErrorsAsync.types.diff b/testdata/baselines/reference/submodule/conformance/controlFlowIterationErrorsAsync.types.diff
deleted file mode 100644
index 4e2f4a2943..0000000000
--- a/testdata/baselines/reference/submodule/conformance/controlFlowIterationErrorsAsync.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.controlFlowIterationErrorsAsync.types
-+++ new.controlFlowIterationErrorsAsync.types
-@@= skipped -370, +370 lines =@@
- >{        lastId,    } : { lastId: number | undefined; }
- 
-         lastId,
-->lastId : number | undefined
-+>lastId : any
- 
-     });
- 
diff --git a/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types b/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types
index 5a455c15da..e8dd78d935 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types
+++ b/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types
@@ -499,9 +499,9 @@ function f15() {
 
     return { a, b, c };
 >{ a, b, c } : { a: string; b: number; c: boolean; }
->a : any
->b : any
->c : any
+>a : string
+>b : number
+>c : boolean
 }
 
 function f16() {
@@ -566,21 +566,21 @@ function f18() {
 >({ a, b } = { a, b }) : { a: number; b: string; }
 >{ a, b } = { a, b } : { a: number; b: string; }
 >{ a, b } : { a: number; b: string; }
->a : any
->b : any
+>a : number
+>b : string
 >{ a, b } : { a: number; b: string; }
->a : any
->b : any
+>a : number
+>b : string
 
     ({ a, b } = { b, a });
 >({ a, b } = { b, a }) : { b: string; a: number; }
 >{ a, b } = { b, a } : { b: string; a: number; }
 >{ a, b } : { a: number; b: string; }
->a : any
->b : any
+>a : number
+>b : string
 >{ b, a } : { b: string; a: number; }
->b : any
->a : any
+>b : string
+>a : number
 
     [aa[0], b] = [a, b];
 >[aa[0], b] = [a, b] : [number, string]
diff --git a/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types.diff b/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types.diff
index 1a22246472..54e0836e30 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/declarationsAndAssignments.types.diff
@@ -54,20 +54,7 @@
  >[2, ["abc", { y: false }]] : [number, [string, { y: false; }]]
  >2 : 2
  >["abc", { y: false }] : [string, { y: false; }]
-@@= skipped -37, +37 lines =@@
- 
-     return { a, b, c };
- >{ a, b, c } : { a: string; b: number; c: boolean; }
-->a : string
-->b : number
-->c : boolean
-+>a : any
-+>b : any
-+>c : any
- }
- 
- function f16() {
-@@= skipped -17, +17 lines =@@
+@@= skipped -54, +54 lines =@@
  }
  
  function f17({ a = "", b = 0, c = false }) {
@@ -107,33 +94,3 @@
  >f15() : { a: string; b: number; c: boolean; }
  >f15 : () => { a: string; b: number; c: boolean; }
  
-@@= skipped -39, +39 lines =@@
- >({ a, b } = { a, b }) : { a: number; b: string; }
- >{ a, b } = { a, b } : { a: number; b: string; }
- >{ a, b } : { a: number; b: string; }
-->a : number
-->b : string
-+>a : any
-+>b : any
- >{ a, b } : { a: number; b: string; }
-->a : number
-->b : string
-+>a : any
-+>b : any
- 
-     ({ a, b } = { b, a });
- >({ a, b } = { b, a }) : { b: string; a: number; }
- >{ a, b } = { b, a } : { b: string; a: number; }
- >{ a, b } : { a: number; b: string; }
-->a : number
-->b : string
-+>a : any
-+>b : any
- >{ b, a } : { b: string; a: number; }
-->b : string
-->a : number
-+>b : any
-+>a : any
- 
-     [aa[0], b] = [a, b];
- >[aa[0], b] = [a, b] : [number, string]
diff --git a/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types b/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types
index 7757f99f2e..e32aa78dfd 100644
--- a/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types
+++ b/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types
@@ -8,7 +8,7 @@ const a: string | undefined = 'ff';
 const foo = { a! }
 >foo : { a: string; }
 >{ a! } : { a: string; }
->a : any
+>a : string
 
 const bar = {
 >bar : { a?: () => void | undefined; }
diff --git a/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types.diff b/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types.diff
index eb4d2ff6d4..86eaf40672 100644
--- a/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/definiteAssignmentAssertionsWithObjectShortHand.types.diff
@@ -1,11 +1,7 @@
 --- old.definiteAssignmentAssertionsWithObjectShortHand.types
 +++ new.definiteAssignmentAssertionsWithObjectShortHand.types
-@@= skipped -7, +7 lines =@@
- const foo = { a! }
- >foo : { a: string; }
- >{ a! } : { a: string; }
-->a : string
-+>a : any
+@@= skipped -10, +10 lines =@@
+ >a : string
  
  const bar = {
 ->bar : { a?(): void; }
diff --git a/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types b/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types
index a09bfa4756..040c446e04 100644
--- a/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types
+++ b/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types
@@ -119,8 +119,8 @@ function f3(obj: { a?: number, b?: string }) {
 >({ a, b } = obj) : { a?: number | undefined; b?: string | undefined; }
 >{ a, b } = obj : { a?: number | undefined; b?: string | undefined; }
 >{ a, b } : { a: number; b: string; }
->a : any
->b : any
+>a : number
+>b : string
 >obj : { a?: number | undefined; b?: string | undefined; }
     }
 }
@@ -135,7 +135,7 @@ function f4() {
 >({ x } = 0) : 0
 >{ x } = 0 : 0
 >{ x } : { x: boolean; }
->x : any
+>x : boolean
 >0 : 0
 
     ({ ["x"]: x } = 0);  // Error
diff --git a/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types.diff b/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types.diff
index 31d547dae0..2f6c6292f4 100644
--- a/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/destructuringControlFlow.types.diff
@@ -150,21 +150,10 @@
 +>({ a, b } = obj) : { a?: number | undefined; b?: string | undefined; }
 +>{ a, b } = obj : { a?: number | undefined; b?: string | undefined; }
  >{ a, b } : { a: number; b: string; }
-->a : number
-->b : string
+ >a : number
+ >b : string
 ->obj : { a?: number; b?: string; }
-+>a : any
-+>b : any
 +>obj : { a?: number | undefined; b?: string | undefined; }
      }
  }
  
-@@= skipped -133, +133 lines =@@
- >({ x } = 0) : 0
- >{ x } = 0 : 0
- >{ x } : { x: boolean; }
-->x : boolean
-+>x : any
- >0 : 0
- 
-     ({ ["x"]: x } = 0);  // Error
diff --git a/testdata/baselines/reference/submodule/conformance/destructuringObjectBindingPatternAndAssignment5.types b/testdata/baselines/reference/submodule/conformance/destructuringObjectBindingPatternAndAssignment5.types
index 819897a48c..c2abfbf257 100644
--- a/testdata/baselines/reference/submodule/conformance/destructuringObjectBindingPatternAndAssignment5.types
+++ b/testdata/baselines/reference/submodule/conformance/destructuringObjectBindingPatternAndAssignment5.types
@@ -14,7 +14,7 @@ function a () {
 >({ x, ...y } = ({ } as any)) : any
 >{ x, ...y } = ({ } as any) : any
 >{ x, ...y } : any
->x : any
+>x : number
 >y : any
 >({ } as any) : any
 >{ } as any : any
diff --git a/testdata/baselines/reference/submodule/conformance/destructuringObjectBindingPatternAndAssignment5.types.diff b/testdata/baselines/reference/submodule/conformance/destructuringObjectBindingPatternAndAssignment5.types.diff
deleted file mode 100644
index 1d81df9d04..0000000000
--- a/testdata/baselines/reference/submodule/conformance/destructuringObjectBindingPatternAndAssignment5.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.destructuringObjectBindingPatternAndAssignment5.types
-+++ new.destructuringObjectBindingPatternAndAssignment5.types
-@@= skipped -13, +13 lines =@@
- >({ x, ...y } = ({ } as any)) : any
- >{ x, ...y } = ({ } as any) : any
- >{ x, ...y } : any
-->x : number
-+>x : any
- >y : any
- >({ } as any) : any
- >{ } as any : any
diff --git a/testdata/baselines/reference/submodule/conformance/destructuringSameNames.types b/testdata/baselines/reference/submodule/conformance/destructuringSameNames.types
index d7be66a4d9..5d08c7ae86 100644
--- a/testdata/baselines/reference/submodule/conformance/destructuringSameNames.types
+++ b/testdata/baselines/reference/submodule/conformance/destructuringSameNames.types
@@ -15,8 +15,8 @@ let { foo, foo: bar } = { foo: 1 };
 >({ foo, foo } = { foo: 2 }) : { foo: number; }
 >{ foo, foo } = { foo: 2 } : { foo: number; }
 >{ foo, foo } : { foo: number; }
->foo : any
->foo : any
+>foo : number
+>foo : number
 >{ foo: 2 } : { foo: number; }
 >foo : number
 >2 : 2
@@ -25,8 +25,8 @@ let { foo, foo: bar } = { foo: 1 };
 >({ foo, foo: bar } = { foo: 3 }) : { foo: number; }
 >{ foo, foo: bar } = { foo: 3 } : { foo: number; }
 >{ foo, foo: bar } : { foo: number; }
->foo : any
->foo : any
+>foo : number
+>foo : number
 >bar : number
 >{ foo: 3 } : { foo: number; }
 >foo : number
@@ -47,7 +47,7 @@ let { foo, foo: bar } = { foo: 1 };
 >({ foo, bar: foo } = { foo: 3, bar: 33 }) : { foo: number; bar: number; }
 >{ foo, bar: foo } = { foo: 3, bar: 33 } : { foo: number; bar: number; }
 >{ foo, bar: foo } : { foo: number; bar: number; }
->foo : any
+>foo : number
 >bar : number
 >foo : number
 >{ foo: 3, bar: 33 } : { foo: number; bar: number; }
@@ -62,7 +62,7 @@ let { foo, foo: bar } = { foo: 1 };
 >{ bar: foo, foo } : { bar: number; foo: number; }
 >bar : number
 >foo : number
->foo : any
+>foo : number
 >{ foo: 4, bar: 44 } : { foo: number; bar: number; }
 >foo : number
 >4 : 4
diff --git a/testdata/baselines/reference/submodule/conformance/destructuringSameNames.types.diff b/testdata/baselines/reference/submodule/conformance/destructuringSameNames.types.diff
deleted file mode 100644
index d296d428ed..0000000000
--- a/testdata/baselines/reference/submodule/conformance/destructuringSameNames.types.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- old.destructuringSameNames.types
-+++ new.destructuringSameNames.types
-@@= skipped -14, +14 lines =@@
- >({ foo, foo } = { foo: 2 }) : { foo: number; }
- >{ foo, foo } = { foo: 2 } : { foo: number; }
- >{ foo, foo } : { foo: number; }
-->foo : number
-->foo : number
-+>foo : any
-+>foo : any
- >{ foo: 2 } : { foo: number; }
- >foo : number
- >2 : 2
-@@= skipped -10, +10 lines =@@
- >({ foo, foo: bar } = { foo: 3 }) : { foo: number; }
- >{ foo, foo: bar } = { foo: 3 } : { foo: number; }
- >{ foo, foo: bar } : { foo: number; }
-->foo : number
-->foo : number
-+>foo : any
-+>foo : any
- >bar : number
- >{ foo: 3 } : { foo: number; }
- >foo : number
-@@= skipped -22, +22 lines =@@
- >({ foo, bar: foo } = { foo: 3, bar: 33 }) : { foo: number; bar: number; }
- >{ foo, bar: foo } = { foo: 3, bar: 33 } : { foo: number; bar: number; }
- >{ foo, bar: foo } : { foo: number; bar: number; }
-->foo : number
-+>foo : any
- >bar : number
- >foo : number
- >{ foo: 3, bar: 33 } : { foo: number; bar: number; }
-@@= skipped -15, +15 lines =@@
- >{ bar: foo, foo } : { bar: number; foo: number; }
- >bar : number
- >foo : number
-->foo : number
-+>foo : any
- >{ foo: 4, bar: 44 } : { foo: number; bar: number; }
- >foo : number
- >4 : 4
diff --git a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18.types b/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18.types
index 8346c95a70..aa7963ca21 100644
--- a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18.types
+++ b/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18.types
@@ -8,7 +8,7 @@ function f() {
 >arguments : any
 >args : IArguments
 >{ arguments } : { arguments: IArguments; }
->arguments : any
+>arguments : IArguments
 
     if (Math.random()) {
 >Math.random() : number
diff --git a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18.types.diff b/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18.types.diff
deleted file mode 100644
index dc01bf2100..0000000000
--- a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.emitArrowFunctionWhenUsingArguments18.types
-+++ new.emitArrowFunctionWhenUsingArguments18.types
-@@= skipped -7, +7 lines =@@
- >arguments : any
- >args : IArguments
- >{ arguments } : { arguments: IArguments; }
-->arguments : IArguments
-+>arguments : any
- 
-     if (Math.random()) {
- >Math.random() : number
diff --git a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18_ES6.types b/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18_ES6.types
index 9790ee0bee..a7fafe3ce4 100644
--- a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18_ES6.types
+++ b/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18_ES6.types
@@ -8,7 +8,7 @@ function f() {
 >arguments : any
 >args : IArguments
 >{ arguments } : { arguments: IArguments; }
->arguments : any
+>arguments : IArguments
 
     if (Math.random()) {
 >Math.random() : number
diff --git a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18_ES6.types.diff b/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18_ES6.types.diff
deleted file mode 100644
index e4f55832c4..0000000000
--- a/testdata/baselines/reference/submodule/conformance/emitArrowFunctionWhenUsingArguments18_ES6.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.emitArrowFunctionWhenUsingArguments18_ES6.types
-+++ new.emitArrowFunctionWhenUsingArguments18_ES6.types
-@@= skipped -7, +7 lines =@@
- >arguments : any
- >args : IArguments
- >{ arguments } : { arguments: IArguments; }
-->arguments : IArguments
-+>arguments : any
- 
-     if (Math.random()) {
- >Math.random() : number
diff --git a/testdata/baselines/reference/submodule/conformance/for-of47.types b/testdata/baselines/reference/submodule/conformance/for-of47.types
index 2e40be4b46..f0c2456c84 100644
--- a/testdata/baselines/reference/submodule/conformance/for-of47.types
+++ b/testdata/baselines/reference/submodule/conformance/for-of47.types
@@ -20,7 +20,7 @@ enum E { x }
 
 for ({x, y: y = E.x} of array) {
 >{x, y: y = E.x} : { x: string; y?: E; }
->x : any
+>x : string
 >y : E
 >y = E.x : E
 >y : number
diff --git a/testdata/baselines/reference/submodule/conformance/for-of47.types.diff b/testdata/baselines/reference/submodule/conformance/for-of47.types.diff
deleted file mode 100644
index a3e3f39c89..0000000000
--- a/testdata/baselines/reference/submodule/conformance/for-of47.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.for-of47.types
-+++ new.for-of47.types
-@@= skipped -19, +19 lines =@@
- 
- for ({x, y: y = E.x} of array) {
- >{x, y: y = E.x} : { x: string; y?: E; }
-->x : string
-+>x : any
- >y : E
- >y = E.x : E
- >y : number
diff --git a/testdata/baselines/reference/submodule/conformance/for-of48.types b/testdata/baselines/reference/submodule/conformance/for-of48.types
index 685bba7397..81d4b126e1 100644
--- a/testdata/baselines/reference/submodule/conformance/for-of48.types
+++ b/testdata/baselines/reference/submodule/conformance/for-of48.types
@@ -20,8 +20,8 @@ enum E { x }
 
 for ({x, y = E.x} of array) {
 >{x, y = E.x} : { x: string; y?: number; }
->x : any
->y : any
+>x : string
+>y : number
 >E.x : E
 >E : typeof E
 >x : E
diff --git a/testdata/baselines/reference/submodule/conformance/for-of48.types.diff b/testdata/baselines/reference/submodule/conformance/for-of48.types.diff
deleted file mode 100644
index eb7d0b443c..0000000000
--- a/testdata/baselines/reference/submodule/conformance/for-of48.types.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.for-of48.types
-+++ new.for-of48.types
-@@= skipped -19, +19 lines =@@
- 
- for ({x, y = E.x} of array) {
- >{x, y = E.x} : { x: string; y?: number; }
-->x : string
-->y : number
-+>x : any
-+>y : any
- >E.x : E
- >E : typeof E
- >x : E
diff --git a/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types b/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types
index 68c101a6f6..21805eff2f 100644
--- a/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types
+++ b/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types
@@ -231,7 +231,7 @@ const f23: <A>(a: A[]) => Box<A>[] = arrayMap(value => ({ value }));
 >value : A
 >({ value }) : { value: A; }
 >{ value } : { value: A; }
->value : any
+>value : A
 
 const f30: (a: string[]) => string[] = arrayFilter(x => x.length > 10);
 >f30 : (a: string[]) => string[]
diff --git a/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types.diff b/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types.diff
index 007bbca11a..9c3f06d4ec 100644
--- a/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/genericContextualTypes1.types.diff
@@ -184,16 +184,7 @@
  >a : A[]
  >arrayMap(value => ({ value })) : (a: A[]) => { value: A; }[]
  >arrayMap : <T, U>(f: (x: T) => U) => (a: T[]) => U[]
-@@= skipped -7, +8 lines =@@
- >value : A
- >({ value }) : { value: A; }
- >{ value } : { value: A; }
-->value : A
-+>value : any
- 
- const f30: (a: string[]) => string[] = arrayFilter(x => x.length > 10);
- >f30 : (a: string[]) => string[]
-@@= skipped -17, +17 lines =@@
+@@= skipped -24, +25 lines =@@
  
  const f31: <T extends Box<number>>(a: T[]) => T[] = arrayFilter(x => x.value > 10);
  >f31 : <T extends Box<number>>(a: T[]) => T[]
diff --git a/testdata/baselines/reference/submodule/conformance/importClause_default.types b/testdata/baselines/reference/submodule/conformance/importClause_default.types
index 3c9551c10d..ced6e95110 100644
--- a/testdata/baselines/reference/submodule/conformance/importClause_default.types
+++ b/testdata/baselines/reference/submodule/conformance/importClause_default.types
@@ -22,5 +22,5 @@ let a: A = { a: '' };
 let b = { A };
 >b : { A: typeof default; }
 >{ A } : { A: typeof default; }
->A : any
+>A : typeof default
 
diff --git a/testdata/baselines/reference/submodule/conformance/importClause_default.types.diff b/testdata/baselines/reference/submodule/conformance/importClause_default.types.diff
index d0b0ce5b37..fddfd318ab 100644
--- a/testdata/baselines/reference/submodule/conformance/importClause_default.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importClause_default.types.diff
@@ -32,5 +32,5 @@
 ->A : typeof A
 +>b : { A: typeof default; }
 +>{ A } : { A: typeof default; }
-+>A : any
++>A : typeof default
  
diff --git a/testdata/baselines/reference/submodule/conformance/importClause_namedImports.types b/testdata/baselines/reference/submodule/conformance/importClause_namedImports.types
index 7eec87ade6..9344164a2c 100644
--- a/testdata/baselines/reference/submodule/conformance/importClause_namedImports.types
+++ b/testdata/baselines/reference/submodule/conformance/importClause_namedImports.types
@@ -36,5 +36,5 @@ b.b;
 const c = { A };
 >c : { A: typeof A; }
 >{ A } : { A: typeof A; }
->A : any
+>A : typeof A
 
diff --git a/testdata/baselines/reference/submodule/conformance/importClause_namedImports.types.diff b/testdata/baselines/reference/submodule/conformance/importClause_namedImports.types.diff
deleted file mode 100644
index ee59f2d20e..0000000000
--- a/testdata/baselines/reference/submodule/conformance/importClause_namedImports.types.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.importClause_namedImports.types
-+++ new.importClause_namedImports.types
-@@= skipped -35, +35 lines =@@
- const c = { A };
- >c : { A: typeof A; }
- >{ A } : { A: typeof A; }
-->A : typeof A
-+>A : any
- 
diff --git a/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types b/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types
index 4af4fb680e..ae15015a95 100644
--- a/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types
+++ b/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types
@@ -51,5 +51,5 @@ const c: types.C<string> = "";
 const d = { types };
 >d : { types: typeof import("/a"); }
 >{ types } : { types: typeof import("/a"); }
->types : any
+>types : typeof import("/a")
 
diff --git a/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types.diff b/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types.diff
index 5767e9f077..ab91bd6750 100644
--- a/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importClause_namespaceImport.types.diff
@@ -51,5 +51,5 @@
 ->types : typeof types
 +>d : { types: typeof import("/a"); }
 +>{ types } : { types: typeof import("/a"); }
-+>types : any
++>types : typeof import("/a")
  
diff --git a/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types b/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types
index 84d9aeabe5..13d9e9f7c0 100644
--- a/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types
+++ b/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types
@@ -472,7 +472,7 @@ function makeBox<T>(value: T) {
 
     return { value };
 >{ value } : { value: T; }
->value : any
+>value : T
 }
 
 type BoxFunc<T> = typeof makeBox<T>;  // (value: T) => { value: T }
diff --git a/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types.diff b/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types.diff
index db63e6a4e4..524762942c 100644
--- a/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/instantiationExpressions.types.diff
@@ -481,9 +481,7 @@
  >value : T
  
      return { value };
- >{ value } : { value: T; }
-->value : T
-+>value : any
+@@= skipped -74, +86 lines =@@
  }
  
  type BoxFunc<T> = typeof makeBox<T>;  // (value: T) => { value: T }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types
index 9340d81a0f..59fe00d97c 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types
@@ -30,6 +30,6 @@ module.exports = {x, b}
 >module : any
 >exports : any
 >{x, b} : { x: (a: any) => string; b: () => number; }
->x : any
->b : any
+>x : (a: any) => string
+>b : () => number
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types.diff
index a985b57cf9..965f20ba83 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.types.diff
@@ -13,8 +13,5 @@
 +>module : any
 +>exports : any
  >{x, b} : { x: (a: any) => string; b: () => number; }
-->x : (a: any) => string
-->b : () => number
-+>x : any
-+>b : any
- 
+ >x : (a: any) => string
+ >b : () => number
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types
index fde3776a02..f87dd446ab 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types
@@ -27,6 +27,6 @@ module.exports = {
 
     },
     x
->x : any
+>x : number
 
 };
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types.diff
index 184604478d..942b22c27a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.types.diff
@@ -13,11 +13,3 @@
  >{    extends: 'base',    more: {        others: ['strs']    },    x} : { extends: string; more: { others: string[]; }; x: number; }
  
      extends: 'base',
-@@= skipped -20, +20 lines =@@
- 
-     },
-     x
-->x : number
-+>x : any
- 
- };
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
index e798b1c154..bbdde03d12 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
@@ -53,6 +53,6 @@ module.exports = {testFn, testFnTypes};
 >module : any
 >exports : any
 >{testFn, testFnTypes} : { testFn: (input: any) => number; testFnTypes: {}; }
->testFn : any
->testFnTypes : any
+>testFn : (input: any) => number
+>testFnTypes : {}
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff
index bae47ee7c5..cd20fdf044 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff
@@ -61,8 +61,8 @@
 +>module : any
 +>exports : any
 +>{testFn, testFnTypes} : { testFn: (input: any) => number; testFnTypes: {}; }
-+>testFn : any
-+>testFnTypes : any
++>testFn : (input: any) => number
++>testFnTypes : {}
  
 -=== file.js ===
 -/**
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types
index 5288a70ed0..d3486e1930 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types
@@ -63,10 +63,10 @@ module.exports = {
 >{    doTheThing,    ExportedThing,} : { doTheThing: (x: any) => { x: string; }; ExportedThing: typeof ExportedThing; }
 
     doTheThing,
->doTheThing : any
+>doTheThing : (x: any) => { x: string; }
 
     ExportedThing,
->ExportedThing : any
+>ExportedThing : typeof ExportedThing
 
 };
 class LocalThing {
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types.diff
index 7072c6dc75..43134007da 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.types.diff
@@ -36,11 +36,7 @@
  
      doTheThing,
 ->doTheThing : (x: number) => SomeType
-+>doTheThing : any
++>doTheThing : (x: any) => { x: string; }
  
      ExportedThing,
-->ExportedThing : typeof ExportedThing
-+>ExportedThing : any
- 
- };
- class LocalThing {
+ >ExportedThing : typeof ExportedThing
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types
index be615ac88c..d384caf838 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types
@@ -65,7 +65,7 @@ module.exports = {
 >{    Wrap} : { Wrap: typeof Wrap; }
 
     Wrap
->Wrap : any
+>Wrap : typeof Wrap
 
 };
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types.diff
index ac6634300c..d0c2c9e3f5 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types.diff
@@ -57,8 +57,3 @@
  >{    Wrap} : { Wrap: typeof Wrap; }
  
      Wrap
-->Wrap : typeof Wrap
-+>Wrap : any
- 
- };
- 
diff --git a/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types b/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types
index 70e7322125..f30505e72d 100644
--- a/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types
+++ b/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types
@@ -441,7 +441,7 @@ const arr: Obj[] = langCodes.map(code => ({ code }))
 >code : "en" | "es" | "fr" | "it" | "nl"
 >({ code }) : { code: "en" | "es" | "fr" | "it" | "nl"; }
 >{ code } : { code: "en" | "es" | "fr" | "it" | "nl"; }
->code : any
+>code : "en" | "es" | "fr" | "it" | "nl"
 
 // Repro from #29081
 
diff --git a/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types.diff b/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types.diff
index 96ea37d513..5d7129af5a 100644
--- a/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/literalTypeWidening.types.diff
@@ -194,7 +194,7 @@
 +>code : "en" | "es" | "fr" | "it" | "nl"
 +>({ code }) : { code: "en" | "es" | "fr" | "it" | "nl"; }
 +>{ code } : { code: "en" | "es" | "fr" | "it" | "nl"; }
-+>code : any
++>code : "en" | "es" | "fr" | "it" | "nl"
  
  // Repro from #29081
  
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types
index 192ce91009..6314a8f44c 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types
@@ -22,7 +22,7 @@ const oobj = {
 >{    obj} : { obj: {}; }
 
     obj
->obj : any
+>obj : {}
 }
 
 obj[incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types.diff
index 89b9145eee..ee53284ad8 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2015).types.diff
@@ -1,11 +1,6 @@
 --- old.logicalAssignment10(target=es2015).types
 +++ new.logicalAssignment10(target=es2015).types
-@@= skipped -21, +21 lines =@@
- >{    obj} : { obj: {}; }
- 
-     obj
-->obj : {}
-+>obj : any
+@@= skipped -25, +25 lines =@@
  }
  
  obj[incr()] ??= incr();
@@ -16,7 +11,7 @@
  >obj : {}
  >incr() : number
  >incr : () => number
-@@= skipped -13, +13 lines =@@
+@@= skipped -9, +9 lines =@@
  >incr : () => number
  
  oobj["obj"][incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types
index 192ce91009..6314a8f44c 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types
@@ -22,7 +22,7 @@ const oobj = {
 >{    obj} : { obj: {}; }
 
     obj
->obj : any
+>obj : {}
 }
 
 obj[incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types.diff b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types.diff
index 8a1cfb9e3b..180c17ff8f 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2020).types.diff
@@ -1,11 +1,6 @@
 --- old.logicalAssignment10(target=es2020).types
 +++ new.logicalAssignment10(target=es2020).types
-@@= skipped -21, +21 lines =@@
- >{    obj} : { obj: {}; }
- 
-     obj
-->obj : {}
-+>obj : any
+@@= skipped -25, +25 lines =@@
  }
  
  obj[incr()] ??= incr();
@@ -16,7 +11,7 @@
  >obj : {}
  >incr() : number
  >incr : () => number
-@@= skipped -13, +13 lines =@@
+@@= skipped -9, +9 lines =@@
  >incr : () => number
  
  oobj["obj"][incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types
index 192ce91009..6314a8f44c 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types
@@ -22,7 +22,7 @@ const oobj = {
 >{    obj} : { obj: {}; }
 
     obj
->obj : any
+>obj : {}
 }
 
 obj[incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types.diff b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types.diff
index ce352da706..601b52a256 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=es2021).types.diff
@@ -1,11 +1,6 @@
 --- old.logicalAssignment10(target=es2021).types
 +++ new.logicalAssignment10(target=es2021).types
-@@= skipped -21, +21 lines =@@
- >{    obj} : { obj: {}; }
- 
-     obj
-->obj : {}
-+>obj : any
+@@= skipped -25, +25 lines =@@
  }
  
  obj[incr()] ??= incr();
@@ -16,7 +11,7 @@
  >obj : {}
  >incr() : number
  >incr : () => number
-@@= skipped -13, +13 lines =@@
+@@= skipped -9, +9 lines =@@
  >incr : () => number
  
  oobj["obj"][incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types
index 192ce91009..6314a8f44c 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types
@@ -22,7 +22,7 @@ const oobj = {
 >{    obj} : { obj: {}; }
 
     obj
->obj : any
+>obj : {}
 }
 
 obj[incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types.diff
index 7458c485b5..58234a5581 100644
--- a/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/logicalAssignment10(target=esnext).types.diff
@@ -1,11 +1,6 @@
 --- old.logicalAssignment10(target=esnext).types
 +++ new.logicalAssignment10(target=esnext).types
-@@= skipped -21, +21 lines =@@
- >{    obj} : { obj: {}; }
- 
-     obj
-->obj : {}
-+>obj : any
+@@= skipped -25, +25 lines =@@
  }
  
  obj[incr()] ??= incr();
@@ -16,7 +11,7 @@
  >obj : {}
  >incr() : number
  >incr : () => number
-@@= skipped -13, +13 lines =@@
+@@= skipped -9, +9 lines =@@
  >incr : () => number
  
  oobj["obj"][incr()] ??= incr();
diff --git a/testdata/baselines/reference/submodule/conformance/mappedTypes5.types b/testdata/baselines/reference/submodule/conformance/mappedTypes5.types
index 4a9ccb4d8e..8e9bc281d5 100644
--- a/testdata/baselines/reference/submodule/conformance/mappedTypes5.types
+++ b/testdata/baselines/reference/submodule/conformance/mappedTypes5.types
@@ -129,14 +129,14 @@ function doit<T extends State>() {
     let args1: Args1<T> = { previous, current };
 >args1 : Args1<T>
 >{ previous, current } : { previous: Partial<T>; current: Partial<T>; }
->previous : any
->current : any
+>previous : Partial<T>
+>current : Partial<T>
 
     let args2: Args2<T> = { previous, current };
 >args2 : Args2<T>
 >{ previous, current } : { previous: Partial<T>; current: Partial<T>; }
->previous : any
->current : any
+>previous : Partial<T>
+>current : Partial<T>
 }
 
 type State2 = { foo: number, bar: string };
@@ -186,13 +186,13 @@ function doit2() {
     let args1: Args3 = { previous, current };
 >args1 : Args3
 >{ previous, current } : { previous: Partial<State2>; current: Partial<State2>; }
->previous : any
->current : any
+>previous : Partial<State2>
+>current : Partial<State2>
 
     let args2: Args4 = { previous, current };
 >args2 : Args4
 >{ previous, current } : { previous: Partial<State2>; current: Partial<State2>; }
->previous : any
->current : any
+>previous : Partial<State2>
+>current : Partial<State2>
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/mappedTypes5.types.diff b/testdata/baselines/reference/submodule/conformance/mappedTypes5.types.diff
index 3004e8552a..3c362e4048 100644
--- a/testdata/baselines/reference/submodule/conformance/mappedTypes5.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/mappedTypes5.types.diff
@@ -32,40 +32,3 @@
  
      let previous: Partial<T> = Object.create(null);
  >previous : Partial<T>
-@@= skipped -18, +19 lines =@@
-     let args1: Args1<T> = { previous, current };
- >args1 : Args1<T>
- >{ previous, current } : { previous: Partial<T>; current: Partial<T>; }
-->previous : Partial<T>
-->current : Partial<T>
-+>previous : any
-+>current : any
- 
-     let args2: Args2<T> = { previous, current };
- >args2 : Args2<T>
- >{ previous, current } : { previous: Partial<T>; current: Partial<T>; }
-->previous : Partial<T>
-->current : Partial<T>
-+>previous : any
-+>current : any
- }
- 
- type State2 = { foo: number, bar: string };
-@@= skipped -57, +57 lines =@@
-     let args1: Args3 = { previous, current };
- >args1 : Args3
- >{ previous, current } : { previous: Partial<State2>; current: Partial<State2>; }
-->previous : Partial<State2>
-->current : Partial<State2>
-+>previous : any
-+>current : any
- 
-     let args2: Args4 = { previous, current };
- >args2 : Args4
- >{ previous, current } : { previous: Partial<State2>; current: Partial<State2>; }
-->previous : Partial<State2>
-->current : Partial<State2>
-+>previous : any
-+>current : any
- }
- 
diff --git a/testdata/baselines/reference/submodule/conformance/missingAndExcessProperties.types b/testdata/baselines/reference/submodule/conformance/missingAndExcessProperties.types
index eeef04665c..c0b3b4165f 100644
--- a/testdata/baselines/reference/submodule/conformance/missingAndExcessProperties.types
+++ b/testdata/baselines/reference/submodule/conformance/missingAndExcessProperties.types
@@ -42,8 +42,8 @@ function f2() {
 >({ x, y } = {}) : {}
 >{ x, y } = {} : {}
 >{ x, y } : { x: number; y: number; }
->x : any
->y : any
+>x : number
+>y : number
 >{} : {}
 
     ({ x: x = 1, y } = {});
@@ -54,14 +54,14 @@ function f2() {
 >x = 1 : 1
 >x : number
 >1 : 1
->y : any
+>y : number
 >{} : {}
 
     ({ x, y: y = 1 } = {});
 >({ x, y: y = 1 } = {}) : {}
 >{ x, y: y = 1 } = {} : {}
 >{ x, y: y = 1 } : { x: number; y?: number; }
->x : any
+>x : number
 >y : number
 >y = 1 : 1
 >y : number
@@ -142,7 +142,7 @@ function f4() {
 >({ x } = { x: 0, y: 0 }) : { x: number; y: number; }
 >{ x } = { x: 0, y: 0 } : { x: number; y: number; }
 >{ x } : { x: number; }
->x : any
+>x : number
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -153,7 +153,7 @@ function f4() {
 >({ y } = { x: 0, y: 0 }) : { x: number; y: number; }
 >{ y } = { x: 0, y: 0 } : { x: number; y: number; }
 >{ y } : { y: number; }
->y : any
+>y : number
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -164,8 +164,8 @@ function f4() {
 >({ x, y } = { x: 0, y: 0 }) : { x: number; y: number; }
 >{ x, y } = { x: 0, y: 0 } : { x: number; y: number; }
 >{ x, y } : { x: number; y: number; }
->x : any
->y : any
+>x : number
+>y : number
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
diff --git a/testdata/baselines/reference/submodule/conformance/missingAndExcessProperties.types.diff b/testdata/baselines/reference/submodule/conformance/missingAndExcessProperties.types.diff
deleted file mode 100644
index 11b6401562..0000000000
--- a/testdata/baselines/reference/submodule/conformance/missingAndExcessProperties.types.diff
+++ /dev/null
@@ -1,59 +0,0 @@
---- old.missingAndExcessProperties.types
-+++ new.missingAndExcessProperties.types
-@@= skipped -41, +41 lines =@@
- >({ x, y } = {}) : {}
- >{ x, y } = {} : {}
- >{ x, y } : { x: number; y: number; }
-->x : number
-->y : number
-+>x : any
-+>y : any
- >{} : {}
- 
-     ({ x: x = 1, y } = {});
-@@= skipped -12, +12 lines =@@
- >x = 1 : 1
- >x : number
- >1 : 1
-->y : number
-+>y : any
- >{} : {}
- 
-     ({ x, y: y = 1 } = {});
- >({ x, y: y = 1 } = {}) : {}
- >{ x, y: y = 1 } = {} : {}
- >{ x, y: y = 1 } : { x: number; y?: number; }
-->x : number
-+>x : any
- >y : number
- >y = 1 : 1
- >y : number
-@@= skipped -88, +88 lines =@@
- >({ x } = { x: 0, y: 0 }) : { x: number; y: number; }
- >{ x } = { x: 0, y: 0 } : { x: number; y: number; }
- >{ x } : { x: number; }
-->x : number
-+>x : any
- >{ x: 0, y: 0 } : { x: number; y: number; }
- >x : number
- >0 : 0
-@@= skipped -11, +11 lines =@@
- >({ y } = { x: 0, y: 0 }) : { x: number; y: number; }
- >{ y } = { x: 0, y: 0 } : { x: number; y: number; }
- >{ y } : { y: number; }
-->y : number
-+>y : any
- >{ x: 0, y: 0 } : { x: number; y: number; }
- >x : number
- >0 : 0
-@@= skipped -11, +11 lines =@@
- >({ x, y } = { x: 0, y: 0 }) : { x: number; y: number; }
- >{ x, y } = { x: 0, y: 0 } : { x: number; y: number; }
- >{ x, y } : { x: number; y: number; }
-->x : number
-->y : number
-+>x : any
-+>y : any
- >{ x: 0, y: 0 } : { x: number; y: number; }
- >x : number
- >0 : 0
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types
index 9dd118f7a1..c1c5c6d45a 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types
@@ -13,7 +13,7 @@ module.exports = {
 >{    C} : { C: typeof C; }
 
     C
->C : any
+>C : typeof C
 
 };
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types.diff
index 4ee84ef6a7..3162433ec0 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.types.diff
@@ -15,8 +15,3 @@
  >{    C} : { C: typeof C; }
  
      C
-->C : typeof C
-+>C : any
- 
- };
- 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types
index f745219bc5..0a6833c66c 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types
@@ -28,13 +28,13 @@ module.exports = {
 >{    Thing,    AnotherThing,    foo,    qux: bar,    baz() { return 5 },    literal: "",} : { Thing: typeof Thing; AnotherThing: typeof AnotherThing; foo: () => number; qux: () => number; baz: () => number; literal: string; }
 
     Thing,
->Thing : any
+>Thing : typeof Thing
 
     AnotherThing,
->AnotherThing : any
+>AnotherThing : typeof AnotherThing
 
     foo,
->foo : any
+>foo : () => number
 
     qux: bar,
 >qux : () => number
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types.diff
index f17922557f..7320301f47 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.types.diff
@@ -16,19 +16,7 @@
 +>{    Thing,    AnotherThing,    foo,    qux: bar,    baz() { return 5 },    literal: "",} : { Thing: typeof Thing; AnotherThing: typeof AnotherThing; foo: () => number; qux: () => number; baz: () => number; literal: string; }
  
      Thing,
-->Thing : typeof Thing
-+>Thing : any
- 
-     AnotherThing,
-->AnotherThing : typeof AnotherThing
-+>AnotherThing : any
- 
-     foo,
-->foo : () => number
-+>foo : any
- 
-     qux: bar,
- >qux : () => number
+ >Thing : typeof Thing
 @@= skipped -38, +38 lines =@@
   * @param {import("./mod").literal} g
   */
diff --git a/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types b/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types
index 5d0df14882..67ee67cdef 100644
--- a/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types
+++ b/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types
@@ -211,9 +211,9 @@ declare let target_string_arr: string[];
 >({ x, y, z } = numMapPoint) : { x: number; y: number; } & { [s: string]: number; }
 >{ x, y, z } = numMapPoint : { x: number; y: number; } & { [s: string]: number; }
 >{ x, y, z } : { x: number; y: number; z: number | undefined; }
->x : any
->y : any
->z : any
+>x : number
+>y : number
+>z : number | undefined
 >numMapPoint : { x: number; y: number; } & { [s: string]: number; }
 
     let q: number;
@@ -223,7 +223,7 @@ declare let target_string_arr: string[];
 >({ q } = numMapPoint) : { x: number; y: number; } & { [s: string]: number; }
 >{ q } = numMapPoint : { x: number; y: number; } & { [s: string]: number; }
 >{ q } : { q: number; }
->q : any
+>q : number
 >numMapPoint : { x: number; y: number; } & { [s: string]: number; }
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types.diff b/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types.diff
index 9422bdfb3f..269c9f7d9e 100644
--- a/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/noUncheckedIndexedAccessDestructuring.types.diff
@@ -107,25 +107,3 @@
  }
  
  
-@@= skipped -70, +70 lines =@@
- >({ x, y, z } = numMapPoint) : { x: number; y: number; } & { [s: string]: number; }
- >{ x, y, z } = numMapPoint : { x: number; y: number; } & { [s: string]: number; }
- >{ x, y, z } : { x: number; y: number; z: number | undefined; }
-->x : number
-->y : number
-->z : number | undefined
-+>x : any
-+>y : any
-+>z : any
- >numMapPoint : { x: number; y: number; } & { [s: string]: number; }
- 
-     let q: number;
-@@= skipped -12, +12 lines =@@
- >({ q } = numMapPoint) : { x: number; y: number; } & { [s: string]: number; }
- >{ q } = numMapPoint : { x: number; y: number; } & { [s: string]: number; }
- >{ q } : { q: number; }
-->q : number
-+>q : any
- >numMapPoint : { x: number; y: number; } & { [s: string]: number; }
- }
- 
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignment.types b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignment.types
index ea07cbda28..195608a688 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignment.types
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignment.types
@@ -14,8 +14,8 @@ var person: { name: string; id: number } = { name, id };
 >name : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function foo( obj:{ name: string }): void { };
 >foo : (obj: { name: string; }) => void
@@ -27,15 +27,15 @@ function bar(name: string, id: number) { return { name, id }; }
 >name : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function bar1(name: string, id: number) { return { name }; }
 >bar1 : (name: string, id: number) => { name: string; }
 >name : string
 >id : number
 >{ name } : { name: string; }
->name : any
+>name : string
 
 function baz(name: string, id: number): { name: string; id: number } { return { name, id }; }
 >baz : (name: string, id: number) => { name: string; id: number; }
@@ -44,8 +44,8 @@ function baz(name: string, id: number): { name: string; id: number } { return {
 >name : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 foo(person);
 >foo(person) : void
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignment.types.diff b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignment.types.diff
deleted file mode 100644
index 5a428385d9..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignment.types.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- old.objectLiteralShorthandPropertiesAssignment.types
-+++ new.objectLiteralShorthandPropertiesAssignment.types
-@@= skipped -13, +13 lines =@@
- >name : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function foo( obj:{ name: string }): void { };
- >foo : (obj: { name: string; }) => void
-@@= skipped -13, +13 lines =@@
- >name : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function bar1(name: string, id: number) { return { name }; }
- >bar1 : (name: string, id: number) => { name: string; }
- >name : string
- >id : number
- >{ name } : { name: string; }
-->name : string
-+>name : any
- 
- function baz(name: string, id: number): { name: string; id: number } { return { name, id }; }
- >baz : (name: string, id: number) => { name: string; id: number; }
-@@= skipped -17, +17 lines =@@
- >name : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- foo(person);
- >foo(person) : void
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentES6.types b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentES6.types
index 198c713b62..94f61adb39 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentES6.types
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentES6.types
@@ -14,8 +14,8 @@ var person: { name: string; id: number } = { name, id };
 >name : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function foo(obj: { name: string }): void { };
 >foo : (obj: { name: string; }) => void
@@ -27,15 +27,15 @@ function bar(name: string, id: number) { return { name, id }; }
 >name : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function bar1(name: string, id: number) { return { name }; }
 >bar1 : (name: string, id: number) => { name: string; }
 >name : string
 >id : number
 >{ name } : { name: string; }
->name : any
+>name : string
 
 function baz(name: string, id: number): { name: string; id: number } { return { name, id }; }
 >baz : (name: string, id: number) => { name: string; id: number; }
@@ -44,8 +44,8 @@ function baz(name: string, id: number): { name: string; id: number } { return {
 >name : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 foo(person);
 >foo(person) : void
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentES6.types.diff b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentES6.types.diff
deleted file mode 100644
index edbd9fc8fa..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentES6.types.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- old.objectLiteralShorthandPropertiesAssignmentES6.types
-+++ new.objectLiteralShorthandPropertiesAssignmentES6.types
-@@= skipped -13, +13 lines =@@
- >name : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function foo(obj: { name: string }): void { };
- >foo : (obj: { name: string; }) => void
-@@= skipped -13, +13 lines =@@
- >name : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function bar1(name: string, id: number) { return { name }; }
- >bar1 : (name: string, id: number) => { name: string; }
- >name : string
- >id : number
- >{ name } : { name: string; }
-->name : string
-+>name : any
- 
- function baz(name: string, id: number): { name: string; id: number } { return { name, id }; }
- >baz : (name: string, id: number) => { name: string; id: number; }
-@@= skipped -17, +17 lines =@@
- >name : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- foo(person);
- >foo(person) : void
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentError.types b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentError.types
index b70d45d6cf..a7bedbe7e9 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentError.types
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentError.types
@@ -14,8 +14,8 @@ var person: { b: string; id: number } = { name, id };  // error
 >b : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 var person1: { name, id };  // ok
 >person1 : { name: any; id: any; }
@@ -29,8 +29,8 @@ function foo(name: string, id: number): { id: string, name: number } { return {
 >id : string
 >name : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function bar(obj: { name: string; id: boolean }) { }
 >bar : (obj: { name: string; id: boolean; }) => void
@@ -42,7 +42,7 @@ bar({ name, id });  // error
 >bar({ name, id }) : void
 >bar : (obj: { name: string; id: boolean; }) => void
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentError.types.diff b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentError.types.diff
deleted file mode 100644
index b43ce9c066..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentError.types.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.objectLiteralShorthandPropertiesAssignmentError.types
-+++ new.objectLiteralShorthandPropertiesAssignmentError.types
-@@= skipped -13, +13 lines =@@
- >b : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- var person1: { name, id };  // ok
- >person1 : { name: any; id: any; }
-@@= skipped -15, +15 lines =@@
- >id : string
- >name : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function bar(obj: { name: string; id: boolean }) { }
- >bar : (obj: { name: string; id: boolean; }) => void
-@@= skipped -13, +13 lines =@@
- >bar({ name, id }) : void
- >bar : (obj: { name: string; id: boolean; }) => void
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- 
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
index 0999a46df3..02f082fe98 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
@@ -14,8 +14,8 @@ var person: { b: string; id: number } = { name, id };  // error
 >b : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function bar(name: string, id: number): { name: number, id: string } { return { name, id }; }  // error
 >bar : (name: string, id: number) => { name: number; id: string; }
@@ -24,8 +24,8 @@ function bar(name: string, id: number): { name: number, id: string } { return {
 >name : number
 >id : string
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function foo(name: string, id: number): { name: string, id: number } { return { name, id }; }  // error
 >foo : (name: string, id: number) => { name: string; id: number; }
@@ -34,8 +34,8 @@ function foo(name: string, id: number): { name: string, id: number } { return {
 >name : string
 >id : number
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 var person1: { name, id }; // ok
 >person1 : { name: any; id: any; }
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types.diff b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types.diff
deleted file mode 100644
index ab341e66e4..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- old.objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
-+++ new.objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.types
-@@= skipped -13, +13 lines =@@
- >b : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function bar(name: string, id: number): { name: number, id: string } { return { name, id }; }  // error
- >bar : (name: string, id: number) => { name: number; id: string; }
-@@= skipped -10, +10 lines =@@
- >name : number
- >id : string
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function foo(name: string, id: number): { name: string, id: number } { return { name, id }; }  // error
- >foo : (name: string, id: number) => { name: string; id: number; }
-@@= skipped -10, +10 lines =@@
- >name : string
- >id : number
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- var person1: { name, id }; // ok
- >person1 : { name: any; id: any; }
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types
index 92eb0bf8a6..037e353958 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types
@@ -25,7 +25,7 @@ module n {
 >{        m.x  // error    } : { m: typeof m; : any; }
 
         m.x  // error
->m : any
+>m : typeof m
 > : any
 >.x : any
 > : any
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types.diff b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types.diff
index bdaacbb97d..ef8fd606da 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesErrorWithModule.types.diff
@@ -10,8 +10,4 @@
 +>{        m.x  // error    } : { m: typeof m; : any; }
  
          m.x  // error
-->m : typeof m
-+>m : any
- > : any
- >.x : any
- > : any
+ >m : typeof m
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument.types b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument.types
index df6bfa67b0..1af5e8ad7c 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument.types
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument.types
@@ -12,8 +12,8 @@ var name: string = "my name";
 var person = { name, id };
 >person : { name: string; id: number; }
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function foo(p: { name: string; id: number }) { }
 >foo : (p: { name: string; id: number; }) => void
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument.types.diff b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument.types.diff
deleted file mode 100644
index 97be4a88b0..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument.types.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.objectLiteralShorthandPropertiesFunctionArgument.types
-+++ new.objectLiteralShorthandPropertiesFunctionArgument.types
-@@= skipped -11, +11 lines =@@
- var person = { name, id };
- >person : { name: string; id: number; }
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function foo(p: { name: string; id: number }) { }
- >foo : (p: { name: string; id: number; }) => void
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument2.types b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument2.types
index 4237aba0aa..68ce32813d 100644
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument2.types
+++ b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument2.types
@@ -12,8 +12,8 @@ var name: string = "my name";
 var person = { name, id };
 >person : { name: string; id: number; }
 >{ name, id } : { name: string; id: number; }
->name : any
->id : any
+>name : string
+>id : number
 
 function foo(p: { a: string; id: number }) { }
 >foo : (p: { a: string; id: number; }) => void
diff --git a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument2.types.diff b/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument2.types.diff
deleted file mode 100644
index 5106a4ebab..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectLiteralShorthandPropertiesFunctionArgument2.types.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.objectLiteralShorthandPropertiesFunctionArgument2.types
-+++ new.objectLiteralShorthandPropertiesFunctionArgument2.types
-@@= skipped -11, +11 lines =@@
- var person = { name, id };
- >person : { name: string; id: number; }
- >{ name, id } : { name: string; id: number; }
-->name : string
-->id : number
-+>name : any
-+>id : any
- 
- function foo(p: { a: string; id: number }) { }
- >foo : (p: { a: string; id: number; }) => void
diff --git a/testdata/baselines/reference/submodule/conformance/objectRest.types b/testdata/baselines/reference/submodule/conformance/objectRest.types
index 0929ff3bff..70742d0982 100644
--- a/testdata/baselines/reference/submodule/conformance/objectRest.types
+++ b/testdata/baselines/reference/submodule/conformance/objectRest.types
@@ -122,7 +122,7 @@ var { x, ...fresh } = { x: 1, y: 2 };
 >({ x, ...fresh } = { x: 1, y: 2 }) : { x: number; y: number; }
 >{ x, ...fresh } = { x: 1, y: 2 } : { x: number; y: number; }
 >{ x, ...fresh } : { y: number; x: number; }
->x : any
+>x : number
 >fresh : { y: number; }
 >{ x: 1, y: 2 } : { x: number; y: number; }
 >x : number
diff --git a/testdata/baselines/reference/submodule/conformance/objectRest.types.diff b/testdata/baselines/reference/submodule/conformance/objectRest.types.diff
index 1cdfd0957a..7e282cc946 100644
--- a/testdata/baselines/reference/submodule/conformance/objectRest.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/objectRest.types.diff
@@ -1,15 +1,6 @@
 --- old.objectRest.types
 +++ new.objectRest.types
-@@= skipped -121, +121 lines =@@
- >({ x, ...fresh } = { x: 1, y: 2 }) : { x: number; y: number; }
- >{ x, ...fresh } = { x: 1, y: 2 } : { x: number; y: number; }
- >{ x, ...fresh } : { y: number; x: number; }
-->x : number
-+>x : any
- >fresh : { y: number; }
- >{ x: 1, y: 2 } : { x: number; y: number; }
- >x : number
-@@= skipped -39, +39 lines =@@
+@@= skipped -160, +160 lines =@@
  >remainder : string
  }
  interface I {
diff --git a/testdata/baselines/reference/submodule/conformance/objectRestAssignment.types b/testdata/baselines/reference/submodule/conformance/objectRestAssignment.types
index 8c2a565fb9..ca52bef799 100644
--- a/testdata/baselines/reference/submodule/conformance/objectRestAssignment.types
+++ b/testdata/baselines/reference/submodule/conformance/objectRestAssignment.types
@@ -70,7 +70,7 @@ var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
 >y : { ka: string; x: string; }[]
 >b : { ki: string; ku: string; z: string; }
 >{ z, ...c } : { ki: string; ku: string; z: string; }
->z : any
+>z : string
 >c : { ki: string; ku: string; }
 >rest2 : { ke: string; ko: string; }
 >overEmit : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/objectRestAssignment.types.diff b/testdata/baselines/reference/submodule/conformance/objectRestAssignment.types.diff
deleted file mode 100644
index f4ced04ade..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectRestAssignment.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.objectRestAssignment.types
-+++ new.objectRestAssignment.types
-@@= skipped -69, +69 lines =@@
- >y : { ka: string; x: string; }[]
- >b : { ki: string; ku: string; z: string; }
- >{ z, ...c } : { ki: string; ku: string; z: string; }
-->z : string
-+>z : any
- >c : { ki: string; ku: string; }
- >rest2 : { ke: string; ko: string; }
- >overEmit : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/objectRestNegative.types b/testdata/baselines/reference/submodule/conformance/objectRestNegative.types
index 2d889191a1..5742f46432 100644
--- a/testdata/baselines/reference/submodule/conformance/objectRestNegative.types
+++ b/testdata/baselines/reference/submodule/conformance/objectRestNegative.types
@@ -25,7 +25,7 @@ let notAssignable: { a: string };
 >({ b, ...notAssignable } = o) : { a: number; b: string; }
 >{ b, ...notAssignable } = o : { a: number; b: string; }
 >{ b, ...notAssignable } : { a: string; b: string; }
->b : any
+>b : string
 >notAssignable : { a: string; }
 >o : { a: number; b: string; }
 
@@ -61,7 +61,7 @@ let rest: { b: string }
 >({a, ...rest.b + rest.b} = o) : { a: number; b: string; }
 >{a, ...rest.b + rest.b} = o : { a: number; b: string; }
 >{a, ...rest.b + rest.b} : any
->a : any
+>a : number
 >rest.b + rest.b : string
 >rest.b : string
 >rest : { b: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/objectRestNegative.types.diff b/testdata/baselines/reference/submodule/conformance/objectRestNegative.types.diff
index a55cf44863..8cb87e3f1f 100644
--- a/testdata/baselines/reference/submodule/conformance/objectRestNegative.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/objectRestNegative.types.diff
@@ -1,13 +1,6 @@
 --- old.objectRestNegative.types
 +++ new.objectRestNegative.types
-@@= skipped -24, +24 lines =@@
- >({ b, ...notAssignable } = o) : { a: number; b: string; }
- >{ b, ...notAssignable } = o : { a: number; b: string; }
- >{ b, ...notAssignable } : { a: string; b: string; }
-->b : string
-+>b : any
- >notAssignable : { a: string; }
- >o : { a: number; b: string; }
+@@= skipped -30, +30 lines =@@
  
  
  function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
@@ -16,7 +9,7 @@
  >mustBeLast : { b: string; }
  >a : number
  >a : number
-@@= skipped -14, +14 lines =@@
+@@= skipped -8, +8 lines =@@
  }
  function generic<T extends { x, y }>(t: T) {
  >generic : <T extends { x: any; y: any; }>(t: T) => Omit<T, "x">
@@ -24,12 +17,3 @@
  >x : any
  >y : any
  >t : T
-@@= skipped -21, +22 lines =@@
- >({a, ...rest.b + rest.b} = o) : { a: number; b: string; }
- >{a, ...rest.b + rest.b} = o : { a: number; b: string; }
- >{a, ...rest.b + rest.b} : any
-->a : number
-+>a : any
- >rest.b + rest.b : string
- >rest.b : string
- >rest : { b: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/objectRestPropertyMustBeLast.types b/testdata/baselines/reference/submodule/conformance/objectRestPropertyMustBeLast.types
index 3de0d9d0b2..c2ee24be4f 100644
--- a/testdata/baselines/reference/submodule/conformance/objectRestPropertyMustBeLast.types
+++ b/testdata/baselines/reference/submodule/conformance/objectRestPropertyMustBeLast.types
@@ -13,7 +13,7 @@ var {...a, x } = { x: 1 };    // Error, rest must be last property
 >{...a, x } = { x: 1 } : { x: number; }
 >{...a, x } : { x: number; }
 >a : {}
->x : any
+>x : number
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : 1
@@ -31,7 +31,7 @@ var {...a, x, ...b } = { x: 1 };    // Error, rest must be last property
 >{...a, x, ...b } = { x: 1 } : { x: number; }
 >{...a, x, ...b } : { x: number; }
 >a : {}
->x : any
+>x : number
 >b : {}
 >{ x: 1 } : { x: number; }
 >x : number
diff --git a/testdata/baselines/reference/submodule/conformance/objectRestPropertyMustBeLast.types.diff b/testdata/baselines/reference/submodule/conformance/objectRestPropertyMustBeLast.types.diff
deleted file mode 100644
index c5526c5a0a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/objectRestPropertyMustBeLast.types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.objectRestPropertyMustBeLast.types
-+++ new.objectRestPropertyMustBeLast.types
-@@= skipped -12, +12 lines =@@
- >{...a, x } = { x: 1 } : { x: number; }
- >{...a, x } : { x: number; }
- >a : {}
-->x : number
-+>x : any
- >{ x: 1 } : { x: number; }
- >x : number
- >1 : 1
-@@= skipped -18, +18 lines =@@
- >{...a, x, ...b } = { x: 1 } : { x: number; }
- >{...a, x, ...b } : { x: number; }
- >a : {}
-->x : number
-+>x : any
- >b : {}
- >{ x: 1 } : { x: number; }
- >x : number
diff --git a/testdata/baselines/reference/submodule/conformance/objectSpread.types b/testdata/baselines/reference/submodule/conformance/objectSpread.types
index 4d8db39268..c00e771d9b 100644
--- a/testdata/baselines/reference/submodule/conformance/objectSpread.types
+++ b/testdata/baselines/reference/submodule/conformance/objectSpread.types
@@ -197,7 +197,7 @@ function from16326(this: { header: Header }, header: Header, authToken: string):
 >authToken && { authToken } : "" | { authToken: string; }
 >authToken : string
 >{ authToken } : { authToken: string; }
->authToken : any
+>authToken : string
     }
 }
 // boolean && T results in Partial<T>
@@ -480,7 +480,7 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 >b : string
 >{ ...o, a } : { b: string; a: number; }
 >o : { a: number; b: string; }
->a : any
+>a : number
 
 // non primitive
 let spreadNonPrimitive = { ...<object>{}};
diff --git a/testdata/baselines/reference/submodule/conformance/objectSpread.types.diff b/testdata/baselines/reference/submodule/conformance/objectSpread.types.diff
index 017721b604..4552e044cf 100644
--- a/testdata/baselines/reference/submodule/conformance/objectSpread.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/objectSpread.types.diff
@@ -84,16 +84,7 @@
  
          ...this.header,
  >this.header : Header
-@@= skipped -21, +21 lines =@@
- >authToken && { authToken } : "" | { authToken: string; }
- >authToken : string
- >{ authToken } : { authToken: string; }
-->authToken : string
-+>authToken : any
-     }
- }
- // boolean && T results in Partial<T>
-@@= skipped -157, +157 lines =@@
+@@= skipped -178, +178 lines =@@
  
  // own methods are enumerable
  let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
@@ -202,11 +193,8 @@
 ->{ ...o, a } : { a: number; b: string; }
 +>{ ...o, a } : { b: string; a: number; }
  >o : { a: number; b: string; }
-->a : number
-+>a : any
+ >a : number
  
- // non primitive
- let spreadNonPrimitive = { ...<object>{}};
 @@= skipped -15, +15 lines =@@
  
  function f<T, U>(t: T, u: U) {
diff --git a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types
index 76b9d89de9..07652106b6 100644
--- a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types
+++ b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types
@@ -34,7 +34,7 @@ var obj1 = {
 >oct1 : number
 
     oct1,
->oct1 : any
+>oct1 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
 >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
@@ -58,7 +58,7 @@ var obj2 = {
 >oct2 : number
 
     oct2,
->oct2 : any
+>oct2 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
 >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
diff --git a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types.diff b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types.diff
index bf4bb05d0f..b35f81ae16 100644
--- a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteral.types.diff
@@ -11,16 +11,7 @@
  
      0o45436: "Hello",
  >0o45436 : string
-@@= skipped -16, +16 lines =@@
- >oct1 : number
- 
-     oct1,
-->oct1 : number
-+>oct1 : any
- 
-     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
- >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
-@@= skipped -8, +8 lines =@@
+@@= skipped -24, +24 lines =@@
  }
  
  var obj2 = {
@@ -31,16 +22,7 @@
  
      0O45436: "hi",
  >0O45436 : string
-@@= skipped -16, +16 lines =@@
- >oct2 : number
- 
-     oct2,
-->oct2 : number
-+>oct2 : any
- 
-     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
- >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
-@@= skipped -9, +9 lines =@@
+@@= skipped -25, +25 lines =@@
  
  obj1[0o45436];     // string
  >obj1[0o45436] : string
diff --git a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types
index 122ce49ab9..4452ebc3ce 100644
--- a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types
+++ b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types
@@ -34,7 +34,7 @@ var obj1 = {
 >oct1 : number
 
     oct1,
->oct1 : any
+>oct1 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
 >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
@@ -58,7 +58,7 @@ var obj2 = {
 >oct2 : number
 
     oct2,
->oct2 : any
+>oct2 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
 >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
diff --git a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types.diff b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types.diff
index 872745de96..9468e60d2a 100644
--- a/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/octalIntegerLiteralES6.types.diff
@@ -11,16 +11,7 @@
  
      0o45436: "Hello",
  >0o45436 : string
-@@= skipped -16, +16 lines =@@
- >oct1 : number
- 
-     oct1,
-->oct1 : number
-+>oct1 : any
- 
-     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
- >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
-@@= skipped -8, +8 lines =@@
+@@= skipped -24, +24 lines =@@
  }
  
  var obj2 = {
@@ -31,16 +22,7 @@
  
      0O45436: "hi",
  >0O45436 : string
-@@= skipped -16, +16 lines =@@
- >oct2 : number
- 
-     oct2,
-->oct2 : number
-+>oct2 : any
- 
-     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
- >0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
-@@= skipped -9, +9 lines =@@
+@@= skipped -25, +25 lines =@@
  
  obj1[0o45436];     // string
  >obj1[0o45436] : string
diff --git a/testdata/baselines/reference/submodule/conformance/parserShorthandPropertyAssignment5.types b/testdata/baselines/reference/submodule/conformance/parserShorthandPropertyAssignment5.types
index c0672bb03c..dea186a71e 100644
--- a/testdata/baselines/reference/submodule/conformance/parserShorthandPropertyAssignment5.types
+++ b/testdata/baselines/reference/submodule/conformance/parserShorthandPropertyAssignment5.types
@@ -8,5 +8,5 @@ var greet = "hello";
 var obj = { greet? }; 
 >obj : { greet: string; }
 >{ greet? } : { greet: string; }
->greet : any
+>greet : string
 
diff --git a/testdata/baselines/reference/submodule/conformance/parserShorthandPropertyAssignment5.types.diff b/testdata/baselines/reference/submodule/conformance/parserShorthandPropertyAssignment5.types.diff
deleted file mode 100644
index 0b4b88c731..0000000000
--- a/testdata/baselines/reference/submodule/conformance/parserShorthandPropertyAssignment5.types.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.parserShorthandPropertyAssignment5.types
-+++ new.parserShorthandPropertyAssignment5.types
-@@= skipped -7, +7 lines =@@
- var obj = { greet? }; 
- >obj : { greet: string; }
- >{ greet? } : { greet: string; }
-->greet : string
-+>greet : any
- 
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2015).types b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2015).types
index b8669d1cf5..f4ffb8b7fa 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2015).types
@@ -42,7 +42,7 @@ class A {
 >x : number
 >this.#field : number
 >this : this
->y : any
+>y : number
 >this.testObject() : { x: number; y: number; }
 >this.testObject : () => { x: number; y: number; }
 >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2015).types.diff
deleted file mode 100644
index dd5faa9f42..0000000000
--- a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2015).types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.privateNameFieldDestructuredBinding(target=es2015).types
-+++ new.privateNameFieldDestructuredBinding(target=es2015).types
-@@= skipped -41, +41 lines =@@
- >x : number
- >this.#field : number
- >this : this
-->y : number
-+>y : any
- >this.testObject() : { x: number; y: number; }
- >this.testObject : () => { x: number; y: number; }
- >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2022).types b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2022).types
index b8669d1cf5..f4ffb8b7fa 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2022).types
+++ b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2022).types
@@ -42,7 +42,7 @@ class A {
 >x : number
 >this.#field : number
 >this : this
->y : any
+>y : number
 >this.testObject() : { x: number; y: number; }
 >this.testObject : () => { x: number; y: number; }
 >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2022).types.diff b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2022).types.diff
deleted file mode 100644
index d4a2b44277..0000000000
--- a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=es2022).types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.privateNameFieldDestructuredBinding(target=es2022).types
-+++ new.privateNameFieldDestructuredBinding(target=es2022).types
-@@= skipped -41, +41 lines =@@
- >x : number
- >this.#field : number
- >this : this
-->y : number
-+>y : any
- >this.testObject() : { x: number; y: number; }
- >this.testObject : () => { x: number; y: number; }
- >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=esnext).types b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=esnext).types
index b8669d1cf5..f4ffb8b7fa 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=esnext).types
@@ -42,7 +42,7 @@ class A {
 >x : number
 >this.#field : number
 >this : this
->y : any
+>y : number
 >this.testObject() : { x: number; y: number; }
 >this.testObject : () => { x: number; y: number; }
 >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=esnext).types.diff
deleted file mode 100644
index 1c8ac04a4d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/privateNameFieldDestructuredBinding(target=esnext).types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.privateNameFieldDestructuredBinding(target=esnext).types
-+++ new.privateNameFieldDestructuredBinding(target=esnext).types
-@@= skipped -41, +41 lines =@@
- >x : number
- >this.#field : number
- >this : this
-->y : number
-+>y : any
- >this.testObject() : { x: number; y: number; }
- >this.testObject : () => { x: number; y: number; }
- >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types
index 3efd03a5b1..b4e2dbbb59 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types
@@ -41,7 +41,7 @@ class A {
 >x : number
 >A.#field : number
 >A : typeof A
->y : any
+>y : number
 >this.testObject() : { x: number; y: number; }
 >this.testObject : () => { x: number; y: number; }
 >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types.diff
index d2021e505e..d80c0e1074 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2015).types.diff
@@ -1,15 +1,6 @@
 --- old.privateNameStaticFieldDestructuredBinding(target=es2015).types
 +++ new.privateNameStaticFieldDestructuredBinding(target=es2015).types
-@@= skipped -40, +40 lines =@@
- >x : number
- >A.#field : number
- >A : typeof A
-->y : number
-+>y : any
- >this.testObject() : { x: number; y: number; }
- >this.testObject : () => { x: number; y: number; }
- >this : this
-@@= skipped -91, +91 lines =@@
+@@= skipped -131, +131 lines =@@
      static test(_a: typeof A) {
  >test : (_a: typeof A) => void
  >_a : typeof A
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types
index 3efd03a5b1..b4e2dbbb59 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types
+++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types
@@ -41,7 +41,7 @@ class A {
 >x : number
 >A.#field : number
 >A : typeof A
->y : any
+>y : number
 >this.testObject() : { x: number; y: number; }
 >this.testObject : () => { x: number; y: number; }
 >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types.diff b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types.diff
index ce3651e3cf..3634ee11d0 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=es2022).types.diff
@@ -1,15 +1,6 @@
 --- old.privateNameStaticFieldDestructuredBinding(target=es2022).types
 +++ new.privateNameStaticFieldDestructuredBinding(target=es2022).types
-@@= skipped -40, +40 lines =@@
- >x : number
- >A.#field : number
- >A : typeof A
-->y : number
-+>y : any
- >this.testObject() : { x: number; y: number; }
- >this.testObject : () => { x: number; y: number; }
- >this : this
-@@= skipped -91, +91 lines =@@
+@@= skipped -131, +131 lines =@@
      static test(_a: typeof A) {
  >test : (_a: typeof A) => void
  >_a : typeof A
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types
index 3efd03a5b1..b4e2dbbb59 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types
@@ -41,7 +41,7 @@ class A {
 >x : number
 >A.#field : number
 >A : typeof A
->y : any
+>y : number
 >this.testObject() : { x: number; y: number; }
 >this.testObject : () => { x: number; y: number; }
 >this : this
diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types.diff
index 9374d09de5..9c555bee53 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticFieldDestructuredBinding(target=esnext).types.diff
@@ -1,15 +1,6 @@
 --- old.privateNameStaticFieldDestructuredBinding(target=esnext).types
 +++ new.privateNameStaticFieldDestructuredBinding(target=esnext).types
-@@= skipped -40, +40 lines =@@
- >x : number
- >A.#field : number
- >A : typeof A
-->y : number
-+>y : any
- >this.testObject() : { x: number; y: number; }
- >this.testObject : () => { x: number; y: number; }
- >this : this
-@@= skipped -91, +91 lines =@@
+@@= skipped -131, +131 lines =@@
      static test(_a: typeof A) {
  >test : (_a: typeof A) => void
  >_a : typeof A
diff --git a/testdata/baselines/reference/submodule/conformance/privateWriteOnlyAccessorRead.types b/testdata/baselines/reference/submodule/conformance/privateWriteOnlyAccessorRead.types
index 7bdb7736d6..4119fe079c 100644
--- a/testdata/baselines/reference/submodule/conformance/privateWriteOnlyAccessorRead.types
+++ b/testdata/baselines/reference/submodule/conformance/privateWriteOnlyAccessorRead.types
@@ -44,14 +44,14 @@ class Test {
 >this.#value : { foo: { bar: number; }; }
 >this : this
 >{ foo } : { foo: { bar: number; }; }
->foo : any
+>foo : { bar: number; }
 
     this.#value = { foo }; // ok
 >this.#value = { foo } : { foo: { bar: number; }; }
 >this.#value : { foo: { bar: number; }; }
 >this : this
 >{ foo } : { foo: { bar: number; }; }
->foo : any
+>foo : { bar: number; }
 
     this.#value.foo = foo; // error
 >this.#value.foo = foo : { bar: number; }
@@ -71,7 +71,7 @@ class Test {
 >{ o: { foo } } : { o: { foo: { bar: number; }; }; }
 >o : { foo: { bar: number; }; }
 >{ foo } : { foo: { bar: number; }; }
->foo : any
+>foo : { bar: number; }
 
     ({ ...this.#value } = { foo }); //ok
 >({ ...this.#value } = { foo }) : { foo: { bar: number; }; }
@@ -80,7 +80,7 @@ class Test {
 >this.#value : { foo: { bar: number; }; }
 >this : this
 >{ foo } : { foo: { bar: number; }; }
->foo : any
+>foo : { bar: number; }
 
     ({ foo: this.#value.foo } = { foo }); //error
 >({ foo: this.#value.foo } = { foo }) : { foo: { bar: number; }; }
@@ -92,7 +92,7 @@ class Test {
 >this : this
 >foo : { bar: number; }
 >{ foo } : { foo: { bar: number; }; }
->foo : any
+>foo : { bar: number; }
 
     ({
 >({      foo: { ...this.#value.foo },    } = { foo }) : { foo: { bar: number; }; }
@@ -109,7 +109,7 @@ class Test {
 
     } = { foo }); //error
 >{ foo } : { foo: { bar: number; }; }
->foo : any
+>foo : { bar: number; }
 
     let r = { o: this.#value }; //error
 >r : { o: { foo: { bar: number; }; }; }
diff --git a/testdata/baselines/reference/submodule/conformance/privateWriteOnlyAccessorRead.types.diff b/testdata/baselines/reference/submodule/conformance/privateWriteOnlyAccessorRead.types.diff
deleted file mode 100644
index 77cc642884..0000000000
--- a/testdata/baselines/reference/submodule/conformance/privateWriteOnlyAccessorRead.types.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- old.privateWriteOnlyAccessorRead.types
-+++ new.privateWriteOnlyAccessorRead.types
-@@= skipped -43, +43 lines =@@
- >this.#value : { foo: { bar: number; }; }
- >this : this
- >{ foo } : { foo: { bar: number; }; }
-->foo : { bar: number; }
-+>foo : any
- 
-     this.#value = { foo }; // ok
- >this.#value = { foo } : { foo: { bar: number; }; }
- >this.#value : { foo: { bar: number; }; }
- >this : this
- >{ foo } : { foo: { bar: number; }; }
-->foo : { bar: number; }
-+>foo : any
- 
-     this.#value.foo = foo; // error
- >this.#value.foo = foo : { bar: number; }
-@@= skipped -27, +27 lines =@@
- >{ o: { foo } } : { o: { foo: { bar: number; }; }; }
- >o : { foo: { bar: number; }; }
- >{ foo } : { foo: { bar: number; }; }
-->foo : { bar: number; }
-+>foo : any
- 
-     ({ ...this.#value } = { foo }); //ok
- >({ ...this.#value } = { foo }) : { foo: { bar: number; }; }
-@@= skipped -9, +9 lines =@@
- >this.#value : { foo: { bar: number; }; }
- >this : this
- >{ foo } : { foo: { bar: number; }; }
-->foo : { bar: number; }
-+>foo : any
- 
-     ({ foo: this.#value.foo } = { foo }); //error
- >({ foo: this.#value.foo } = { foo }) : { foo: { bar: number; }; }
-@@= skipped -12, +12 lines =@@
- >this : this
- >foo : { bar: number; }
- >{ foo } : { foo: { bar: number; }; }
-->foo : { bar: number; }
-+>foo : any
- 
-     ({
- >({      foo: { ...this.#value.foo },    } = { foo }) : { foo: { bar: number; }; }
-@@= skipped -17, +17 lines =@@
- 
-     } = { foo }); //error
- >{ foo } : { foo: { bar: number; }; }
-->foo : { bar: number; }
-+>foo : any
- 
-     let r = { o: this.#value }; //error
- >r : { o: { foo: { bar: number; }; }; }
diff --git a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern2.types b/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern2.types
index 9f5598cc08..42cc073c0f 100644
--- a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern2.types
+++ b/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern2.types
@@ -14,7 +14,7 @@ var a: string, b: number;
 >a = "" : ""
 >a : string
 >"" : ""
->b : any
+>b : number
 >["", 1] : (string | number)[]
 >"" : ""
 >1 : 1
diff --git a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern2.types.diff b/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern2.types.diff
deleted file mode 100644
index 6b31c46d25..0000000000
--- a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern2.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.restElementWithAssignmentPattern2.types
-+++ new.restElementWithAssignmentPattern2.types
-@@= skipped -13, +13 lines =@@
- >a = "" : ""
- >a : string
- >"" : ""
-->b : number
-+>b : any
- >["", 1] : (string | number)[]
- >"" : ""
- >1 : 1
diff --git a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern4.types b/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern4.types
index 9340fc74c2..279fc3a12a 100644
--- a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern4.types
+++ b/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern4.types
@@ -20,6 +20,6 @@ var tuple: [string, number] = ["", 1];
 >a = "" : ""
 >a : string
 >"" : ""
->b : any
+>b : number
 >tuple : [string, number]
 
diff --git a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern4.types.diff b/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern4.types.diff
deleted file mode 100644
index 02cbbeb219..0000000000
--- a/testdata/baselines/reference/submodule/conformance/restElementWithAssignmentPattern4.types.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.restElementWithAssignmentPattern4.types
-+++ new.restElementWithAssignmentPattern4.types
-@@= skipped -19, +19 lines =@@
- >a = "" : ""
- >a : string
- >"" : ""
-->b : number
-+>b : any
- >tuple : [string, number]
- 
diff --git a/testdata/baselines/reference/submodule/conformance/thisTag1.types b/testdata/baselines/reference/submodule/conformance/thisTag1.types
index 9392f3bf18..8b5ae4145d 100644
--- a/testdata/baselines/reference/submodule/conformance/thisTag1.types
+++ b/testdata/baselines/reference/submodule/conformance/thisTag1.types
@@ -24,7 +24,7 @@ const o = {
 >{    f,    n: 1} : { f: (s: any) => any; n: number; }
 
     f,
->f : any
+>f : (s: any) => any
 
     n: 1
 >n : number
diff --git a/testdata/baselines/reference/submodule/conformance/thisTag1.types.diff b/testdata/baselines/reference/submodule/conformance/thisTag1.types.diff
index 5533e69590..b516e2cef8 100644
--- a/testdata/baselines/reference/submodule/conformance/thisTag1.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/thisTag1.types.diff
@@ -34,7 +34,7 @@
  
      f,
 ->f : (this: { n: number; }, s: string) => number
-+>f : any
++>f : (s: any) => any
  
      n: 1
  >n : number
diff --git a/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types b/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types
index bf14594260..d6deac4802 100644
--- a/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types
+++ b/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types
@@ -238,7 +238,7 @@ let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, ex
 >{ y: 12, explicitStructural } : { y: number; explicitStructural: (x: number) => number; }
 >y : number
 >12 : 12
->explicitStructural : any
+>explicitStructural : (x: number) => number
 
 let wrongPropertyType: {y: string, f: (this: { y: number }, x: number) => number} = { y: 'foo', explicitStructural };
 >wrongPropertyType : { y: string; f: (x: number) => number; }
@@ -250,7 +250,7 @@ let wrongPropertyType: {y: string, f: (this: { y: number }, x: number) => number
 >{ y: 'foo', explicitStructural } : { y: string; explicitStructural: (x: number) => number; }
 >y : string
 >'foo' : "foo"
->explicitStructural : any
+>explicitStructural : (x: number) => number
 
 let wrongPropertyName: {wrongName: number, f: (this: { y: number }, x: number) => number} = { wrongName: 12, explicitStructural };
 >wrongPropertyName : { wrongName: number; f: (x: number) => number; }
@@ -262,7 +262,7 @@ let wrongPropertyName: {wrongName: number, f: (this: { y: number }, x: number) =
 >{ wrongName: 12, explicitStructural } : { wrongName: number; explicitStructural: (x: number) => number; }
 >wrongName : number
 >12 : 12
->explicitStructural : any
+>explicitStructural : (x: number) => number
 
 ok.f(); // not enough arguments
 >ok.f() : number
diff --git a/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types.diff b/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types.diff
index 835a6d529f..6a8d184986 100644
--- a/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/thisTypeInFunctionsNegative.types.diff
@@ -185,7 +185,7 @@
  >y : number
  >12 : 12
 ->explicitStructural : (this: { y: number; }, x: number) => number
-+>explicitStructural : any
++>explicitStructural : (x: number) => number
  
  let wrongPropertyType: {y: string, f: (this: { y: number }, x: number) => number} = { y: 'foo', explicitStructural };
 ->wrongPropertyType : { y: string; f: (this: { y: number; }, x: number) => number; }
@@ -201,7 +201,7 @@
  >y : string
  >'foo' : "foo"
 ->explicitStructural : (this: { y: number; }, x: number) => number
-+>explicitStructural : any
++>explicitStructural : (x: number) => number
  
  let wrongPropertyName: {wrongName: number, f: (this: { y: number }, x: number) => number} = { wrongName: 12, explicitStructural };
 ->wrongPropertyName : { wrongName: number; f: (this: { y: number; }, x: number) => number; }
@@ -217,7 +217,7 @@
  >wrongName : number
  >12 : 12
 ->explicitStructural : (this: { y: number; }, x: number) => number
-+>explicitStructural : any
++>explicitStructural : (x: number) => number
  
  ok.f(); // not enough arguments
  >ok.f() : number
diff --git a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types
index bb66d9210e..00c2d0513d 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types
@@ -193,7 +193,7 @@ export function T11(a: any, b: any, c: any, d: any) {
 >className : any
 >"T11" : "T11"
 >{ __proto__ } : { __proto__: string; }
->__proto__ : any
+>__proto__ : string
 >div : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types.diff
index 3cdaa023ad..73047bdee6 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2015).types.diff
@@ -132,8 +132,4 @@
 +>className : any
  >"T11" : "T11"
  >{ __proto__ } : { __proto__: string; }
-->__proto__ : string
-+>__proto__ : any
- >div : any
- }
- 
+ >__proto__ : string
diff --git a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types
index bb66d9210e..00c2d0513d 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types
+++ b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types
@@ -193,7 +193,7 @@ export function T11(a: any, b: any, c: any, d: any) {
 >className : any
 >"T11" : "T11"
 >{ __proto__ } : { __proto__: string; }
->__proto__ : any
+>__proto__ : string
 >div : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types.diff b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types.diff
index 6deacc656f..e6afe76972 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=es2018).types.diff
@@ -132,8 +132,4 @@
 +>className : any
  >"T11" : "T11"
  >{ __proto__ } : { __proto__: string; }
-->__proto__ : string
-+>__proto__ : any
- >div : any
- }
- 
+ >__proto__ : string
diff --git a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types
index bb66d9210e..00c2d0513d 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types
@@ -193,7 +193,7 @@ export function T11(a: any, b: any, c: any, d: any) {
 >className : any
 >"T11" : "T11"
 >{ __proto__ } : { __proto__: string; }
->__proto__ : any
+>__proto__ : string
 >div : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types.diff
index 58ff46e025..d0bcbfcdff 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/tsxEmitSpreadAttribute(target=esnext).types.diff
@@ -132,8 +132,4 @@
 +>className : any
  >"T11" : "T11"
  >{ __proto__ } : { __proto__: string; }
-->__proto__ : string
-+>__proto__ : any
- >div : any
- }
- 
+ >__proto__ : string
diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types
index d3d70835ac..b1dd44bb48 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types
@@ -205,7 +205,7 @@ export function T12(a: any, b: any, c: any, d: any) {
 >className : any
 >"T12" : "T12"
 >{ __proto__ } : { __proto__: string; }
->__proto__ : any
+>__proto__ : string
 >div : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types.diff
index 07081daa2b..268a350cd7 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2015).types.diff
@@ -233,8 +233,4 @@
 +>className : any
  >"T12" : "T12"
  >{ __proto__ } : { __proto__: string; }
-->__proto__ : string
-+>__proto__ : any
- >div : any
- }
- 
+ >__proto__ : string
diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types
index d3d70835ac..b1dd44bb48 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types
+++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types
@@ -205,7 +205,7 @@ export function T12(a: any, b: any, c: any, d: any) {
 >className : any
 >"T12" : "T12"
 >{ __proto__ } : { __proto__: string; }
->__proto__ : any
+>__proto__ : string
 >div : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types.diff b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types.diff
index 6fe2d6d0c4..2b9d9de2f0 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=es2018).types.diff
@@ -233,8 +233,4 @@
 +>className : any
  >"T12" : "T12"
  >{ __proto__ } : { __proto__: string; }
-->__proto__ : string
-+>__proto__ : any
- >div : any
- }
- 
+ >__proto__ : string
diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types
index d3d70835ac..b1dd44bb48 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types
@@ -205,7 +205,7 @@ export function T12(a: any, b: any, c: any, d: any) {
 >className : any
 >"T12" : "T12"
 >{ __proto__ } : { __proto__: string; }
->__proto__ : any
+>__proto__ : string
 >div : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types.diff
index 171e1398f9..b29b90d92f 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/tsxReactEmitSpreadAttribute(target=esnext).types.diff
@@ -233,8 +233,4 @@
 +>className : any
  >"T12" : "T12"
  >{ __proto__ } : { __proto__: string; }
-->__proto__ : string
-+>__proto__ : any
- >div : any
- }
- 
+ >__proto__ : string
diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types
index 5d4b41eb5a..e7c94c9642 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types
+++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types
@@ -35,7 +35,7 @@ function Baz<T,U>(key1: T, value: U) {
 ><ComponentWithTwoAttributes {...{key1, value: value}} key="Component" /> : any
 >ComponentWithTwoAttributes : <K, V>(l: { key1: K; value: V; }) => Element
 >{key1, value: value} : { key1: T; value: U; }
->key1 : any
+>key1 : T
 >value : U
 >value : U
 >key : any
diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types.diff
index a2b6664248..d0c0eca6a4 100644
--- a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments1.types.diff
@@ -46,8 +46,7 @@
 +><ComponentWithTwoAttributes {...{key1, value: value}} key="Component" /> : any
 +>ComponentWithTwoAttributes : <K, V>(l: { key1: K; value: V; }) => Element
  >{key1, value: value} : { key1: T; value: U; }
-->key1 : T
-+>key1 : any
+ >key1 : T
  >value : U
  >value : U
 ->key : string
diff --git a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types
index f9c50450c7..d64a6c7876 100644
--- a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types
+++ b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types
@@ -116,7 +116,7 @@ else if (b.isFollower()) {
 var holder2 = {a};
 >holder2 : { a: RoyalGuard; }
 >{a} : { a: RoyalGuard; }
->a : any
+>a : RoyalGuard
 
 if (holder2.a.isLeader()) {
 >holder2.a.isLeader() : boolean
diff --git a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types.diff b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types.diff
index 6184ba85ae..cb19e6b7c7 100644
--- a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThis.types.diff
@@ -8,16 +8,7 @@
  
  let b: GuardInterface;
  >b : GuardInterface
-@@= skipped -46, +47 lines =@@
- var holder2 = {a};
- >holder2 : { a: RoyalGuard; }
- >{a} : { a: RoyalGuard; }
-->a : RoyalGuard
-+>a : any
- 
- if (holder2.a.isLeader()) {
- >holder2.a.isLeader() : boolean
-@@= skipped -92, +92 lines =@@
+@@= skipped -138, +139 lines =@@
  }
  
  interface Supplies {
diff --git a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types
index a30c987e22..27a5658f83 100644
--- a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types
+++ b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types
@@ -115,7 +115,7 @@ else {
 let holder = {invalidGuard};
 >holder : { invalidGuard: (c: any) => this is number; }
 >{invalidGuard} : { invalidGuard: (c: any) => this is number; }
->invalidGuard : any
+>invalidGuard : (c: any) => this is number
 
 if (holder.invalidGuard(c)) {
 >holder.invalidGuard(c) : boolean
diff --git a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types.diff b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types.diff
index 3822829b47..5307ec738f 100644
--- a/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeGuardFunctionOfFormThisErrors.types.diff
@@ -9,12 +9,3 @@
  let a: RoyalGuard = new FollowerGuard();
  >a : RoyalGuard
  >new FollowerGuard() : FollowerGuard
-@@= skipped -74, +76 lines =@@
- let holder = {invalidGuard};
- >holder : { invalidGuard: (c: any) => this is number; }
- >{invalidGuard} : { invalidGuard: (c: any) => this is number; }
-->invalidGuard : (c: any) => this is number
-+>invalidGuard : any
- 
- if (holder.invalidGuard(c)) {
- >holder.invalidGuard(c) : boolean
diff --git a/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types b/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types
index b55cc04be7..04843a00f9 100644
--- a/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types
+++ b/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types
@@ -43,7 +43,7 @@ function someFrom<a>(some: a) {
 
     return { some };
 >{ some } : { some: a; }
->some : any
+>some : a
 }
 
 export function fn<r>(makeSome: () => r): void {
diff --git a/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types.diff b/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types.diff
index 6aa0691a8e..78341afebf 100644
--- a/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeGuardsAsAssertions.types.diff
@@ -32,10 +32,7 @@
  >some : a
  
      return { some };
- >{ some } : { some: a; }
-->some : a
-+>some : any
- }
+@@= skipped -9, +10 lines =@@
  
  export function fn<r>(makeSome: () => r): void {
  >fn : <r>(makeSome: () => r) => void
@@ -43,7 +40,7 @@
  >makeSome : () => r
  
      let result: Optional<r> = none;
-@@= skipped -65, +67 lines =@@
+@@= skipped -56, +57 lines =@@
  >x : string | number | boolean
  >typeof x === "string" ? x.slice() : "abc" : string
  >typeof x === "string" : boolean
diff --git a/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types b/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types
index 89e2190bbe..2496e86fa3 100644
--- a/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types
+++ b/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types
@@ -33,14 +33,14 @@ function foo<T>(v: T) {
 
         return { a, b };
 >{ a, b } : { a: <T>(a: T) => T; b: () => T; }
->a : any
->b : any
+>a : <T>(a: T) => T
+>b : () => T
     }
 
     return { a, b, c };
 >{ a, b, c } : { a: <T>(a: T) => T; b: () => T; c: <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }; }
->a : any
->b : any
->c : any
+>a : <T>(a: T) => T
+>b : () => T
+>c : <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types.diff b/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types.diff
index 1ac31daff8..a1ea339129 100644
--- a/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeParametersAvailableInNestedScope3.types.diff
@@ -36,20 +36,18 @@
          return { a, b };
 ->{ a, b } : { a: <T_1>(a: T_1) => T_1; b: () => T; }
 ->a : <T_1>(a: T_1) => T_1
-->b : () => T
 +>{ a, b } : { a: <T>(a: T) => T; b: () => T; }
-+>a : any
-+>b : any
++>a : <T>(a: T) => T
+ >b : () => T
      }
  
      return { a, b, c };
 ->{ a, b, c } : { a: <T_1>(a: T_1) => T_1; b: () => T; c: <T_1>(v: T_1) => { a: <T_2>(a: T_2) => T_2; b: () => T_1; }; }
 ->a : <T_1>(a: T_1) => T_1
-->b : () => T
-->c : <T_1>(v: T_1) => { a: <T_2>(a: T_2) => T_2; b: () => T_1; }
 +>{ a, b, c } : { a: <T>(a: T) => T; b: () => T; c: <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }; }
-+>a : any
-+>b : any
-+>c : any
++>a : <T>(a: T) => T
+ >b : () => T
+->c : <T_1>(v: T_1) => { a: <T_2>(a: T_2) => T_2; b: () => T_1; }
++>c : <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }
  }
  
diff --git a/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types b/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types
index 639ccc3af9..759c5d4462 100644
--- a/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types
+++ b/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types
@@ -285,5 +285,5 @@ const res: (() => void) & { func: any } = assign(() => {}, { func });
 >assign : <T, U>(a: T, b: U) => T & U
 >() => {} : () => void
 >{ func } : { func: <T>() => void; }
->func : any
+>func : <T>() => void
 
diff --git a/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types.diff b/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types.diff
index be5ae592fa..1e0cbc651f 100644
--- a/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/unionAndIntersectionInference1.types.diff
@@ -210,6 +210,3 @@
  >assign : <T, U>(a: T, b: U) => T & U
  >() => {} : () => void
  >{ func } : { func: <T>() => void; }
-->func : <T>() => void
-+>func : any
-