From 0ce28af13d9e08198556b93d1002f9b05833646e Mon Sep 17 00:00:00 2001
From: wuhailong <wuhailong19@huawei.com>
Date: Thu, 28 Jul 2022 17:01:57 +0800
Subject: [PATCH] Modify test cases for testTs and UT tests

Issue: I5JFCF

Signed-off-by: wuhailong <wuhailong19@huawei.com>
Change-Id: Iffff85bd9065f349c8e635887f7502e1309cb564
---
 .../classAbstractAsIdentifier.txt             |  6 +--
 .../classDeclarations/classInsideBlock.txt    |  4 +-
 .../classWithSemicolonClassElement1.txt       |  2 +-
 .../classWithSemicolonClassElement2.txt       |  2 +-
 .../classExpressions/classExpression2.txt     |  4 +-
 .../classExpressions/classExpression3.txt     |  4 +-
 .../classExpressions/classExpression4.txt     |  4 +-
 ...ifierOnClassExpressionMemberInFunction.txt |  6 +--
 .../classStaticBlock/classStaticBlock1.txt    |  2 +-
 .../classStaticBlock/classStaticBlock10.txt   |  6 +--
 .../classStaticBlock/classStaticBlock21.txt   |  2 +-
 .../declarationEmitReadonly.txt               |  6 +--
 .../quotedConstructors.txt                    | 24 +++++-----
 ...desIndexersWithAssignmentCompatibility.txt |  8 ++--
 .../typeOfThisInStaticMembers.txt             | 16 +++----
 .../staticFactory1.txt                        | 12 ++---
 .../staticAndNonStaticPropertiesSameName.txt  |  8 ++--
 .../staticPropertyAndFunctionWithSameName.txt |  8 ++--
 ...cPropertyNameConflictsInAmbientContext.txt | 48 +++++++++----------
 testTs/expect/constEnums/constEnum3.txt       |  4 +-
 .../controlFlowSuperPropertyAccess.txt        | 10 ++--
 .../switchWithConstrainedTypeVariable.txt     |  2 +-
 .../controlFlow/typeGuardsTypeParameters.txt  |  8 ++--
 .../declarationEmitWorkWithInlineComments.txt | 12 ++---
 .../exportDefaultNamespace.txt                |  2 +-
 .../typeReferenceRelatedFiles.txt             |  2 +-
 ...ringObjectBindingPatternAndAssignment5.txt |  2 +-
 .../emptyArrayBindingPatternParameter01.txt   |  2 +-
 .../emptyObjectBindingPatternParameter01.txt  |  2 +-
 ...PlainCharactersThatArePartsOfEscapes01.txt |  2 +-
 ...ggedTemplateStringsWithTagNamedDeclare.txt |  2 +-
 ...onOperatorWithConstrainedTypeParameter.txt |  4 +-
 ...isonOperatorWithIdenticalTypeParameter.txt |  2 +-
 ...nceofOperatorWithInvalidStaticToString.txt | 24 +++++-----
 .../nullishCoalescingOperator6.txt            |  2 +-
 .../typeGuards/TypeGuardWithArrayUnion.txt    |  8 ++--
 ...unctionOverloadCompatibilityWithVoid02.txt |  2 +-
 ...unctionOverloadCompatibilityWithVoid03.txt |  2 +-
 ...ntFunctionWithTheSameNameAndCommonRoot.txt |  2 +-
 testTs/expect/jsdoc/checkJsdocReturnTag1.txt  |  6 +--
 .../constructorTagOnClassConstructor.txt      |  8 ++--
 .../jsdoc/constructorTagWithThisTag.txt       |  2 +-
 .../declarations/jsDeclarationsThisTypes.txt  | 10 ++--
 .../jsdocImplements_namespacedInterface.txt   | 12 ++---
 testTs/expect/jsdoc/jsdocReturnTag1.txt       |  6 +--
 .../jsdoc/jsdocTypeReferenceUseBeforeDef.txt  |  2 +-
 testTs/expect/jsdoc/seeTag3.txt               |  2 +-
 ...meterExtendsUnionConstraintDistributed.txt |  4 +-
 testTs/expect/override/override12.txt         | 18 +++----
 testTs/expect/override/override17.txt         | 18 +++----
 .../parserArrowFunctionExpression6.txt        |  2 +-
 .../parserClassDeclaration23.txt              |  2 +-
 .../parserClassDeclarationIndexSignature1.txt |  2 +-
 .../parserConstructorDeclaration1.txt         |  6 +--
 .../parserAccessibilityAfterStatic11.txt      |  6 +--
 .../parserAccessibilityAfterStatic14.txt      |  6 +--
 .../parserAccessibilityAfterStatic4.txt       |  2 +-
 .../Generics/parserGenericClass1.txt          |  2 +-
 .../Generics/parserGenericClass2.txt          |  2 +-
 .../Generics/parserGenericConstraint1.txt     |  2 +-
 .../parserIndexMemberDeclaration1.txt         |  2 +-
 .../parserIndexMemberDeclaration2.txt         |  2 +-
 .../parserIndexMemberDeclaration3.txt         |  2 +-
 .../parserIndexMemberDeclaration4.txt         |  2 +-
 .../parserIndexMemberDeclaration6.txt         |  2 +-
 .../ecmascript5/Protected/Protected5.txt      |  6 +--
 .../parser_duplicateLabel3.txt                |  2 +-
 .../parserReturnStatement3.txt                |  2 +-
 .../parser/ecmascript5/parserUnicode3.txt     |  2 +-
 .../parserUnicodeWhitespaceCharacter1.txt     |  2 +-
 .../inferringClassMembersFromAssignments2.txt |  2 +-
 .../propertyAssignmentUseParentType3.txt      |  8 ++--
 ...typePropertyAssignmentMergeAcrossFiles.txt |  2 +-
 .../expect/salsa/typeFromJSInitializer2.txt   |  4 +-
 .../expect/salsa/typeFromJSInitializer3.txt   |  4 +-
 .../for-ofStatements/ES5For-of10.txt          |  2 +-
 .../for-ofStatements/ES5For-of19.txt          |  2 +-
 .../for-ofStatements/ES5For-of9.txt           |  2 +-
 .../tryStatements/tryStatements.txt           |  2 +-
 testTs/expect/types/keyof/keyofAndForIn.txt   |  6 +--
 .../expect/types/localTypes/localTypes5.txt   |  9 ++--
 .../types/mapped/mappedTypeConstraints.txt    | 10 ++--
 testTs/expect/types/mapped/mappedTypes4.txt   |  4 +-
 .../nonPrimitiveRhsSideOfInExpression.txt     |  2 +-
 .../expect/types/rest/genericObjectRest.txt   |  8 ++--
 .../typeofThisWithImplicitThis.txt            |  2 +-
 .../spread/objectSpreadComputedProperty.txt   |  2 +-
 .../spread/objectSpreadRepeatedComplexity.txt |  2 +-
 .../stringLiteralCheckedInIf01.txt            |  2 +-
 .../stringLiteralCheckedInIf02.txt            |  4 +-
 ...iteralTypesAsTypeParameterConstraint01.txt |  4 +-
 ...iteralTypesAsTypeParameterConstraint02.txt |  2 +-
 ...ingLiteralTypesOverloadAssignability04.txt |  4 +-
 ...ingLiteralTypesOverloadAssignability05.txt |  4 +-
 .../types/thisType/thisTypeOptionalCall.txt   |  2 +-
 .../thisType/thisTypeSyntacticContext.txt     |  2 +-
 ...llSignatureAssignabilityInInheritance2.txt | 12 ++---
 ...llSignatureAssignabilityInInheritance4.txt | 12 ++---
 ...llSignatureAssignabilityInInheritance5.txt | 12 ++---
 ...ctSignatureAssignabilityInInheritance2.txt | 12 ++---
 ...ctSignatureAssignabilityInInheritance5.txt | 12 ++---
 .../functionWithMultipleReturnStatements.txt  | 14 +++---
 .../functionWithMultipleReturnStatements2.txt | 18 +++----
 ...ubtypesOfTypeParameterWithConstraints3.txt |  2 +-
 .../subtypingWithObjectMembers4.txt           | 24 +++++-----
 .../subtypingWithOptionalProperties.txt       |  2 +-
 ts2panda/tests/types/class.test.ts            | 40 ++++++++--------
 ts2panda/tests/types/function.test.ts         | 16 +++----
 ts2panda/tests/types/object.test.ts           | 14 +++---
 ts2panda/tests/types/union.test.ts            | 26 +++++-----
 110 files changed, 363 insertions(+), 362 deletions(-)

diff --git a/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt b/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt
index a9ebf92a0c..79c0c25188 100644
--- a/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt
+++ b/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/classDeclarations/classInsideBlock.txt b/testTs/expect/classes/classDeclarations/classInsideBlock.txt
index 4f0366bf97..572866b94b 100644
--- a/testTs/expect/classes/classDeclarations/classInsideBlock.txt
+++ b/testTs/expect/classes/classDeclarations/classInsideBlock.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
diff --git a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt
+++ b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt
+++ b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/classExpressions/classExpression2.txt b/testTs/expect/classes/classExpressions/classExpression2.txt
index 1920376340..024dcf3f28 100644
--- a/testTs/expect/classes/classExpressions/classExpression2.txt
+++ b/testTs/expect/classes/classExpressions/classExpression2.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/classExpressions/classExpression3.txt b/testTs/expect/classes/classExpressions/classExpression3.txt
index abba7b484c..5cb9a64cdd 100644
--- a/testTs/expect/classes/classExpressions/classExpression3.txt
+++ b/testTs/expect/classes/classExpressions/classExpression3.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 103}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/classes/classExpressions/classExpression4.txt b/testTs/expect/classes/classExpressions/classExpression4.txt
index 28f95e02a9..641f5a666c 100644
--- a/testTs/expect/classes/classExpressions/classExpression4.txt
+++ b/testTs/expect/classes/classExpressions/classExpression4.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt b/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt
index 0f365d51d8..364cc84a4e 100644
--- a/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt
+++ b/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 103}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/classes/classStaticBlock/classStaticBlock1.txt b/testTs/expect/classes/classStaticBlock/classStaticBlock1.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/classes/classStaticBlock/classStaticBlock1.txt
+++ b/testTs/expect/classes/classStaticBlock/classStaticBlock1.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/classStaticBlock/classStaticBlock10.txt b/testTs/expect/classes/classStaticBlock/classStaticBlock10.txt
index dde1a8f6c4..41706441ef 100644
--- a/testTs/expect/classes/classStaticBlock/classStaticBlock10.txt
+++ b/testTs/expect/classes/classStaticBlock/classStaticBlock10.txt
@@ -1,5 +1,5 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/classes/classStaticBlock/classStaticBlock21.txt b/testTs/expect/classes/classStaticBlock/classStaticBlock21.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/classes/classStaticBlock/classStaticBlock21.txt
+++ b/testTs/expect/classes/classStaticBlock/classStaticBlock21.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt b/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt
index 3513db469e..2d52ce5f22 100644
--- a/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt
+++ b/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt b/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt
index 670696de7a..ff03b64350 100644
--- a/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt
+++ b/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt
@@ -1,12 +1,12 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5}, {'t': 2, 'v': 58}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 57}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 61}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 60}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5}, {'t': 2, 'v': 106}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 108}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 105}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 107}]}
diff --git a/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt b/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt
index b76bdc8011..8a842b3edc 100644
--- a/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt
+++ b/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt
@@ -1,6 +1,6 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 103}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt b/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt
index 5f5f316265..7c40a304e1 100644
--- a/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt
+++ b/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt
@@ -1,8 +1,8 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 53}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 56}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'test'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 57}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 55}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 105}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'test'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 106}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt b/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt
index b76b4069c5..dd061241b4 100644
--- a/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt
+++ b/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt
@@ -1,6 +1,6 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'create'}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'create'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'create'}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'create'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 105}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt b/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt
index 7c3d58e72e..969db01c67 100644
--- a/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt
+++ b/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt
@@ -1,4 +1,4 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 53}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt
index 225715254e..1dbe373f72 100644
--- a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt
+++ b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt
@@ -1,5 +1,5 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 54}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 53}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 103}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt
index 2a24622c4f..e052ef4e78 100644
--- a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt
+++ b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt
@@ -1,29 +1,29 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 53}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 105}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 104}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 57}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 61}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 60}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 59}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 107}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 111}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 110}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 109}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 63}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 66}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 65}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 113}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 116}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 115}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 68}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 72}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 71}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 70}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 118}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 122}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 121}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 120}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 74}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 78}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 77}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 76}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 124}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 128}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 127}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 126}]}
diff --git a/testTs/expect/constEnums/constEnum3.txt b/testTs/expect/constEnums/constEnum3.txt
index a478b5b814..3bcd7e1bb7 100644
--- a/testTs/expect/constEnums/constEnum3.txt
+++ b/testTs/expect/constEnums/constEnum3.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt b/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt
index b4445c8d09..d32cf4954d 100644
--- a/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt
+++ b/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt
@@ -1,5 +1,5 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'body'}, {'t': 2, 'v': 54}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'body'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'body'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'body'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
diff --git a/testTs/expect/controlFlow/switchWithConstrainedTypeVariable.txt b/testTs/expect/controlFlow/switchWithConstrainedTypeVariable.txt
index 56d2980426..d59c5c9128 100644
--- a/testTs/expect/controlFlow/switchWithConstrainedTypeVariable.txt
+++ b/testTs/expect/controlFlow/switchWithConstrainedTypeVariable.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function1'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/controlFlow/typeGuardsTypeParameters.txt b/testTs/expect/controlFlow/typeGuardsTypeParameters.txt
index f4d1b3a08d..5cd998dcb9 100644
--- a/testTs/expect/controlFlow/typeGuardsTypeParameters.txt
+++ b/testTs/expect/controlFlow/typeGuardsTypeParameters.txt
@@ -1,6 +1,6 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'fun'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'fun'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 5}, {'t': 2, 'v': 4}]}
diff --git a/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt b/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt
index 75e6ef3e68..ca42648726 100644
--- a/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt
+++ b/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt
@@ -1,6 +1,6 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 10}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 54}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 56}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 10}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 106}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/declarationEmit/exportDefaultNamespace.txt b/testTs/expect/declarationEmit/exportDefaultNamespace.txt
index c7affdbfdc..6639e3d000 100644
--- a/testTs/expect/declarationEmit/exportDefaultNamespace.txt
+++ b/testTs/expect/declarationEmit/exportDefaultNamespace.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'someFunc'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'someFunc'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/declarationEmit/typeReferenceRelatedFiles/typeReferenceRelatedFiles.txt b/testTs/expect/declarationEmit/typeReferenceRelatedFiles/typeReferenceRelatedFiles.txt
index c1d849899a..d6c5e684c7 100644
--- a/testTs/expect/declarationEmit/typeReferenceRelatedFiles/typeReferenceRelatedFiles.txt
+++ b/testTs/expect/declarationEmit/typeReferenceRelatedFiles/typeReferenceRelatedFiles.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 7}, {'t': 5, 'v': '#FSWatcher#fs'}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/es6/destructuring/destructuringObjectBindingPatternAndAssignment5.txt b/testTs/expect/es6/destructuring/destructuringObjectBindingPatternAndAssignment5.txt
index b423883092..570d5f2cc9 100644
--- a/testTs/expect/es6/destructuring/destructuringObjectBindingPatternAndAssignment5.txt
+++ b/testTs/expect/es6/destructuring/destructuringObjectBindingPatternAndAssignment5.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/es6/destructuring/emptyArrayBindingPatternParameter01.txt b/testTs/expect/es6/destructuring/emptyArrayBindingPatternParameter01.txt
index f5bc8f4990..d497301857 100644
--- a/testTs/expect/es6/destructuring/emptyArrayBindingPatternParameter01.txt
+++ b/testTs/expect/es6/destructuring/emptyArrayBindingPatternParameter01.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/es6/destructuring/emptyObjectBindingPatternParameter01.txt b/testTs/expect/es6/destructuring/emptyObjectBindingPatternParameter01.txt
index f5bc8f4990..d497301857 100644
--- a/testTs/expect/es6/destructuring/emptyObjectBindingPatternParameter01.txt
+++ b/testTs/expect/es6/destructuring/emptyObjectBindingPatternParameter01.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.txt b/testTs/expect/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.txt
index 7d1faa4eb4..81d7e6e4de 100644
--- a/testTs/expect/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.txt
+++ b/testTs/expect/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 5}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/es6/templates/taggedTemplateStringsWithTagNamedDeclare.txt b/testTs/expect/es6/templates/taggedTemplateStringsWithTagNamedDeclare.txt
index ce68ab2ace..5e6d55d747 100644
--- a/testTs/expect/es6/templates/taggedTemplateStringsWithTagNamedDeclare.txt
+++ b/testTs/expect/es6/templates/taggedTemplateStringsWithTagNamedDeclare.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'declare'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'declare'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 5}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter.txt b/testTs/expect/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter.txt
index 3c94c69c40..4b46aa2eff 100644
--- a/testTs/expect/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter.txt
+++ b/testTs/expect/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'sum'}, {'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'realSum'}, {'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'sum'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'realSum'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 2, 'v': 103}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 5}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter.txt b/testTs/expect/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter.txt
index 32b6fbe74e..6a70383ba0 100644
--- a/testTs/expect/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter.txt
+++ b/testTs/expect/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt b/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt
index 23b90f4230..5979607ae4 100644
--- a/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt
+++ b/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt
@@ -1,12 +1,12 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 54}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 53}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 58}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 57}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 56}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 62}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 61}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 60}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 108}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 107}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 106}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 112}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 111}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 110}]}
diff --git a/testTs/expect/expressions/nullishCoalescingOperator/nullishCoalescingOperator6.txt b/testTs/expect/expressions/nullishCoalescingOperator/nullishCoalescingOperator6.txt
index 3a6b1e6720..c528c05014 100644
--- a/testTs/expect/expressions/nullishCoalescingOperator/nullishCoalescingOperator6.txt
+++ b/testTs/expect/expressions/nullishCoalescingOperator/nullishCoalescingOperator6.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt b/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt
index e505f34c13..0e5a1a4b48 100644
--- a/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt
+++ b/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt
@@ -1,5 +1,5 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'saySize'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 54}, {'t': 2, 'v': 55}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 53}]}
-{'lb': [{'t': 2, 'v': 5}, {'t': 2, 'v': 54}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'saySize'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 103}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 104}, {'t': 2, 'v': 105}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 5}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/functions/functionOverloadCompatibilityWithVoid02.txt b/testTs/expect/functions/functionOverloadCompatibilityWithVoid02.txt
index b42c9fc845..613c88be0f 100644
--- a/testTs/expect/functions/functionOverloadCompatibilityWithVoid02.txt
+++ b/testTs/expect/functions/functionOverloadCompatibilityWithVoid02.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}]}
diff --git a/testTs/expect/functions/functionOverloadCompatibilityWithVoid03.txt b/testTs/expect/functions/functionOverloadCompatibilityWithVoid03.txt
index c2247b8752..91abeb7446 100644
--- a/testTs/expect/functions/functionOverloadCompatibilityWithVoid03.txt
+++ b/testTs/expect/functions/functionOverloadCompatibilityWithVoid03.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 3}]}
diff --git a/testTs/expect/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.txt b/testTs/expect/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.txt
index 962f7adf8f..ea2b6126d0 100644
--- a/testTs/expect/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.txt
+++ b/testTs/expect/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'Point'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'Point'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 2, 'v': 1}]}
diff --git a/testTs/expect/jsdoc/checkJsdocReturnTag1.txt b/testTs/expect/jsdoc/checkJsdocReturnTag1.txt
index a99b5a15ce..3572ecc4ec 100644
--- a/testTs/expect/jsdoc/checkJsdocReturnTag1.txt
+++ b/testTs/expect/jsdoc/checkJsdocReturnTag1.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt b/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt
index 8dc54bdbe0..6987c24a26 100644
--- a/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt
+++ b/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt
@@ -1,5 +1,5 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 103}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
diff --git a/testTs/expect/jsdoc/constructorTagWithThisTag.txt b/testTs/expect/jsdoc/constructorTagWithThisTag.txt
index 2bd93ce8e9..9f213ef138 100644
--- a/testTs/expect/jsdoc/constructorTagWithThisTag.txt
+++ b/testTs/expect/jsdoc/constructorTagWithThisTag.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'C'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'C'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt b/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt
index 5708e0674a..8279cebd73 100644
--- a/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt
+++ b/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt
@@ -1,5 +1,5 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'method'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'method'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 51}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'verify'}, {'t': 2, 'v': 54}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'verify'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 53}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'method'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'method'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'verify'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'verify'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
diff --git a/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt b/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt
index 14dbd707ef..7c23f003f9 100644
--- a/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt
+++ b/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt
@@ -1,6 +1,6 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'mNumber'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'mNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'gen'}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'gen'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'mNumber'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'mNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'gen'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'gen'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
diff --git a/testTs/expect/jsdoc/jsdocReturnTag1.txt b/testTs/expect/jsdoc/jsdocReturnTag1.txt
index a99b5a15ce..3572ecc4ec 100644
--- a/testTs/expect/jsdoc/jsdocReturnTag1.txt
+++ b/testTs/expect/jsdoc/jsdocReturnTag1.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt b/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt
+++ b/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/jsdoc/seeTag3.txt b/testTs/expect/jsdoc/seeTag3.txt
index ec99a1f5b2..1ade4d2ddd 100644
--- a/testTs/expect/jsdoc/seeTag3.txt
+++ b/testTs/expect/jsdoc/seeTag3.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'theWholeThing'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'theWholeThing'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/jsdoc/typeParameterExtendsUnionConstraintDistributed.txt b/testTs/expect/jsdoc/typeParameterExtendsUnionConstraintDistributed.txt
index f97609d0cb..0ae7f0451d 100644
--- a/testTs/expect/jsdoc/typeParameterExtendsUnionConstraintDistributed.txt
+++ b/testTs/expect/jsdoc/typeParameterExtendsUnionConstraintDistributed.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/override/override12.txt b/testTs/expect/override/override12.txt
index 4db98111a5..e94bb50f9c 100644
--- a/testTs/expect/override/override12.txt
+++ b/testTs/expect/override/override12.txt
@@ -1,9 +1,9 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 56}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 57}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 58}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 53}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 54}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 102}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 103}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 106}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 107}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 108}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 105}]}
diff --git a/testTs/expect/override/override17.txt b/testTs/expect/override/override17.txt
index 4db98111a5..e94bb50f9c 100644
--- a/testTs/expect/override/override17.txt
+++ b/testTs/expect/override/override17.txt
@@ -1,9 +1,9 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 56}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 57}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 58}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 53}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 54}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 102}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 103}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 106}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 107}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 108}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 105}]}
diff --git a/testTs/expect/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6.txt b/testTs/expect/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6.txt
index 3ff20fafaa..449bf3028b 100644
--- a/testTs/expect/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6.txt
+++ b/testTs/expect/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt
+++ b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt
+++ b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt b/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt
index 7fe08cc45c..1142897ceb 100644
--- a/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt
+++ b/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt
index 514da255fc..2a15bd41a6 100644
--- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt
+++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 52}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt
index 514da255fc..2a15bd41a6 100644
--- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt
+++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 52}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt
index 3238ec7b63..27d7573172 100644
--- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt
+++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt
+++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt
+++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt
+++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt
+++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt
index c0a34859ca..6889c9c354 100644
--- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt
+++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt
index c0a34859ca..6889c9c354 100644
--- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt
+++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt
index c0a34859ca..6889c9c354 100644
--- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt
+++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration6.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration6.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration6.txt
+++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration6.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/Protected/Protected5.txt b/testTs/expect/parser/ecmascript5/Protected/Protected5.txt
index d762352364..a84f7bb12e 100644
--- a/testTs/expect/parser/ecmascript5/Protected/Protected5.txt
+++ b/testTs/expect/parser/ecmascript5/Protected/Protected5.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 52}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 6}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.txt b/testTs/expect/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.txt
index c9c235bd74..068ac57c26 100644
--- a/testTs/expect/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.txt
+++ b/testTs/expect/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3.txt b/testTs/expect/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3.txt
index c9c235bd74..068ac57c26 100644
--- a/testTs/expect/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3.txt
+++ b/testTs/expect/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/parser/ecmascript5/parserUnicode3.txt b/testTs/expect/parser/ecmascript5/parserUnicode3.txt
index a43cb0169d..b85ab51930 100644
--- a/testTs/expect/parser/ecmascript5/parserUnicode3.txt
+++ b/testTs/expect/parser/ecmascript5/parserUnicode3.txt
@@ -1,2 +1,2 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
diff --git a/testTs/expect/parser/ecmascript5/parserUnicodeWhitespaceCharacter1.txt b/testTs/expect/parser/ecmascript5/parserUnicodeWhitespaceCharacter1.txt
index 0501ffeaa2..88f880ab09 100644
--- a/testTs/expect/parser/ecmascript5/parserUnicodeWhitespaceCharacter1.txt
+++ b/testTs/expect/parser/ecmascript5/parserUnicodeWhitespaceCharacter1.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/salsa/inferringClassMembersFromAssignments2.txt b/testTs/expect/salsa/inferringClassMembersFromAssignments2.txt
index e450e4f887..4708c0e7e4 100644
--- a/testTs/expect/salsa/inferringClassMembersFromAssignments2.txt
+++ b/testTs/expect/salsa/inferringClassMembersFromAssignments2.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'OOOrder'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'OOOrder'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/salsa/propertyAssignmentUseParentType3.txt b/testTs/expect/salsa/propertyAssignmentUseParentType3.txt
index a8aaaad357..7ee6a9b6ef 100644
--- a/testTs/expect/salsa/propertyAssignmentUseParentType3.txt
+++ b/testTs/expect/salsa/propertyAssignmentUseParentType3.txt
@@ -1,5 +1,5 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 53}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 103}]}
 {'lb': [{'t': 2, 'v': 5}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/salsa/prototypePropertyAssignmentMergeAcrossFiles.txt b/testTs/expect/salsa/prototypePropertyAssignmentMergeAcrossFiles.txt
index 2bd93ce8e9..9f213ef138 100644
--- a/testTs/expect/salsa/prototypePropertyAssignmentMergeAcrossFiles.txt
+++ b/testTs/expect/salsa/prototypePropertyAssignmentMergeAcrossFiles.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'C'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'C'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/salsa/typeFromJSInitializer2.txt b/testTs/expect/salsa/typeFromJSInitializer2.txt
index 007bd738a2..47f79769c3 100644
--- a/testTs/expect/salsa/typeFromJSInitializer2.txt
+++ b/testTs/expect/salsa/typeFromJSInitializer2.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/salsa/typeFromJSInitializer3.txt b/testTs/expect/salsa/typeFromJSInitializer3.txt
index 007bd738a2..47f79769c3 100644
--- a/testTs/expect/salsa/typeFromJSInitializer3.txt
+++ b/testTs/expect/salsa/typeFromJSInitializer3.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/statements/for-ofStatements/ES5For-of10.txt b/testTs/expect/statements/for-ofStatements/ES5For-of10.txt
index 0501ffeaa2..88f880ab09 100644
--- a/testTs/expect/statements/for-ofStatements/ES5For-of10.txt
+++ b/testTs/expect/statements/for-ofStatements/ES5For-of10.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/statements/for-ofStatements/ES5For-of19.txt b/testTs/expect/statements/for-ofStatements/ES5For-of19.txt
index 0501ffeaa2..88f880ab09 100644
--- a/testTs/expect/statements/for-ofStatements/ES5For-of19.txt
+++ b/testTs/expect/statements/for-ofStatements/ES5For-of19.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/statements/for-ofStatements/ES5For-of9.txt b/testTs/expect/statements/for-ofStatements/ES5For-of9.txt
index 0501ffeaa2..88f880ab09 100644
--- a/testTs/expect/statements/for-ofStatements/ES5For-of9.txt
+++ b/testTs/expect/statements/for-ofStatements/ES5For-of9.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/statements/tryStatements/tryStatements.txt b/testTs/expect/statements/tryStatements/tryStatements.txt
index 95839ecd72..1e1375b470 100644
--- a/testTs/expect/statements/tryStatements/tryStatements.txt
+++ b/testTs/expect/statements/tryStatements/tryStatements.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'fn'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'fn'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/keyof/keyofAndForIn.txt b/testTs/expect/types/keyof/keyofAndForIn.txt
index 10b62aa5ea..a06c79b133 100644
--- a/testTs/expect/types/keyof/keyofAndForIn.txt
+++ b/testTs/expect/types/keyof/keyofAndForIn.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/localTypes/localTypes5.txt b/testTs/expect/types/localTypes/localTypes5.txt
index 6f49e6736d..770ea80c8a 100644
--- a/testTs/expect/types/localTypes/localTypes5.txt
+++ b/testTs/expect/types/localTypes/localTypes5.txt
@@ -1,4 +1,5 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
diff --git a/testTs/expect/types/mapped/mappedTypeConstraints.txt b/testTs/expect/types/mapped/mappedTypeConstraints.txt
index 73f2152660..1c6a0b19c3 100644
--- a/testTs/expect/types/mapped/mappedTypeConstraints.txt
+++ b/testTs/expect/types/mapped/mappedTypeConstraints.txt
@@ -1,5 +1,5 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f0'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f0'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/mapped/mappedTypes4.txt b/testTs/expect/types/mapped/mappedTypes4.txt
index ffccc05585..23b8884286 100644
--- a/testTs/expect/types/mapped/mappedTypes4.txt
+++ b/testTs/expect/types/mapped/mappedTypes4.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boxify'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boxify'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 103}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 7}]}
diff --git a/testTs/expect/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression.txt b/testTs/expect/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression.txt
index c9c235bd74..068ac57c26 100644
--- a/testTs/expect/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression.txt
+++ b/testTs/expect/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/rest/genericObjectRest.txt b/testTs/expect/types/rest/genericObjectRest.txt
index 0a6617f379..8dd5ff322c 100644
--- a/testTs/expect/types/rest/genericObjectRest.txt
+++ b/testTs/expect/types/rest/genericObjectRest.txt
@@ -1,4 +1,4 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/specifyingTypes/typeQueries/typeofThisWithImplicitThis.txt b/testTs/expect/types/specifyingTypes/typeQueries/typeofThisWithImplicitThis.txt
index 62f438d5a4..84921a6af5 100644
--- a/testTs/expect/types/specifyingTypes/typeQueries/typeofThisWithImplicitThis.txt
+++ b/testTs/expect/types/specifyingTypes/typeQueries/typeofThisWithImplicitThis.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'Test1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'Test1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/spread/objectSpreadComputedProperty.txt b/testTs/expect/types/spread/objectSpreadComputedProperty.txt
index c9c235bd74..068ac57c26 100644
--- a/testTs/expect/types/spread/objectSpreadComputedProperty.txt
+++ b/testTs/expect/types/spread/objectSpreadComputedProperty.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/spread/objectSpreadRepeatedComplexity.txt b/testTs/expect/types/spread/objectSpreadRepeatedComplexity.txt
index f5bc8f4990..d497301857 100644
--- a/testTs/expect/types/spread/objectSpreadRepeatedComplexity.txt
+++ b/testTs/expect/types/spread/objectSpreadRepeatedComplexity.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf01.txt b/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf01.txt
index f5bc8f4990..d497301857 100644
--- a/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf01.txt
+++ b/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf01.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf02.txt b/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf02.txt
index 1f6a6e7814..a85b6f46fc 100644
--- a/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf02.txt
+++ b/testTs/expect/types/stringLiteral/stringLiteralCheckedInIf02.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'isS'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'isS'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.txt b/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.txt
index 01d793b200..5b71dab79d 100644
--- a/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.txt
+++ b/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.txt b/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.txt
index 32b6fbe74e..6a70383ba0 100644
--- a/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.txt
+++ b/testTs/expect/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability04.txt b/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability04.txt
index 62ea456144..e23e1f08fc 100644
--- a/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability04.txt
+++ b/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability04.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}]}
diff --git a/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability05.txt b/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability05.txt
index dcb0a099c8..a8abf45fe2 100644
--- a/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability05.txt
+++ b/testTs/expect/types/stringLiteral/stringLiteralTypesOverloadAssignability05.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 4}, {'t': 2, 'v': 1}]}
diff --git a/testTs/expect/types/thisType/thisTypeOptionalCall.txt b/testTs/expect/types/thisType/thisTypeOptionalCall.txt
index 7578cac223..89679d8284 100644
--- a/testTs/expect/types/thisType/thisTypeOptionalCall.txt
+++ b/testTs/expect/types/thisType/thisTypeOptionalCall.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'maybeBind'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 53}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'maybeBind'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 103}]}
 {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 7}]}
 {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 7}]}
diff --git a/testTs/expect/types/thisType/thisTypeSyntacticContext.txt b/testTs/expect/types/thisType/thisTypeSyntacticContext.txt
index c8ebf5a257..78a02d2322 100644
--- a/testTs/expect/types/thisType/thisTypeSyntacticContext.txt
+++ b/testTs/expect/types/thisType/thisTypeSyntacticContext.txt
@@ -1,3 +1,3 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'n'}, {'t': 2, 'v': 1}]}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'n'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'test'}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt
index c1b38c53bf..cc59504a56 100644
--- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt
+++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt
@@ -1,7 +1,7 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 51}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 56}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt
index c1b38c53bf..cc59504a56 100644
--- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt
+++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt
@@ -1,7 +1,7 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 51}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 56}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt
index c1b38c53bf..cc59504a56 100644
--- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt
+++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt
@@ -1,7 +1,7 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 51}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 56}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt
index c1b38c53bf..cc59504a56 100644
--- a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt
+++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt
@@ -1,7 +1,7 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 51}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 56}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt
index c1b38c53bf..cc59504a56 100644
--- a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt
+++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt
@@ -1,7 +1,7 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 51}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 56}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 102}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 103}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 104}]}
diff --git a/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.txt b/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.txt
index 7f9d5c8bf1..a8dd3adf72 100644
--- a/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.txt
+++ b/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.txt
@@ -1,7 +1,7 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f6'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f8'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.txt b/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.txt
index 10dfdeaa77..760f746df3 100644
--- a/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.txt
+++ b/testTs/expect/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2.txt
@@ -1,11 +1,11 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f6'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 2, 'v': 1}]}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'z'}, {'t': 2, 'v': 1}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.txt
index df60d742e9..2a369c2c2f 100644
--- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.txt
+++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.txt
@@ -1 +1 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt
index 5bd26c2ca7..6268422b48 100644
--- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt
+++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt
@@ -1,13 +1,13 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 52}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 51}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 55}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'fooo'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 56}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 52}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 54}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 59}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 2, 'v': 56}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 58}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 62}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 2, 'v': 53}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 2, 'v': 56}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
-{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 61}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 101}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 101}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 103}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'fooo'}, {'t': 2, 'v': 106}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 102}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 107}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 2, 'v': 106}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 2, 'v': 104}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 109}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 2, 'v': 106}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 105}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 108}]}
+{'lb': [{'t': 2, 'v': 2}, {'t': 2, 'v': 110}]}
diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties.txt
index b5d457b2c3..fa5d9e64d7 100644
--- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties.txt
+++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties.txt
@@ -1,2 +1,2 @@
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}]}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 's'}, {'t': 2, 'v': 1}]}
diff --git a/ts2panda/tests/types/class.test.ts b/ts2panda/tests/types/class.test.ts
index adabe5ebf7..6f076b68e6 100644
--- a/ts2panda/tests/types/class.test.ts
+++ b/ts2panda/tests/types/class.test.ts
@@ -256,8 +256,8 @@ describe("class tests in class.test.ts", function () {
         let locals = functionPg!.getLocals();
         // check vreg
         let extectedVRegTypePair = [
-            ["#3#animal", shift + 2],
-            ["#4#dog", shift + 1],
+            ["#3#animal", shift + 1],
+            ["#4#dog", shift + 3],
             ["#5#d", shift + 5],
         ]
         let vreg2TypeMap = createVRegTypePair(extectedVRegTypePair);
@@ -269,25 +269,25 @@ describe("class tests in class.test.ts", function () {
                 [2, 0], [2, 5], [2, 0]
             ],
             [
-                [2, 1], [2, 0], [2, shift + 2], [2, 0],
-                [2, 0], [2, 1], [5, 'constructor'], [2, shift + 4],
+                [2, 1], [2, 1], [2, 0], [2, 0],
+                [2, 0], [2, 1], [5, 'eat'], [2, shift + 2],
                 [2, 0], [2, 0]
             ],
             [
-                [2, 1], [2, 1], [2, 0], [2, 0],
-                [2, 0], [2, 1], [5, 'eat'], [2, shift + 3],
-                [2, 0], [2, 0]
+                [2, 3], [2, 0], [5, 'eat'],
+                [2, 0], [2, 0], [2, 0]
             ],
             [
-                [2, 3], [2, 0], [2, 0], [5, 'eat'],
+                [2, 1], [2, 1], [2, shift + 1], [2, 0],
+                [2, 0], [2, 1], [5, 'constructor'], [2, shift + 4],
                 [2, 0], [2, 0]
             ],
             [
-                [2, 3], [2, 0], [2, 0], [5, 'constructor'],
-                [2, 0], [2, 0]
+                [2, 3], [2, 0], [5, 'constructor'],
+                [2, 0], [2, 0], [2, 0]
             ],
             [
-                [2, 2], [2, shift + 1]
+                [2, 2], [2, shift + 3]
             ]
         ]
         let buff = createLiteralBufferArray(expectedBuffValues);
@@ -301,9 +301,9 @@ describe("class tests in class.test.ts", function () {
         let locals = functionPg!.getLocals();
         // check vreg
         let extectedVRegTypePair = [
-            ["#3#base1", shift + 2],
-            ["#4#base2", shift + 3],
-            ["#5#A", shift + 1],
+            ["#3#base1", shift + 1],
+            ["#4#base2", shift + 2],
+            ["#5#A", shift + 3],
             ["#6#a", shift + 4],
         ]
         let vreg2TypeMap = createVRegTypePair(extectedVRegTypePair);
@@ -314,11 +314,6 @@ describe("class tests in class.test.ts", function () {
             [
                 [2, 0], [2, 4], [2, 0]
             ],
-            [
-                [2, 1], [2, 0], [2, 0], [2, 2],
-                [2, shift + 2], [2, shift + 3], [2, 0], [2, 0],
-                [2, 0], [2, 0]
-            ],
             [
                 [2, 1], [2, 0], [2, 0], [2, 0],
                 [2, 0], [2, 0], [2, 0], [2, 0]
@@ -328,7 +323,12 @@ describe("class tests in class.test.ts", function () {
                 [2, 0], [2, 0], [2, 0], [2, 0]
             ],
             [
-                [2, 2], [2, shift + 1]
+                [2, 1], [2, 0], [2, 0], [2, 2],
+                [2, shift + 1], [2, shift + 2], [2, 0], [2, 0],
+                [2, 0], [2, 0]
+            ],
+            [
+                [2, 2], [2, shift + 3]
             ]
         ]
         let buff = createLiteralBufferArray(expectedBuffValues);
diff --git a/ts2panda/tests/types/function.test.ts b/ts2panda/tests/types/function.test.ts
index 2e4d0bfbe3..563e2b4c00 100644
--- a/ts2panda/tests/types/function.test.ts
+++ b/ts2panda/tests/types/function.test.ts
@@ -176,7 +176,7 @@ describe("function tests in function.test.ts", function () {
         let locals = functionPg!.getLocals();
         // check vreg
         let extectedVRegTypePair = [
-            ["#0#foo", shift + 2],
+            ["#0#foo", shift + 1],
         ]
         let vreg2TypeMap = createVRegTypePair(extectedVRegTypePair);
         expect(compareVReg2Type(vreg2TypeMap, locals), "check vreg typeInfo").to.be.true;
@@ -187,12 +187,8 @@ describe("function tests in function.test.ts", function () {
                 [2, 0], [2, 4], [2, 0]
             ],
             [
-                [2, 3], [2, 0], [2, 0], [5, 'localClass'],
-                [2, 0], [2, 0]
-            ],
-            [
-                [2, 3], [2, 0], [2, 0], [5, 'foo'],
-                [2, 0], [2, shift + 4]
+                [2, 3], [2, 0], [5, 'localClassRet'],
+                [2, 0], [2, 0], [2, 0]
             ],
             [
 
@@ -200,7 +196,11 @@ describe("function tests in function.test.ts", function () {
                 [2, 0], [2, 0], [2, 0], [2, 0]
             ],
             [
-                [2, 2], [2, shift + 3]
+                [2, 3], [2, 0], [5, 'foo'],
+                [2, 0], [2, 0], [2, shift + 4]
+            ],
+            [
+                [2, 2], [2, shift + 2]
             ]
         ]
         let buff = createLiteralBufferArray(expectedBuffValues);
diff --git a/ts2panda/tests/types/object.test.ts b/ts2panda/tests/types/object.test.ts
index e790b85a56..eae94789e7 100644
--- a/ts2panda/tests/types/object.test.ts
+++ b/ts2panda/tests/types/object.test.ts
@@ -60,8 +60,8 @@ describe("object tests in object.test.ts", function() {
         let locals = functionPg!.getLocals();
         // check vreg
         let extectedVRegTypePair = [
-            ["#3#A", shift + 2],
-            ["#4#a", shift + 1],
+            ["#3#A", shift + 1],
+            ["#4#a", shift + 2],
         ]
         let vreg2TypeMap = createVRegTypePair(extectedVRegTypePair);
         expect(compareVReg2Type(vreg2TypeMap, locals), "check vreg typeInfo").to.be.true;
@@ -71,16 +71,16 @@ describe("object tests in object.test.ts", function() {
             [
                 [2, 0], [2, 4], [2, 0]
             ],
-            [
-                [2, 6],[2, 2],[5, 'a'],[2, 53],
-                [5, 'b'],[2, 54]
-            ],
             [
                 [2, 1],[2, 0],[2, 0],[2, 0],
                 [2, 0],[2, 0],[2, 0],[2, 0]
             ],
             [
-                [2, 2], [2, 52]
+                [2, 6],[2, 2],[5, 'a'],[2, shift + 3],
+                [5, 'b'],[2, shift + 4]
+            ],
+            [
+                [2, 2], [2, shift + 1]
             ],
             [
                 [2, 4],[2, 2],[2, 4],[2, 1]
diff --git a/ts2panda/tests/types/union.test.ts b/ts2panda/tests/types/union.test.ts
index ca075db6ae..a1dc513747 100644
--- a/ts2panda/tests/types/union.test.ts
+++ b/ts2panda/tests/types/union.test.ts
@@ -72,8 +72,8 @@ describe("union tests in union.test.ts", function () {
         let locals = functionPg!.getLocals();
         // check vreg
         let extectedVRegTypePair = [
-            ["#3#A", shift + 2],
-            ["#4#c", shift + 1],
+            ["#3#A", shift + 1],
+            ["#4#c", shift + 2],
         ]
         let vreg2TypeMap = createVRegTypePair(extectedVRegTypePair);
         expect(compareVReg2Type(vreg2TypeMap, locals), "check vreg typeInfo").to.be.true;
@@ -83,15 +83,15 @@ describe("union tests in union.test.ts", function () {
             [
                 [2, 0], [2, 4], [2, 0]
             ],
-            [
-                [2, 4], [2, 2], [2, 53], [2, 54]
-            ],
             [
                 [2, 1], [2, 0], [2, 0], [2, 0],
                 [2, 0], [2, 0], [2, 0], [2, 0]
             ],
             [
-                [2, 2], [2, 52]
+                [2, 4], [2, 2], [2, shift + 3], [2, shift + 4]
+            ],
+            [
+                [2, 2], [2, shift + 1]
             ],
             [
                 [2, 5], [2, 1]
@@ -134,9 +134,9 @@ describe("union tests in union.test.ts", function () {
         let locals = functionPg!.getLocals();
         // check vreg
         let extectedVRegTypePair = [
-            ["#3#A", shift + 2],
-            ["#4#c", shift + 1],
-            ["#5#d", shift + 1],
+            ["#3#A", shift + 1],
+            ["#4#c", shift + 2],
+            ["#5#d", shift + 2],
         ]
         let vreg2TypeMap = createVRegTypePair(extectedVRegTypePair);
         expect(compareVReg2Type(vreg2TypeMap, locals), "check vreg typeInfo").to.be.true;
@@ -146,15 +146,15 @@ describe("union tests in union.test.ts", function () {
             [
                 [2, 0], [2, 4], [2, 0]
             ],
-            [
-                [2, 4], [2, 2], [2, 53], [2, 54]
-            ],
             [
                 [2, 1], [2, 0], [2, 0], [2, 0],
                 [2, 0], [2, 0], [2, 0], [2, 0]
             ],
             [
-                [2, 2], [2, 52]
+                [2, 4], [2, 2], [2, shift + 3], [2, shift + 4]
+            ],
+            [
+                [2, 2], [2, shift + 1]
             ],
             [
                 [2, 5], [2, 1]
-- 
Gitee