diff --git a/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt b/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt
index a9ebf92a0cf75c287f5a4d56c8ee08390d869f41..79c0c251889679b4d03dcc3ef60afae9148a9765 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 4f0366bf97d54adc70ada0c3ba8ccc70e3adb022..572866b94b0fdb894b4fe01bc5b63fae837dd9ed 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 1920376340de88a8cbd265c735ac2c1ad80f4334..024dcf3f28c3b655abd9af590bba4acd4972659d 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 abba7b484c93118cba5a680164a2f8746f2cc7e6..5cb9a64cdd776d3e79a00eb9bd6a67e326f89226 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 28f95e02a9fe42e1fa6a04d97b5b075b3a0541f9..641f5a666c265ec8d23efa2933d5d6b2ceff50ab 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 0f365d51d897184f350de8ce6f1007fdb94bd923..364cc84a4ef3704e93fd231689ee1053cdffe972 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 dde1a8f6c40278db2245eddddcb1b9bbf4feec11..41706441efe28b7c0bd2ee5e296e283fef72b134 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 3513db469e18eddc31a6d7fbef6db51f312251c5..2d52ce5f22af750fb8034a58a386b2f42ab115b3 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 670696de7a030751760e64547c59be35576471cc..ff03b64350dc9eab0150f7d39c8ff8931234d082 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 b76bdc801115b09f87ab6d7ea5258019b105e559..8a842b3edc5e8703f461341df94d91be0dd9e25c 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 5f5f31626516b7c634eb4f4989b92b681354495b..7c40a304e1d3cb167178c9ceb848a48bf860bd79 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 b76b4069c5520d783ac0601022bccf29ef6563d9..dd061241b41907752f3a4839faa8066927a85af4 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 7c3d58e72e26a69a823d60a6a95ce829bdf616c9..969db01c6717aef25cf20bbd3cb7463612c88188 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 225715254e6ab2f3c7a7c119293235942d53a819..1dbe373f724e6d2001c0e5ddadeba4c2a886e148 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 2a24622c4fa9456c21df10742f79b2a36bf032a0..e052ef4e7854f0c8690d1b0fca6bea5979139396 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 a478b5b814a13f0810744d7ae58b4c79f170af43..3bcd7e1bb7fd35ac4ffe3ef8c4bd94e675023722 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 b4445c8d09ef6148e6a160eb739e544bcff86955..d32cf4954da1a94d654a24372409fdc682cb6cb0 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 56d2980426437c9b40ba43c306998c20f65fa0ec..d59c5c9128f5d326e1f99f82805731b7d8f43308 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 f4d1b3a08d521b909d9a943088815a843a41546b..5cd998dcb906e7a56ff2c544014cb039d33185be 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 75e6ef3e689172471e1d15795c27e1963985b185..ca426487263ffd970ee45e54b5af38308b228e58 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 c7affdbfdcc39f20dbd100aca0de60099bd9ed6a..6639e3d00004c47ca54c76f3bd0afc699d9c4888 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 c1d849899a464b687101fa0499abf423277019d5..d6c5e684c7f381915b093cb99b7040394833ac15 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 b423883092017e8dc46cd76a7cce6139ebb1c590..570d5f2cc9ba1d147abb1ff17c6e8d9cf62c64de 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 f5bc8f4990993bc35de2f03d2638923e887a11e2..d497301857c89485e1b6eb66290a5a89b2988075 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 f5bc8f4990993bc35de2f03d2638923e887a11e2..d497301857c89485e1b6eb66290a5a89b2988075 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 7d1faa4eb4cdbd92b807a2c3f09d68984d95d1fd..81d7e6e4de5849706938d73f4abb16bf0da5ce19 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 ce68ab2ace4857ef763d7a2eed2b6e4771ce4c3b..5e6d55d7477922c544ce16b831f45ba86783ebc8 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 3c94c69c40db7d158cea59cac6b7fbeb28bcf3a5..4b46aa2effd09e73b1def5f2f43f98583c14960c 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 32b6fbe74ebe915a22cce7827eb4dac7c61849f8..6a70383ba03b9f421edf292e7fd336bcc9231114 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 23b90f4230ffe73aa233b0207b72a13e812cdad9..5979607ae4b680b536714235fd013924116afd72 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 3a6b1e6720b1b9217a0f41f1ff1f57952e321a38..c528c05014bfbb5b912fc84cc0945d423620faf5 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 e505f34c13fa83e98fc6259b23a27324644b3b38..0e5a1a4b485a5ecafbbe29fe4b2f3c8f3fb822cf 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 b42c9fc8453668f8fdc44a8b68b685aa041d2fde..613c88be0f6335b2e0ae0853efdf032f8c0a9a25 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 c2247b875225c66ccc738bf4fcb6533a64645190..91abeb7446988460631317bc3885b0a6679b02cd 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 962f7adf8fd5d8d49ed9a022cad66ab2f05df5a5..ea2b6126d05fa12b1f755195cdfb9c62b0073237 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 a99b5a15ce812c4a3e8accf64d4086f1a6281f8c..3572ecc4ec7e1b182207c50685560c4941c08ec7 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 8dc54bdbe0bde4fbe3c2e434a714cbc5a0661824..6987c24a26be23bac8d5f671a7424d66514ada01 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 2bd93ce8e9660e8fb6c93362d17a087c427b8554..9f213ef1382fe7709f8ae145481c99f9da6e2955 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 5708e0674a3540578662364e623ddc86dde34ac7..8279cebd73dda7ed8702d7b96c9e80ad3fe9ee9a 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 14dbd707efc57299f43e139b1439c5342a474c83..7c23f003f9a367eef14fc1230df04390e6f9aa3f 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 a99b5a15ce812c4a3e8accf64d4086f1a6281f8c..3572ecc4ec7e1b182207c50685560c4941c08ec7 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 ec99a1f5b2ec97032e3ea2fcfb9c8d9493e43a7a..1ade4d2dddd78f15ac816ffa75f398728d6479c3 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 f97609d0cb297de3bc3e6d5d7148950407b5c7f9..0ae7f0451d33550f5ea750a90a2aad5196ff79f4 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 4db98111a54e8e448b1d6bd5364c35d76eed36c4..e94bb50f9c41326cd274cee9288d67ff0d185865 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 4db98111a54e8e448b1d6bd5364c35d76eed36c4..e94bb50f9c41326cd274cee9288d67ff0d185865 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 3ff20fafaa2d4aa0bd2f14d149054db00d160585..449bf3028bdc5f2fdb960bd657176ec40b11affe 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 7fe08cc45c2fb95a9d361922ced8241e8e17678d..1142897cebc132390b8c0b3aec39d9e7a96dcec6 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 514da255fcc1872706535af934081d4f2e0fac4c..2a15bd41a6b9d059c901c450eeb064a3f922e4f4 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 514da255fcc1872706535af934081d4f2e0fac4c..2a15bd41a6b9d059c901c450eeb064a3f922e4f4 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 3238ec7b63b8fbfb93513248e44149cf49354eb6..27d75731724c55ee6679eb7e47cb16207d24b779 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 c0a34859ca456fb2abdfbaf57f70e992887dfa34..6889c9c3543c1e1f0a6a75bbfec6e28f2d283189 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 c0a34859ca456fb2abdfbaf57f70e992887dfa34..6889c9c3543c1e1f0a6a75bbfec6e28f2d283189 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 c0a34859ca456fb2abdfbaf57f70e992887dfa34..6889c9c3543c1e1f0a6a75bbfec6e28f2d283189 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 d762352364bf906e8ea819ac6cac9cc51a35b19b..a84f7bb12e71961190e83c37c78a7e8b1924ba03 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 c9c235bd74e839c9c7cd11d41ccf4bdde0b6466a..068ac57c26626fdf344dae859d2e26c2e3c7e6a2 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 c9c235bd74e839c9c7cd11d41ccf4bdde0b6466a..068ac57c26626fdf344dae859d2e26c2e3c7e6a2 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 a43cb0169d9de518017817ec599068021c993b93..b85ab5193028ad528430f7843b693be67a8de581 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 0501ffeaa2a32fadb87108923e1d7ffcce0f533f..88f880ab09df3b4180d70f716903c7fa5b66aea7 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 e450e4f887530d67410745a8d949c10b14e9d93a..4708c0e7e4890b78b09b91cbb7370d4770fc0a20 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 a8aaaad357cb1819c0a00886423aa7b2399a1ede..7ee6a9b6ef94ba65f9f829315ff53bad53f63264 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 2bd93ce8e9660e8fb6c93362d17a087c427b8554..9f213ef1382fe7709f8ae145481c99f9da6e2955 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 007bd738a294f91359eddf4ef975366731b1bd2e..47f79769c30c49238c6d4088172e34bf2d45ebfa 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 007bd738a294f91359eddf4ef975366731b1bd2e..47f79769c30c49238c6d4088172e34bf2d45ebfa 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 0501ffeaa2a32fadb87108923e1d7ffcce0f533f..88f880ab09df3b4180d70f716903c7fa5b66aea7 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 0501ffeaa2a32fadb87108923e1d7ffcce0f533f..88f880ab09df3b4180d70f716903c7fa5b66aea7 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 0501ffeaa2a32fadb87108923e1d7ffcce0f533f..88f880ab09df3b4180d70f716903c7fa5b66aea7 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 95839ecd72714257cbeab61e59c94cb54fe4bc4e..1e1375b470158c756fc6992c5436b813788abd78 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 10b62aa5ea11f927fb063e5a2f6441ae79fe2abd..a06c79b13327459b9bae402482c77fcebeef6b2f 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 6f49e6736d263530632bef85ee9c445539a1899a..770ea80c8aed6af44a9522e5447bb46c84576c67 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 73f2152660ade949f5fe275ad81b1b939f91520b..1c6a0b19c3b657fe04cae4382d63905a18974e4f 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 ffccc055853d1d1e772aa2e94d04853728e35874..23b8884286d97568bcdd196f71f010749c16e403 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 c9c235bd74e839c9c7cd11d41ccf4bdde0b6466a..068ac57c26626fdf344dae859d2e26c2e3c7e6a2 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 0a6617f37997cbd57c14dbb99eb64475450aff9c..8dd5ff322c9d95479389749ce7433a0747ddf3a0 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 62f438d5a4693c7842f7eb5d9b18ab2edcb85bd4..84921a6af5646b10f7af4e172d9107299eec4073 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 c9c235bd74e839c9c7cd11d41ccf4bdde0b6466a..068ac57c26626fdf344dae859d2e26c2e3c7e6a2 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 f5bc8f4990993bc35de2f03d2638923e887a11e2..d497301857c89485e1b6eb66290a5a89b2988075 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 f5bc8f4990993bc35de2f03d2638923e887a11e2..d497301857c89485e1b6eb66290a5a89b2988075 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 1f6a6e781446a6a715c9c2985150b2c87f37493b..a85b6f46fc8f6f5b6139bd560e81c1d767afeab0 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 01d793b20063846b573802da232c3bc450d3ab42..5b71dab79db0cb1d6b078e373f45b56221f7032e 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 32b6fbe74ebe915a22cce7827eb4dac7c61849f8..6a70383ba03b9f421edf292e7fd336bcc9231114 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 62ea456144dd7a3ccc1b9b07a5ee223ea56215f1..e23e1f08fcd032eae6c8a042e32f69eab2e05ea4 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 dcb0a099c8fad86bdbd05b4b0788b0e1c585fbe1..a8abf45fe25b918532345e2e6b5e26e89ceaf260 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 7578cac223747309ee4d92026e99c3f459579655..89679d8284e3119c8bedd603176d816919656f19 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 c8ebf5a257b9e3f545b78551e977ade23467d9fe..78a02d23229aa4c06bd0b6beb6ab5b56a66dfd70 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 c1b38c53bfa65bc219b33e0b225ab2a4af678f79..cc59504a56fcbf49e2a3039671844b964f2539a2 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 c1b38c53bfa65bc219b33e0b225ab2a4af678f79..cc59504a56fcbf49e2a3039671844b964f2539a2 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 c1b38c53bfa65bc219b33e0b225ab2a4af678f79..cc59504a56fcbf49e2a3039671844b964f2539a2 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 c1b38c53bfa65bc219b33e0b225ab2a4af678f79..cc59504a56fcbf49e2a3039671844b964f2539a2 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 c1b38c53bfa65bc219b33e0b225ab2a4af678f79..cc59504a56fcbf49e2a3039671844b964f2539a2 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 7f9d5c8bf15b6b3089571dcb5b4906c59de4e047..a8dd3adf72993b0284d0dff7033ae658fcb4346d 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 10dfdeaa77fb115c7a0ba385093c36878b78b540..760f746df379babf9e9c325e491791e54ace53d9 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 df60d742e936cd52836dda8256285f579e1bc6a8..2a369c2c2f5a4285bbbdf0a5a8a3c59894d58452 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 5bd26c2ca7e75576bd590eb198ec55fe4eb6aeb4..6268422b480314b3ecc968c2b4cfa7972a8ae50b 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 b5d457b2c361bd8487bdab779f68a3f269f15be9..fa5d9e64d7bac901a757c86612d493e22d79a0eb 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 adabe5ebf72eadafb17f921c6fff13403235974d..6f076b68e6efdfa6bc276e402851135cb06acbfc 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 2e4d0bfbe3ba24614dc1bef7060f73347ad8b0e3..563e2b4c0061209aea968ebd536cca51cda5655d 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 e790b85a56ff4614d98cf6d5e72d52aa7a1b15b8..eae94789e7537a7db90d785a20d536c614dada98 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 ca075db6aee903a9c16f393c789eecbf98d05737..a1dc513747e159af529ef78b482d171433a9eefd 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]