diff --git a/testTs/expect/classes/mixinAbstractClasses.txt b/testTs/expect/classes/mixinAbstractClasses.txt
index 007190ee8aba3f25ab2fd749feb48ccca8dd25d7..3af300a68aaf634cf4987ee6a5ce1d55b110f3c3 100644
--- a/testTs/expect/classes/mixinAbstractClasses.txt
+++ b/testTs/expect/classes/mixinAbstractClasses.txt
@@ -5,7 +5,7 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baseMethod'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'abstractBaseMethod'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 64}, {'t': 5, 'v': 'abstractBaseMethod'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 192}, {'t': 5, 'v': 'abstractBaseMethod'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_8'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_10'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'abstractBaseMethod'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'}
diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt
index 5515d14560ca6b992deeeadbfaf5161a32f7b384..9d5b482e789221382ea9d73974b4a28197174fef 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': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_4'}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_8'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_10'}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_11'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_10'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_11'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_12'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_14'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_15'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_15'}], 'k': '_17'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_18'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_18'}], 'k': '_19'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_22'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_21'}], 'k': '_20'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_20'}], 'k': '_23'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_24'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_24'}], 'k': '_25'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_28'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_27'}], 'k': '_26'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_26'}], 'k': '_29'}
diff --git a/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt b/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt
index 31670798f9e165594e28f304ff25d4d9eadcc37e..163939241fad7939d1dace2cd96288c0542ce79e 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': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 130}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'body'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'body'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'}
diff --git a/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt b/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt
index 92ed3c53fb9df4d42efa677715da671425861a7c..641eda342acef1b5caa57e9ca15a37eff47afbc8 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': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 0}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, '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': 24, 'v': '_3'}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_8'}, {'t': 25, 'v': 0}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, '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': 24, 'v': '_7'}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_7'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_8'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}, {'t': 25, 'v': 0}], 'k': '_9'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_11'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_11'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'}
diff --git a/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.txt b/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.txt
index cea3752ab9c88547800b0466b946cff70c76fc3b..567fa28bffe28387fe7c478cb0270c6d4cd2f41e 100644
--- a/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.txt
+++ b/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.txt
@@ -10,4 +10,4 @@
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'}
 {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_11'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_13'}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'stringIdentity'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_13'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'stringIdentity'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_13'}
diff --git a/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01.txt b/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01.txt
index cc7bfc91176027416cbdab5abedb6b444b9c16f1..d6c43972af9ca6ff80d3641b5218b078be4e0132 100644
--- a/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01.txt
+++ b/testTs/expect/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01.txt
@@ -1,8 +1,8 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getFoo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}, {'t': 24, 'v': '_5'}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'method1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 3}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'method1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 3}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'numProp'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'method2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 3}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'method2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 3}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'strProp'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getFoo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}], 'k': '_7'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getFoo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}], 'k': '_8'}
diff --git a/testTs/expect/types/intersection/intersectionThisTypes.txt b/testTs/expect/types/intersection/intersectionThisTypes.txt
index e0127b1e9559bb8fb2d5c1d58cf2731b6a46f277..25b32d9dc942a666827bbed9283d757daa6acb1b 100644
--- a/testTs/expect/types/intersection/intersectionThisTypes.txt
+++ b/testTs/expect/types/intersection/intersectionThisTypes.txt
@@ -4,4 +4,4 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'test'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_5'}, {'t': 25, 'v': 0}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'title'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_7'}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'extend'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'extend'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
diff --git a/testTs/expect/types/keyof/keyofAndIndexedAccess.txt b/testTs/expect/types/keyof/keyofAndIndexedAccess.txt
index c825b995261a52447b57684d0741b87ce5f077d9..c1e0adbcde4d5c014de1ba561e1befd325e30bca 100644
--- a/testTs/expect/types/keyof/keyofAndIndexedAccess.txt
+++ b/testTs/expect/types/keyof/keyofAndIndexedAccess.txt
@@ -74,9 +74,9 @@
 {'lb': [{'t': 2, 'v': 5}, {'t': 24, 'v': '_73'}], 'k': '_74'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_75'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_77'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_79'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_76'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_78'}, {'t': 25, 'v': 0}], 'k': '_77'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_78'}, {'t': 25, 'v': 0}], 'k': '_77'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'computed'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_78'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_79'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_79'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_76'}], 'k': '_80'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_81'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'addToMyThingy'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_82'}
@@ -114,8 +114,8 @@
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_114'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_115'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_117'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_119'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_116'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_118'}, {'t': 25, 'v': 0}], 'k': '_117'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_118'}, {'t': 25, 'v': 0}], 'k': '_117'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'computed'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_118'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_119'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_119'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_116'}], 'k': '_120'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_88'}], 'k': '_121'}
diff --git a/testTs/expect/types/members/objectTypeWithCallSignatureHidingMembersOfFunction.txt b/testTs/expect/types/members/objectTypeWithCallSignatureHidingMembersOfFunction.txt
index 10e8e9ba7aca0100a712b4ee77110f940a9d41a6..45230b660b7cb99ee0130c518102514136ef31e8 100644
--- a/testTs/expect/types/members/objectTypeWithCallSignatureHidingMembersOfFunction.txt
+++ b/testTs/expect/types/members/objectTypeWithCallSignatureHidingMembersOfFunction.txt
@@ -1,5 +1,5 @@
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}, {'t': 24, 'v': '_3'}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'apply'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'call'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'apply'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'call'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 0}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 5}, {'t': 25, 'v': 1}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 3}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 3}, {'t': 5, 'v': 'apply'}, {'t': 25, 'v': 3}, {'t': 5, 'v': 'call'}, {'t': 25, 'v': 0}], 'k': '_5'}
diff --git a/testTs/expect/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction.txt b/testTs/expect/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction.txt
index 9578fa46cc175042d3bd3172356887c394433b94..de4de45f841410d2f2c94615161e00d160cff014 100644
--- a/testTs/expect/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction.txt
+++ b/testTs/expect/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction.txt
@@ -1,5 +1,5 @@
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}, {'t': 24, 'v': '_3'}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'apply'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'call'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'apply'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'call'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 0}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 5}, {'t': 25, 'v': 1}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 3}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'apply'}, {'t': 25, 'v': 3}, {'t': 5, 'v': 'call'}, {'t': 25, 'v': 0}], 'k': '_5'}
diff --git a/testTs/expect/types/members/typesWithOptionalProperty.txt b/testTs/expect/types/members/typesWithOptionalProperty.txt
index f8318863a34c64cd6862190b57bedd8ae453872c..23f33f70a2a12a43a33ef0c061ad210107ea8403 100644
--- a/testTs/expect/types/members/typesWithOptionalProperty.txt
+++ b/testTs/expect/types/members/typesWithOptionalProperty.txt
@@ -1,3 +1,3 @@
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_3'}
diff --git a/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt b/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt
index ff4736ee4a070c34e8bfb53e2b68ea158f4c7212..77e86ef2e83b54729a4f9accfd8ed904b3cd4ddc 100644
--- a/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt
+++ b/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt
@@ -1,17 +1,14 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_6'}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_6'}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_8'}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_10'}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_14'}, {'t': 24, 'v': '_15'}, {'t': 24, 'v': '_16'}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_6'}], 'k': '_14'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_8'}], 'k': '_15'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_10'}], 'k': '_16'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}], 'k': '_17'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_9'}, {'t': 24, 'v': '_10'}, {'t': 24, 'v': '_12'}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_6'}], 'k': '_9'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_11'}], 'k': '_10'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_11'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_13'}], 'k': '_12'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_13'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}], 'k': '_14'}
diff --git a/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt b/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt
index 6f428a15f76bf601e3828be2b93b71a2e6b67c27..533e1f12da40d0f312c332200be3c48dec8a7e05 100644
--- a/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt
+++ b/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt
@@ -1,14 +1,11 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_14'}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_14'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_11'}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_9'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_10'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_11'}
diff --git a/testTs/expect/types/namedTypes/optionalMethods.txt b/testTs/expect/types/namedTypes/optionalMethods.txt
index c0b4a6b6ba8da0cb91a7c3f12d1bda61f17be2c6..2e5a5a99683508cabe4a57ac5d94abd1db21c494 100644
--- a/testTs/expect/types/namedTypes/optionalMethods.txt
+++ b/testTs/expect/types/namedTypes/optionalMethods.txt
@@ -1,16 +1,16 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'test1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 25, 'v': 0}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}, {'t': 24, 'v': '_4'}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_8'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'h'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_10'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'test2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_10'}, {'t': 25, 'v': 0}], 'k': '_11'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_13'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_13'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_15'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_14'}], 'k': '_16'}
diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.txt
index 903bc65e43e67a216533cfbd1acaac50fe9b79c2..551d2a992810181cf51b384b56a2db8dadd67278 100644
--- a/testTs/expect/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.txt
+++ b/testTs/expect/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody.txt
@@ -1,4 +1,4 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 0}], 'k': '_4'}
diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt
index dc8fc4c76e26ef33cc7d1562499db42bb018893f..f6e86ee5e759d432bd08be5f5ff4b1fb88966700 100644
--- a/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt
+++ b/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt
@@ -1,21 +1,13 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_14'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_15'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_18'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_19'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_20'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_21'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_9'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_11'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_12'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_13'}
diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt
index 220190028b0ac604d59344957ab8e5f94caa84d8..5567540b518d97146e5f811eb01cd53ac8e1c263 100644
--- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt
+++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt
@@ -1,14 +1,10 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_5'}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_10'}], 'k': '_14'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_9'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_6'}], 'k': '_10'}
diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt
index 220190028b0ac604d59344957ab8e5f94caa84d8..5567540b518d97146e5f811eb01cd53ac8e1c263 100644
--- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt
+++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt
@@ -1,14 +1,10 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_5'}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_10'}], 'k': '_14'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_9'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_6'}], 'k': '_10'}
diff --git a/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt b/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt
index 1c9fccae4221b94897e6c2c28afda92ded917056..e729f0c6dd3744ebab66a82f3caae4a9e310885d 100644
--- a/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt
+++ b/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt
@@ -1,13 +1,9 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_5'}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_5'}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_10'}], 'k': '_13'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_6'}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_6'}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_9'}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_9'}
diff --git a/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt b/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt
index b1804580cd6ca6c8e6a1c375da0ad02c77299ec0..24fee0a13c02235e011e812bdf6a7bbaa37c35c4 100644
--- a/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt
+++ b/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt
@@ -1,13 +1,9 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_9'}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_7'}, {'t': 25, 'v': 0}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 24, 'v': '_11'}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_13'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_4'}], 'k': '_1'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 24, 'v': '_6'}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_9'}
diff --git a/testTs/expect/types/thisType/fluentInterfaces.txt b/testTs/expect/types/thisType/fluentInterfaces.txt
index 293079c5fd3787ecd31957daaaa74c6b6fb4e136..ea74e855eda6b750d1f32912c32da0a00f0ab41c 100644
--- a/testTs/expect/types/thisType/fluentInterfaces.txt
+++ b/testTs/expect/types/thisType/fluentInterfaces.txt
@@ -1,6 +1,6 @@
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_5'}], 'k': '_2'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'}
diff --git a/testTs/expect/types/thisType/thisTypeInClasses.txt b/testTs/expect/types/thisType/thisTypeInClasses.txt
index 72c1ecf23a82e080463f7bc448abda3072a052ee..b3fa8a26fa54ee38f1fcddb3ae281f2f432fc24c 100644
--- a/testTs/expect/types/thisType/thisTypeInClasses.txt
+++ b/testTs/expect/types/thisType/thisTypeInClasses.txt
@@ -14,5 +14,5 @@
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_14'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_15'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_16'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_16'}], 'k': '_18'}
diff --git a/testTs/expect/types/thisType/thisTypeInFunctions3.txt b/testTs/expect/types/thisType/thisTypeInFunctions3.txt
index 57d12d8174b64a5a359f423a69e8ece177d5a00a..edd188f84d2d3a3b758db17b0c42368e69db9f74 100644
--- a/testTs/expect/types/thisType/thisTypeInFunctions3.txt
+++ b/testTs/expect/types/thisType/thisTypeInFunctions3.txt
@@ -1,5 +1,5 @@
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'check'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'check'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'check'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'}
diff --git a/testTs/expect/types/thisType/thisTypeInObjectLiterals.txt b/testTs/expect/types/thisType/thisTypeInObjectLiterals.txt
index c5540fb3196221dd54a5cd23a9cb8c5e77442a1f..2c03c7c282f89291e3569d4e741e580d1d71fbd0 100644
--- a/testTs/expect/types/thisType/thisTypeInObjectLiterals.txt
+++ b/testTs/expect/types/thisType/thisTypeInObjectLiterals.txt
@@ -1,4 +1,4 @@
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_2'}, {'t': 24, 'v': '_3'}, {'t': 24, 'v': '_4'}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'start'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'passthrough'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'sub1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'start'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'passthrough'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'sub1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_4'}
diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt b/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt
index 533469b54911418f712aaa9a90d560a37a55941d..f75f46f7c8ee2720cd364c53c16b9ecc6e2a5827 100644
--- a/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt
+++ b/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt
@@ -4,9 +4,9 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_7'}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'}
diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt
index 6cce6d1e5a49e92c79e6a3586e30abae57cb1fad..966e70304b4c148edf6907833637884d108aa219 100644
--- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt
+++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt
@@ -1,36 +1,29 @@
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_15'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}], 'k': '_16'}
-{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_17'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_19'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_20'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_24'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_25'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_26'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_29'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_30'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_31'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_32'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo12b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_33'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_34'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo14'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_35'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_36'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_15'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_19'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_20'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo12b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_24'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo14'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_25'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_26'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_27'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_28'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_29'}
diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt
index 61725259398a42901a71f6c9760df41a1c191a33..5e7110f5c3151b67d6ae2fcd7bc36ec771cedc05 100644
--- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt
+++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt
@@ -3,28 +3,14 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'inner'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'inner2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_18'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_15'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_19'}
-{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_23'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_26'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_29'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_20'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_24'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_25'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_26'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_29'}
-{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_20'}], 'k': '_30'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'}
+{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_14'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_15'}
+{'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}], 'k': '_16'}
diff --git a/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt b/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt
index 066a064cf7f611ffa13f04a3e2f1f208a47e909c..c631e2869c4b0f354dfb6da33f5d2325e5ccedcf 100644
--- a/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt
+++ b/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt
@@ -13,11 +13,11 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_14'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 8}, {'t': 24, 'v': '_16'}, {'t': 24, 'v': '_17'}, {'t': 24, 'v': '_18'}, {'t': 24, 'v': '_19'}, {'t': 24, 'v': '_20'}, {'t': 24, 'v': '_21'}, {'t': 24, 'v': '_22'}, {'t': 24, 'v': '_23'}], 'k': '_15'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_19'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_20'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_19'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_20'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'}
diff --git a/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt b/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt
index b78b8646308dec0f71abb0b2cf1b9e3d8a21d2d3..bfc18e76d1618c769824b00070f36b689eb3dd70 100644
--- a/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt
+++ b/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt
@@ -20,11 +20,11 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_20'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}], 'k': '_21'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 8}, {'t': 24, 'v': '_23'}, {'t': 24, 'v': '_24'}, {'t': 24, 'v': '_25'}, {'t': 24, 'v': '_26'}, {'t': 24, 'v': '_27'}, {'t': 24, 'v': '_28'}, {'t': 24, 'v': '_29'}, {'t': 24, 'v': '_30'}], 'k': '_22'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_24'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_25'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_26'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_29'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_30'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_24'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_25'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_26'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_29'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_30'}
diff --git a/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt b/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt
index 21c16919d75e376c3c83ce864b12b4dedea752a0..4845d930262491018da949c35d77ee80652f6929 100644
--- a/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt
+++ b/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt
@@ -9,8 +9,8 @@
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_9'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_12'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_12'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_14'}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_14'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_14'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_15'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_16'}
diff --git a/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt b/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt
index 3c1427f1f9be8ffdfc08ed71ad70f69a996bec9a..a11b8faac04d020f99191e3c52dc7a51c53d7f02 100644
--- a/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt
+++ b/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt
@@ -2,7 +2,7 @@
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'insertOnConflictDoNothing'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}, {'t': 24, 'v': '_7'}, {'t': 25, 'v': 2}], 'k': '_3'}
 {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'tableColumns'}, {'t': 24, 'v': '_5'}], 'k': '_4'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'tableColumns'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_7'}], 'k': '_5'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 132}, {'t': 5, 'v': 'tableColumns'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_7'}], 'k': '_5'}
 {'lb': [{'t': 2, 'v': 5}, {'t': 25, 'v': 0}], 'k': '_6'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_7'}
 {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'}
diff --git a/testTs/expect/types/union/contextualTypeWithUnionTypeMembers.txt b/testTs/expect/types/union/contextualTypeWithUnionTypeMembers.txt
index 2e7e8358b9fd62cc69243eda9261313937e48204..e3041ec0d9c77243d06096f31ca82557b018b240 100644
--- a/testTs/expect/types/union/contextualTypeWithUnionTypeMembers.txt
+++ b/testTs/expect/types/union/contextualTypeWithUnionTypeMembers.txt
@@ -1,15 +1,15 @@
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'commonPropertyType'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'propertyOnlyInI1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_2'}, {'t': 24, 'v': '_3'}, {'t': 24, 'v': '_4'}], 'k': '_1'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'commonMethodType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'commonMethodWithTypeParameter'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'methodOnlyInI1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_4'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'commonMethodType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'commonMethodWithTypeParameter'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'methodOnlyInI1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_4'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'commonPropertyType'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'propertyOnlyInI2'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_7'}, {'t': 24, 'v': '_8'}], 'k': '_5'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'commonMethodType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_6'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'commonMethodWithTypeParameter'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'methodOnlyInI2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_8'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'commonMethodType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_6'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'commonMethodWithTypeParameter'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'methodOnlyInI2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_8'}
 {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}, {'t': 24, 'v': '_5'}], 'k': '_9'}
 {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 44}], 'k': '_10'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'commonPropertyDifferentType'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}], 'k': '_11'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'commonMethodDifferentReturnType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}], 'k': '_12'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'commonMethodDifferentReturnType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}], 'k': '_12'}
 {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'commonPropertyDifferentType'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_14'}], 'k': '_13'}
-{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'commonMethodDifferentReturnType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_14'}
+{'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 128}, {'t': 5, 'v': 'commonMethodDifferentReturnType'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_14'}
 {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}, {'t': 24, 'v': '_13'}], 'k': '_15'}
diff --git a/ts2panda/src/base/typeSystem.ts b/ts2panda/src/base/typeSystem.ts
index 5c1cc93f53643ea4903fb597f912b087133cbd4a..532b5bdbe93799b21b6a5965540fe921167daee4 100644
--- a/ts2panda/src/base/typeSystem.ts
+++ b/ts2panda/src/base/typeSystem.ts
@@ -132,7 +132,8 @@ export enum MethodModifier {
     STATIC = 1 << 2,
     ASYNC = 1 << 3,
     ASTERISK = 1 << 4,
-    ABSTRACT = 1 << 6  // The fifth bit is held by GetOrSetAccessorFlag
+    ABSTRACT = 1 << 6,  // The fifth bit is held by GetOrSetAccessorFlag
+    DECLARE = 1 << 7
 }
 
 export enum ModifierReadonly {
@@ -276,9 +277,9 @@ export class ClassType extends BaseType {
     implementsHeritages: Array<number> = new Array<number>();
     // fileds Array: [typeIndex] [public -> 0, private -> 1, protected -> 2] [readonly -> 1]
     staticFields: Map<string, Array<number>> = new Map<string, Array<number>>();
-    staticMethods: Map<string, number> = new Map<string, number>();
+    staticMethods: Map<string, {typeIndex: number, isDeclare: boolean}> = new Map<string, {typeIndex: number, isDeclare: boolean}>();
     fields: Map<string, Array<number>> = new Map<string, Array<number>>();
-    methods: Map<string, number> = new Map<string, number>();
+    methods: Map<string, {typeIndex: number, isDeclare: boolean}> = new Map<string, {typeIndex: number, isDeclare: boolean}>();
     typeIndex: number;
     shiftedTypeIndex: number;
     field_with_init_num: number = 0;
@@ -393,6 +394,20 @@ export class ClassType extends BaseType {
         if (this.typeChecker.isFromDefaultLib(member)) {
             return;
         }
+        let funcName = member.name ? jshelpers.getTextOfIdentifierOrLiteral(member.name) : "constructor";
+        let isStatic = false;
+        if (member.modifiers) {
+            for (let modifier of member.modifiers) {
+                if (modifier.kind == ts.SyntaxKind.StaticKeyword) {
+                    isStatic = true;
+                }
+            }
+        }
+        let foundSameNameFuncRet = isStatic ?  this.staticMethods.get(funcName) : this.methods.get(funcName);
+        if (foundSameNameFuncRet && foundSameNameFuncRet!.isDeclare) {
+            // A same named method with implementation has already been recorded
+            return;
+        }
         let variableNode = member.name ? member.name : undefined;
         let funcType = new FunctionType(<ts.FunctionLikeDeclaration>member);
         if (variableNode) {
@@ -400,12 +415,11 @@ export class ClassType extends BaseType {
         }
 
         // Then, get the typeIndex and fill in the methods array
-        let typeIndex = this.tryGetTypeIndex(member);
-        let isStatic = funcType.hasModifier(MethodModifier.STATIC);
+        let type = this.tryGetTypeIndex(member);
         if (isStatic) {
-            this.staticMethods.set(funcType.getFunctionName(), typeIndex!);
+            this.staticMethods.set(funcType.getFunctionName(), {typeIndex: type!, isDeclare: member.body == undefined});
         } else {
-            this.methods.set(funcType.getFunctionName(), typeIndex!);
+            this.methods.set(funcType.getFunctionName(), {typeIndex: type!, isDeclare: member.body == undefined});
             if (member.body != undefined) {
                 this.method_with_body_num++;
             }
@@ -475,12 +489,13 @@ export class ClassType extends BaseType {
     }
 
     private transferMethods2Literal(classTypeLiterals: Array<Literal>, isStatic: boolean) {
-        let transferredTarget: Map<string, number> = isStatic ? this.staticMethods : this.methods;
+        let transferredTarget: Map<string, {typeIndex: number, isDeclare: boolean}> = isStatic ? this.staticMethods : this.methods;
 
         classTypeLiterals.push(new Literal(LiteralTag.INTEGER, transferredTarget.size));
         transferredTarget.forEach((typeInfo, name) => {
+            let typeIndex: number = <number>typeInfo.typeIndex;
             classTypeLiterals.push(new Literal(LiteralTag.STRING, name));
-            this.transferType2Literal(typeInfo, classTypeLiterals);
+            this.transferType2Literal(typeIndex, classTypeLiterals);
         });
     }
 }
@@ -584,6 +599,9 @@ export class FunctionType extends BaseType {
         if (!ts.isMethodSignature(node) && node.asteriskToken) {
             this.modifiers += MethodModifier.ASTERISK;
         }
+        if (ts.isMethodSignature(node) || !<ts.FunctionLikeDeclaration>node.body) {
+            this.modifiers += MethodModifier.DECLARE;
+        }
     }
 
     private fillInParameters(node: ts.FunctionLikeDeclaration | ts.MethodSignature) {