diff --git a/src/test/e2e-emulated/__snapshots__/local-type-inference.spec.ts.snap b/src/test/e2e-emulated/__snapshots__/local-type-inference.spec.ts.snap
index b532d1103..5573c4ad8 100644
--- a/src/test/e2e-emulated/__snapshots__/local-type-inference.spec.ts.snap
+++ b/src/test/e2e-emulated/__snapshots__/local-type-inference.spec.ts.snap
@@ -39,6 +39,12 @@ exports[`local-type-inference should automatically set types for let statements
     "135": {
       "message": "Code of a contract was not found",
     },
+    "136": {
+      "message": "Invalid address",
+    },
+    "137": {
+      "message": "Masterchain support is not enabled for this contract",
+    },
     "14": {
       "message": "Virtualization error",
     },
diff --git a/src/types/__snapshots__/resolveDescriptors.spec.ts.snap b/src/types/__snapshots__/resolveDescriptors.spec.ts.snap
index afee0a9ce..1b1cd6331 100644
--- a/src/types/__snapshots__/resolveDescriptors.spec.ts.snap
+++ b/src/types/__snapshots__/resolveDescriptors.spec.ts.snap
@@ -9088,7 +9088,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
       "loc": primitive Int;,
       "name": {
         "id": 1,
-        "kind": "type_id",
+        "kind": "id",
         "loc": Int,
         "text": "Int",
       },
@@ -9231,7 +9231,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
               "type": "get",
             },
           ],
-          "id": 54,
+          "id": 58,
           "kind": "function_def",
           "loc": get fun test1(): Int {
         let m1: map<Int, Int as varint16> = emptyMap();
@@ -9305,20 +9305,20 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 30,
+                    "id": 31,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 31,
+                    "id": 32,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 32,
+                "id": 33,
                 "kind": "method_call",
                 "loc": m1.set(1, 2),
                 "method": {
@@ -9334,7 +9334,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                   "text": "m1",
                 },
               },
-              "id": 33,
+              "id": 34,
               "kind": "statement_expression",
               "loc": m1.set(1, 2);,
             },
@@ -9343,75 +9343,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 38,
+                    "id": 40,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 39,
+                    "id": 41,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 40,
+                "id": 42,
                 "kind": "method_call",
                 "loc": self.m1.set(1, 2),
                 "method": {
-                  "id": 37,
+                  "id": 38,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 34,
+                    "id": 35,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 35,
+                    "id": 36,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
                   },
-                  "id": 36,
+                  "id": 37,
                   "kind": "field_access",
                   "loc": self.m1,
                 },
               },
-              "id": 41,
+              "id": 43,
               "kind": "statement_expression",
               "loc": self.m1.set(1, 2);,
             },
             {
               "expression": {
-                "id": 52,
+                "id": 56,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 44,
+                      "id": 47,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 45,
+                  "id": 48,
                   "kind": "method_call",
                   "loc": m1.get(1),
                   "method": {
-                    "id": 43,
+                    "id": 45,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 42,
+                    "id": 44,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
@@ -9423,41 +9423,41 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                   "args": [
                     {
                       "base": 10,
-                      "id": 50,
+                      "id": 54,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 51,
+                  "id": 55,
                   "kind": "method_call",
                   "loc": self.m1.get(1),
                   "method": {
-                    "id": 49,
+                    "id": 52,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 46,
+                      "id": 49,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 47,
+                      "id": 50,
                       "kind": "id",
                       "loc": m1,
                       "text": "m1",
                     },
-                    "id": 48,
+                    "id": 51,
                     "kind": "field_access",
                     "loc": self.m1,
                   },
                 },
               },
-              "id": 53,
+              "id": 57,
               "kind": "statement_return",
               "loc": return m1.get(1) + self.m1.get(1);,
             },
@@ -9472,7 +9472,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
               "type": "get",
             },
           ],
-          "id": 91,
+          "id": 99,
           "kind": "function_def",
           "loc": get fun test2(): Int {
         let m2: map<Int, Int as varint32> = emptyMap();
@@ -9481,14 +9481,14 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
         return m2.get(1) + self.m2.get(1);
     },
           "name": {
-            "id": 55,
+            "id": 59,
             "kind": "id",
             "loc": test2,
             "text": "test2",
           },
           "params": [],
           "return": {
-            "id": 56,
+            "id": 60,
             "kind": "type_id",
             "loc": Int,
             "text": "Int",
@@ -9498,29 +9498,29 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
               "expression": {
                 "args": [],
                 "function": {
-                  "id": 62,
+                  "id": 66,
                   "kind": "id",
                   "loc": emptyMap,
                   "text": "emptyMap",
                 },
-                "id": 63,
+                "id": 67,
                 "kind": "static_call",
                 "loc": emptyMap(),
               },
-              "id": 64,
+              "id": 68,
               "kind": "statement_let",
               "loc": let m2: map<Int, Int as varint32> = emptyMap();,
               "name": {
-                "id": 57,
+                "id": 61,
                 "kind": "id",
                 "loc": m2,
                 "text": "m2",
               },
               "type": {
-                "id": 61,
+                "id": 65,
                 "keyStorageType": null,
                 "keyType": {
-                  "id": 58,
+                  "id": 62,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -9528,13 +9528,13 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "kind": "map_type",
                 "loc": map<Int, Int as varint32>,
                 "valueStorageType": {
-                  "id": 60,
+                  "id": 64,
                   "kind": "id",
                   "loc": varint32,
                   "text": "varint32",
                 },
                 "valueType": {
-                  "id": 59,
+                  "id": 63,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -9546,36 +9546,36 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 67,
+                    "id": 72,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 68,
+                    "id": 73,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 69,
+                "id": 74,
                 "kind": "method_call",
                 "loc": m2.set(1, 2),
                 "method": {
-                  "id": 66,
+                  "id": 70,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
-                  "id": 65,
+                  "id": 69,
                   "kind": "id",
                   "loc": m2,
                   "text": "m2",
                 },
               },
-              "id": 70,
+              "id": 75,
               "kind": "statement_expression",
               "loc": m2.set(1, 2);,
             },
@@ -9584,75 +9584,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 75,
+                    "id": 81,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 76,
+                    "id": 82,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 77,
+                "id": 83,
                 "kind": "method_call",
                 "loc": self.m2.set(1, 2),
                 "method": {
-                  "id": 74,
+                  "id": 79,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 71,
+                    "id": 76,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 72,
+                    "id": 77,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
                   },
-                  "id": 73,
+                  "id": 78,
                   "kind": "field_access",
                   "loc": self.m2,
                 },
               },
-              "id": 78,
+              "id": 84,
               "kind": "statement_expression",
               "loc": self.m2.set(1, 2);,
             },
             {
               "expression": {
-                "id": 89,
+                "id": 97,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 81,
+                      "id": 88,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 82,
+                  "id": 89,
                   "kind": "method_call",
                   "loc": m2.get(1),
                   "method": {
-                    "id": 80,
+                    "id": 86,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 79,
+                    "id": 85,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
@@ -9664,48 +9664,48 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                   "args": [
                     {
                       "base": 10,
-                      "id": 87,
+                      "id": 95,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 88,
+                  "id": 96,
                   "kind": "method_call",
                   "loc": self.m2.get(1),
                   "method": {
-                    "id": 86,
+                    "id": 93,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 83,
+                      "id": 90,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 84,
+                      "id": 91,
                       "kind": "id",
                       "loc": m2,
                       "text": "m2",
                     },
-                    "id": 85,
+                    "id": 92,
                     "kind": "field_access",
                     "loc": self.m2,
                   },
                 },
               },
-              "id": 90,
+              "id": 98,
               "kind": "statement_return",
               "loc": return m2.get(1) + self.m2.get(1);,
             },
           ],
         },
       ],
-      "id": 92,
+      "id": 100,
       "kind": "contract",
       "loc": contract Main {
     m1: map<Int, Int as varint16>;
@@ -9870,7 +9870,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
               "type": "get",
             },
           ],
-          "id": 54,
+          "id": 58,
           "kind": "function_def",
           "loc": get fun test1(): Int {
         let m1: map<Int, Int as varint16> = emptyMap();
@@ -9944,20 +9944,20 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 30,
+                    "id": 31,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 31,
+                    "id": 32,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 32,
+                "id": 33,
                 "kind": "method_call",
                 "loc": m1.set(1, 2),
                 "method": {
@@ -9973,7 +9973,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                   "text": "m1",
                 },
               },
-              "id": 33,
+              "id": 34,
               "kind": "statement_expression",
               "loc": m1.set(1, 2);,
             },
@@ -9982,75 +9982,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 38,
+                    "id": 40,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 39,
+                    "id": 41,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 40,
+                "id": 42,
                 "kind": "method_call",
                 "loc": self.m1.set(1, 2),
                 "method": {
-                  "id": 37,
+                  "id": 38,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 34,
+                    "id": 35,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 35,
+                    "id": 36,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
                   },
-                  "id": 36,
+                  "id": 37,
                   "kind": "field_access",
                   "loc": self.m1,
                 },
               },
-              "id": 41,
+              "id": 43,
               "kind": "statement_expression",
               "loc": self.m1.set(1, 2);,
             },
             {
               "expression": {
-                "id": 52,
+                "id": 56,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 44,
+                      "id": 47,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 45,
+                  "id": 48,
                   "kind": "method_call",
                   "loc": m1.get(1),
                   "method": {
-                    "id": 43,
+                    "id": 45,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 42,
+                    "id": 44,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
@@ -10062,41 +10062,41 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                   "args": [
                     {
                       "base": 10,
-                      "id": 50,
+                      "id": 54,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 51,
+                  "id": 55,
                   "kind": "method_call",
                   "loc": self.m1.get(1),
                   "method": {
-                    "id": 49,
+                    "id": 52,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 46,
+                      "id": 49,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 47,
+                      "id": 50,
                       "kind": "id",
                       "loc": m1,
                       "text": "m1",
                     },
-                    "id": 48,
+                    "id": 51,
                     "kind": "field_access",
                     "loc": self.m1,
                   },
                 },
               },
-              "id": 53,
+              "id": 57,
               "kind": "statement_return",
               "loc": return m1.get(1) + self.m1.get(1);,
             },
@@ -10133,7 +10133,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
               "type": "get",
             },
           ],
-          "id": 91,
+          "id": 99,
           "kind": "function_def",
           "loc": get fun test2(): Int {
         let m2: map<Int, Int as varint32> = emptyMap();
@@ -10142,14 +10142,14 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
         return m2.get(1) + self.m2.get(1);
     },
           "name": {
-            "id": 55,
+            "id": 59,
             "kind": "id",
             "loc": test2,
             "text": "test2",
           },
           "params": [],
           "return": {
-            "id": 56,
+            "id": 60,
             "kind": "type_id",
             "loc": Int,
             "text": "Int",
@@ -10159,29 +10159,29 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
               "expression": {
                 "args": [],
                 "function": {
-                  "id": 62,
+                  "id": 66,
                   "kind": "id",
                   "loc": emptyMap,
                   "text": "emptyMap",
                 },
-                "id": 63,
+                "id": 67,
                 "kind": "static_call",
                 "loc": emptyMap(),
               },
-              "id": 64,
+              "id": 68,
               "kind": "statement_let",
               "loc": let m2: map<Int, Int as varint32> = emptyMap();,
               "name": {
-                "id": 57,
+                "id": 61,
                 "kind": "id",
                 "loc": m2,
                 "text": "m2",
               },
               "type": {
-                "id": 61,
+                "id": 65,
                 "keyStorageType": null,
                 "keyType": {
-                  "id": 58,
+                  "id": 62,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -10189,13 +10189,13 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "kind": "map_type",
                 "loc": map<Int, Int as varint32>,
                 "valueStorageType": {
-                  "id": 60,
+                  "id": 64,
                   "kind": "id",
                   "loc": varint32,
                   "text": "varint32",
                 },
                 "valueType": {
-                  "id": 59,
+                  "id": 63,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -10207,36 +10207,36 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 67,
+                    "id": 72,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 68,
+                    "id": 73,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 69,
+                "id": 74,
                 "kind": "method_call",
                 "loc": m2.set(1, 2),
                 "method": {
-                  "id": 66,
+                  "id": 70,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
-                  "id": 65,
+                  "id": 69,
                   "kind": "id",
                   "loc": m2,
                   "text": "m2",
                 },
               },
-              "id": 70,
+              "id": 75,
               "kind": "statement_expression",
               "loc": m2.set(1, 2);,
             },
@@ -10245,75 +10245,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                 "args": [
                   {
                     "base": 10,
-                    "id": 75,
+                    "id": 81,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 76,
+                    "id": 82,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 77,
+                "id": 83,
                 "kind": "method_call",
                 "loc": self.m2.set(1, 2),
                 "method": {
-                  "id": 74,
+                  "id": 79,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 71,
+                    "id": 76,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 72,
+                    "id": 77,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
                   },
-                  "id": 73,
+                  "id": 78,
                   "kind": "field_access",
                   "loc": self.m2,
                 },
               },
-              "id": 78,
+              "id": 84,
               "kind": "statement_expression",
               "loc": self.m2.set(1, 2);,
             },
             {
               "expression": {
-                "id": 89,
+                "id": 97,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 81,
+                      "id": 88,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 82,
+                  "id": 89,
                   "kind": "method_call",
                   "loc": m2.get(1),
                   "method": {
-                    "id": 80,
+                    "id": 86,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 79,
+                    "id": 85,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
@@ -10325,41 +10325,41 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
                   "args": [
                     {
                       "base": 10,
-                      "id": 87,
+                      "id": 95,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 88,
+                  "id": 96,
                   "kind": "method_call",
                   "loc": self.m2.get(1),
                   "method": {
-                    "id": 86,
+                    "id": 93,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 83,
+                      "id": 90,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 84,
+                      "id": 91,
                       "kind": "id",
                       "loc": m2,
                       "text": "m2",
                     },
-                    "id": 85,
+                    "id": 92,
                     "kind": "field_access",
                     "loc": self.m2,
                   },
                 },
               },
-              "id": 90,
+              "id": 98,
               "kind": "statement_return",
               "loc": return m2.get(1) + self.m2.get(1);,
             },
@@ -10390,7 +10390,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varint 1
     "header": null,
     "init": {
       "ast": {
-        "id": 94,
+        "id": 102,
         "kind": "contract_init",
         "loc": contract Main {
     m1: map<Int, Int as varint16>;
@@ -10475,7 +10475,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
       "loc": primitive Int;,
       "name": {
         "id": 1,
-        "kind": "type_id",
+        "kind": "id",
         "loc": Int,
         "text": "Int",
       },
@@ -10618,7 +10618,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
               "type": "get",
             },
           ],
-          "id": 54,
+          "id": 58,
           "kind": "function_def",
           "loc": get fun test1(): Int {
         let m1: map<Int, Int as varuint16> = emptyMap();
@@ -10692,20 +10692,20 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 30,
+                    "id": 31,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 31,
+                    "id": 32,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 32,
+                "id": 33,
                 "kind": "method_call",
                 "loc": m1.set(1, 2),
                 "method": {
@@ -10721,7 +10721,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                   "text": "m1",
                 },
               },
-              "id": 33,
+              "id": 34,
               "kind": "statement_expression",
               "loc": m1.set(1, 2);,
             },
@@ -10730,75 +10730,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 38,
+                    "id": 40,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 39,
+                    "id": 41,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 40,
+                "id": 42,
                 "kind": "method_call",
                 "loc": self.m1.set(1, 2),
                 "method": {
-                  "id": 37,
+                  "id": 38,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 34,
+                    "id": 35,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 35,
+                    "id": 36,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
                   },
-                  "id": 36,
+                  "id": 37,
                   "kind": "field_access",
                   "loc": self.m1,
                 },
               },
-              "id": 41,
+              "id": 43,
               "kind": "statement_expression",
               "loc": self.m1.set(1, 2);,
             },
             {
               "expression": {
-                "id": 52,
+                "id": 56,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 44,
+                      "id": 47,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 45,
+                  "id": 48,
                   "kind": "method_call",
                   "loc": m1.get(1),
                   "method": {
-                    "id": 43,
+                    "id": 45,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 42,
+                    "id": 44,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
@@ -10810,41 +10810,41 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                   "args": [
                     {
                       "base": 10,
-                      "id": 50,
+                      "id": 54,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 51,
+                  "id": 55,
                   "kind": "method_call",
                   "loc": self.m1.get(1),
                   "method": {
-                    "id": 49,
+                    "id": 52,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 46,
+                      "id": 49,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 47,
+                      "id": 50,
                       "kind": "id",
                       "loc": m1,
                       "text": "m1",
                     },
-                    "id": 48,
+                    "id": 51,
                     "kind": "field_access",
                     "loc": self.m1,
                   },
                 },
               },
-              "id": 53,
+              "id": 57,
               "kind": "statement_return",
               "loc": return m1.get(1) + self.m1.get(1);,
             },
@@ -10859,7 +10859,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
               "type": "get",
             },
           ],
-          "id": 91,
+          "id": 99,
           "kind": "function_def",
           "loc": get fun test2(): Int {
         let m2: map<Int, Int as varuint32> = emptyMap();
@@ -10868,14 +10868,14 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
         return m2.get(1) + self.m2.get(1);
     },
           "name": {
-            "id": 55,
+            "id": 59,
             "kind": "id",
             "loc": test2,
             "text": "test2",
           },
           "params": [],
           "return": {
-            "id": 56,
+            "id": 60,
             "kind": "type_id",
             "loc": Int,
             "text": "Int",
@@ -10885,29 +10885,29 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
               "expression": {
                 "args": [],
                 "function": {
-                  "id": 62,
+                  "id": 66,
                   "kind": "id",
                   "loc": emptyMap,
                   "text": "emptyMap",
                 },
-                "id": 63,
+                "id": 67,
                 "kind": "static_call",
                 "loc": emptyMap(),
               },
-              "id": 64,
+              "id": 68,
               "kind": "statement_let",
               "loc": let m2: map<Int, Int as varuint32> = emptyMap();,
               "name": {
-                "id": 57,
+                "id": 61,
                 "kind": "id",
                 "loc": m2,
                 "text": "m2",
               },
               "type": {
-                "id": 61,
+                "id": 65,
                 "keyStorageType": null,
                 "keyType": {
-                  "id": 58,
+                  "id": 62,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -10915,13 +10915,13 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "kind": "map_type",
                 "loc": map<Int, Int as varuint32>,
                 "valueStorageType": {
-                  "id": 60,
+                  "id": 64,
                   "kind": "id",
                   "loc": varuint32,
                   "text": "varuint32",
                 },
                 "valueType": {
-                  "id": 59,
+                  "id": 63,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -10933,36 +10933,36 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 67,
+                    "id": 72,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 68,
+                    "id": 73,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 69,
+                "id": 74,
                 "kind": "method_call",
                 "loc": m2.set(1, 2),
                 "method": {
-                  "id": 66,
+                  "id": 70,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
-                  "id": 65,
+                  "id": 69,
                   "kind": "id",
                   "loc": m2,
                   "text": "m2",
                 },
               },
-              "id": 70,
+              "id": 75,
               "kind": "statement_expression",
               "loc": m2.set(1, 2);,
             },
@@ -10971,75 +10971,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 75,
+                    "id": 81,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 76,
+                    "id": 82,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 77,
+                "id": 83,
                 "kind": "method_call",
                 "loc": self.m2.set(1, 2),
                 "method": {
-                  "id": 74,
+                  "id": 79,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 71,
+                    "id": 76,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 72,
+                    "id": 77,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
                   },
-                  "id": 73,
+                  "id": 78,
                   "kind": "field_access",
                   "loc": self.m2,
                 },
               },
-              "id": 78,
+              "id": 84,
               "kind": "statement_expression",
               "loc": self.m2.set(1, 2);,
             },
             {
               "expression": {
-                "id": 89,
+                "id": 97,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 81,
+                      "id": 88,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 82,
+                  "id": 89,
                   "kind": "method_call",
                   "loc": m2.get(1),
                   "method": {
-                    "id": 80,
+                    "id": 86,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 79,
+                    "id": 85,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
@@ -11051,48 +11051,48 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                   "args": [
                     {
                       "base": 10,
-                      "id": 87,
+                      "id": 95,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 88,
+                  "id": 96,
                   "kind": "method_call",
                   "loc": self.m2.get(1),
                   "method": {
-                    "id": 86,
+                    "id": 93,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 83,
+                      "id": 90,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 84,
+                      "id": 91,
                       "kind": "id",
                       "loc": m2,
                       "text": "m2",
                     },
-                    "id": 85,
+                    "id": 92,
                     "kind": "field_access",
                     "loc": self.m2,
                   },
                 },
               },
-              "id": 90,
+              "id": 98,
               "kind": "statement_return",
               "loc": return m2.get(1) + self.m2.get(1);,
             },
           ],
         },
       ],
-      "id": 92,
+      "id": 100,
       "kind": "contract",
       "loc": contract Main {
     m1: map<Int, Int as varuint16>;
@@ -11257,7 +11257,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
               "type": "get",
             },
           ],
-          "id": 54,
+          "id": 58,
           "kind": "function_def",
           "loc": get fun test1(): Int {
         let m1: map<Int, Int as varuint16> = emptyMap();
@@ -11331,20 +11331,20 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 30,
+                    "id": 31,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 31,
+                    "id": 32,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 32,
+                "id": 33,
                 "kind": "method_call",
                 "loc": m1.set(1, 2),
                 "method": {
@@ -11360,7 +11360,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                   "text": "m1",
                 },
               },
-              "id": 33,
+              "id": 34,
               "kind": "statement_expression",
               "loc": m1.set(1, 2);,
             },
@@ -11369,75 +11369,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 38,
+                    "id": 40,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 39,
+                    "id": 41,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 40,
+                "id": 42,
                 "kind": "method_call",
                 "loc": self.m1.set(1, 2),
                 "method": {
-                  "id": 37,
+                  "id": 38,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 34,
+                    "id": 35,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 35,
+                    "id": 36,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
                   },
-                  "id": 36,
+                  "id": 37,
                   "kind": "field_access",
                   "loc": self.m1,
                 },
               },
-              "id": 41,
+              "id": 43,
               "kind": "statement_expression",
               "loc": self.m1.set(1, 2);,
             },
             {
               "expression": {
-                "id": 52,
+                "id": 56,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 44,
+                      "id": 47,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 45,
+                  "id": 48,
                   "kind": "method_call",
                   "loc": m1.get(1),
                   "method": {
-                    "id": 43,
+                    "id": 45,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 42,
+                    "id": 44,
                     "kind": "id",
                     "loc": m1,
                     "text": "m1",
@@ -11449,41 +11449,41 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                   "args": [
                     {
                       "base": 10,
-                      "id": 50,
+                      "id": 54,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 51,
+                  "id": 55,
                   "kind": "method_call",
                   "loc": self.m1.get(1),
                   "method": {
-                    "id": 49,
+                    "id": 52,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 46,
+                      "id": 49,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 47,
+                      "id": 50,
                       "kind": "id",
                       "loc": m1,
                       "text": "m1",
                     },
-                    "id": 48,
+                    "id": 51,
                     "kind": "field_access",
                     "loc": self.m1,
                   },
                 },
               },
-              "id": 53,
+              "id": 57,
               "kind": "statement_return",
               "loc": return m1.get(1) + self.m1.get(1);,
             },
@@ -11520,7 +11520,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
               "type": "get",
             },
           ],
-          "id": 91,
+          "id": 99,
           "kind": "function_def",
           "loc": get fun test2(): Int {
         let m2: map<Int, Int as varuint32> = emptyMap();
@@ -11529,14 +11529,14 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
         return m2.get(1) + self.m2.get(1);
     },
           "name": {
-            "id": 55,
+            "id": 59,
             "kind": "id",
             "loc": test2,
             "text": "test2",
           },
           "params": [],
           "return": {
-            "id": 56,
+            "id": 60,
             "kind": "type_id",
             "loc": Int,
             "text": "Int",
@@ -11546,29 +11546,29 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
               "expression": {
                 "args": [],
                 "function": {
-                  "id": 62,
+                  "id": 66,
                   "kind": "id",
                   "loc": emptyMap,
                   "text": "emptyMap",
                 },
-                "id": 63,
+                "id": 67,
                 "kind": "static_call",
                 "loc": emptyMap(),
               },
-              "id": 64,
+              "id": 68,
               "kind": "statement_let",
               "loc": let m2: map<Int, Int as varuint32> = emptyMap();,
               "name": {
-                "id": 57,
+                "id": 61,
                 "kind": "id",
                 "loc": m2,
                 "text": "m2",
               },
               "type": {
-                "id": 61,
+                "id": 65,
                 "keyStorageType": null,
                 "keyType": {
-                  "id": 58,
+                  "id": 62,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -11576,13 +11576,13 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "kind": "map_type",
                 "loc": map<Int, Int as varuint32>,
                 "valueStorageType": {
-                  "id": 60,
+                  "id": 64,
                   "kind": "id",
                   "loc": varuint32,
                   "text": "varuint32",
                 },
                 "valueType": {
-                  "id": 59,
+                  "id": 63,
                   "kind": "type_id",
                   "loc": Int,
                   "text": "Int",
@@ -11594,36 +11594,36 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 67,
+                    "id": 72,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 68,
+                    "id": 73,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 69,
+                "id": 74,
                 "kind": "method_call",
                 "loc": m2.set(1, 2),
                 "method": {
-                  "id": 66,
+                  "id": 70,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
-                  "id": 65,
+                  "id": 69,
                   "kind": "id",
                   "loc": m2,
                   "text": "m2",
                 },
               },
-              "id": 70,
+              "id": 75,
               "kind": "statement_expression",
               "loc": m2.set(1, 2);,
             },
@@ -11632,75 +11632,75 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                 "args": [
                   {
                     "base": 10,
-                    "id": 75,
+                    "id": 81,
                     "kind": "number",
                     "loc": 1,
                     "value": 1n,
                   },
                   {
                     "base": 10,
-                    "id": 76,
+                    "id": 82,
                     "kind": "number",
                     "loc": 2,
                     "value": 2n,
                   },
                 ],
-                "id": 77,
+                "id": 83,
                 "kind": "method_call",
                 "loc": self.m2.set(1, 2),
                 "method": {
-                  "id": 74,
+                  "id": 79,
                   "kind": "id",
                   "loc": set,
                   "text": "set",
                 },
                 "self": {
                   "aggregate": {
-                    "id": 71,
+                    "id": 76,
                     "kind": "id",
                     "loc": self,
                     "text": "self",
                   },
                   "field": {
-                    "id": 72,
+                    "id": 77,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
                   },
-                  "id": 73,
+                  "id": 78,
                   "kind": "field_access",
                   "loc": self.m2,
                 },
               },
-              "id": 78,
+              "id": 84,
               "kind": "statement_expression",
               "loc": self.m2.set(1, 2);,
             },
             {
               "expression": {
-                "id": 89,
+                "id": 97,
                 "kind": "op_binary",
                 "left": {
                   "args": [
                     {
                       "base": 10,
-                      "id": 81,
+                      "id": 88,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 82,
+                  "id": 89,
                   "kind": "method_call",
                   "loc": m2.get(1),
                   "method": {
-                    "id": 80,
+                    "id": 86,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
-                    "id": 79,
+                    "id": 85,
                     "kind": "id",
                     "loc": m2,
                     "text": "m2",
@@ -11712,41 +11712,41 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
                   "args": [
                     {
                       "base": 10,
-                      "id": 87,
+                      "id": 95,
                       "kind": "number",
                       "loc": 1,
                       "value": 1n,
                     },
                   ],
-                  "id": 88,
+                  "id": 96,
                   "kind": "method_call",
                   "loc": self.m2.get(1),
                   "method": {
-                    "id": 86,
+                    "id": 93,
                     "kind": "id",
                     "loc": get,
                     "text": "get",
                   },
                   "self": {
                     "aggregate": {
-                      "id": 83,
+                      "id": 90,
                       "kind": "id",
                       "loc": self,
                       "text": "self",
                     },
                     "field": {
-                      "id": 84,
+                      "id": 91,
                       "kind": "id",
                       "loc": m2,
                       "text": "m2",
                     },
-                    "id": 85,
+                    "id": 92,
                     "kind": "field_access",
                     "loc": self.m2,
                   },
                 },
               },
-              "id": 90,
+              "id": 98,
               "kind": "statement_return",
               "loc": return m2.get(1) + self.m2.get(1);,
             },
@@ -11777,7 +11777,7 @@ exports[`resolveDescriptors should resolve descriptors for map-value-as-varuint
     "header": null,
     "init": {
       "ast": {
-        "id": 94,
+        "id": 102,
         "kind": "contract_init",
         "loc": contract Main {
     m1: map<Int, Int as varuint16>;