diff --git a/src/instrumenter/interpose.ts b/src/instrumenter/interpose.ts
index c2c40f8e..4f6a94a5 100644
--- a/src/instrumenter/interpose.ts
+++ b/src/instrumenter/interpose.ts
@@ -222,7 +222,7 @@ export function interpose(
 
     fun.documentation = undefined;
     stub.documentation = undefined;
-    fun.visibility = FunctionVisibility.Private;
+    fun.visibility = FunctionVisibility.Internal;
     fun.isConstructor = false;
     renameReturns(stub);
 
diff --git a/stdlib/erc1155.scribble.yaml b/stdlib/erc1155.scribble.yaml
new file mode 100644
index 00000000..55ca85e4
--- /dev/null
+++ b/stdlib/erc1155.scribble.yaml
@@ -0,0 +1,26 @@
+erc1155:
+    variables:
+    properties:
+        safeTransferFrom(from, to, tokenId, value, data):
+            - msg: "Cannot transfer to 0 address"
+              prop: "#if_succeeds to != address(0);"
+            - msg: "sender must have sufficient balance"
+              prop: "#if_succeeds old(balanceOf(from, tokenId)) >= value;"
+            - msg: "Sender must be properly authorized to transfer"
+              prop: "#if_succeeds msg.sender == from || old(isApprovedForAll(from, msg.sender));"
+            - msg: "Sender lost value tokens"
+              prop: "#if_succeeds balanceOf(from, tokenId) == old(balanceOf(from, tokenId)) - value;"
+            - msg: "Recipient gained value tokens (assuming non-deflationary tokens)"
+              prop: "#if_succeeds balanceOf(to, tokenId) == old(balanceOf(to, tokenId)) + value;"
+        safeBatchTransferFrom(from, to, ids, values, data):
+            - msg: "Cannot transfer to 0 address"
+              prop: "#if_succeeds to != address(0);"
+            - msg: "Ids and values must have equal length"
+              prop: "#if_succeeds values.length == ids.length;"
+            - msg: "sender must have sufficient balance"
+              prop: "#if_succeeds old(forall(uint i in ids) balanceOf(from, ids[i]) >= values[i]);"
+            - msg: "Sender must be properly authorized to transfer"
+              prop: "#if_succeeds msg.sender == from || old(isApprovedForAll(from, msg.sender));"
+        setApprovalForAll(operator, approved):
+            - msg: "setApprovalForAll worked correctly"
+              prop: "#if_succeeds approved == isApprovedForAll(msg.sender, operator);"
diff --git a/test/integration/scribble/run/filtering.spec.ts b/test/integration/scribble/run/filtering.spec.ts
index 15d18618..153d30cc 100644
--- a/test/integration/scribble/run/filtering.spec.ts
+++ b/test/integration/scribble/run/filtering.spec.ts
@@ -27,7 +27,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_foo(uint256 a) private returns (uint256 b) {
+    function _original_Foo_foo(uint256 a) internal returns (uint256 b) {
         return a + 1;
     }
 }
@@ -87,14 +87,14 @@ contract Foo {
         __ScribbleUtilsLib__29.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_foo(uint256 a) private returns (uint256 b) {
+    function _original_Foo_foo(uint256 a) internal returns (uint256 b) {
         return a + 1;
     }
 
     /// Check only the current contract's state invariants
     function __scribble_Foo_check_state_invariants_internal() internal {
         if (!(x == 0)) {
-            emit __ScribbleUtilsLib__29.AssertionFailed("001274:0075:000 1: Medium.P1");
+            emit __ScribbleUtilsLib__29.AssertionFailed("001275:0075:000 1: Medium.P1");
             assert(false);
         }
     }
@@ -137,14 +137,14 @@ contract Foo {
         __ScribbleUtilsLib__29.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_foo(uint256 a) private returns (uint256 b) {
+    function _original_Foo_foo(uint256 a) internal returns (uint256 b) {
         return a + 1;
     }
 
     /// Check only the current contract's state invariants
     function __scribble_Foo_check_state_invariants_internal() internal {
         if (!(x < 0)) {
-            emit __ScribbleUtilsLib__29.AssertionFailed("001432:0077:000 2: Critical.P2");
+            emit __ScribbleUtilsLib__29.AssertionFailed("001433:0077:000 2: Critical.P2");
             assert(false);
         }
     }
diff --git a/test/multifile_samples/arr_sum/flat.sol.expected b/test/multifile_samples/arr_sum/flat.sol.expected
index b2179245..d19efd89 100644
--- a/test/multifile_samples/arr_sum/flat.sol.expected
+++ b/test/multifile_samples/arr_sum/flat.sol.expected
@@ -16,7 +16,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_pushA(uint k) private {
+    function _original_Foo_pushA(uint k) internal {
         a.push(k);
     }
 
@@ -24,13 +24,13 @@ contract Foo {
         _original_Foo_setA(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_uint256_arr_storage(a) > 10) && (__ScribbleUtilsLib__91.sum_arr_uint256_arr_storage(a) < 20))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("000933:0066:000 1: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("000934:0066:000 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setA(uint k, uint v) private {
+    function _original_Foo_setA(uint k, uint v) internal {
         a[k] = v;
     }
 
@@ -38,13 +38,13 @@ contract Foo {
         _original_Foo_pushB(k);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("001394:0066:000 2: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("001396:0066:000 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_pushB(int8 k) private {
+    function _original_Foo_pushB(int8 k) internal {
         b.push(k);
     }
 
@@ -52,13 +52,13 @@ contract Foo {
         _original_Foo_setB(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("001858:0066:000 3: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("001861:0066:000 3: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setB(uint k, int8 v) private {
+    function _original_Foo_setB(uint k, int8 v) internal {
         b[k] = v;
     }
 
@@ -66,37 +66,37 @@ contract Foo {
         _original_Foo_memArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int16_arr_memory(c) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int16_arr_memory(c) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("002331:0066:000 4: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("002335:0066:000 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_memArr(int16[] memory c) private {}
+    function _original_Foo_memArr(int16[] memory c) internal {}
 
     function calldataArr(int16[] calldata c) external {
         _original_Foo_calldataArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int16_arr_calldata(c) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int16_arr_calldata(c) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("002803:0066:000 5: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("002808:0066:000 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_calldataArr(int16[] calldata c) private {}
+    function _original_Foo_calldataArr(int16[] calldata c) internal {}
 
     function overflowCheck(uint[] calldata c) external {
         _original_Foo_overflowCheck(c);
         unchecked {
             if (!(__ScribbleUtilsLib__91.sum_arr_uint256_arr_calldata(c) < 10)) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("003219:0066:000 6: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("003225:0066:000 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_overflowCheck(uint[] calldata c) private {}
+    function _original_Foo_overflowCheck(uint[] calldata c) internal {}
 }
 
 library __ScribbleUtilsLib__91 {
diff --git a/test/multifile_samples/arr_sum/instrumentationMetadata.json.expected b/test/multifile_samples/arr_sum/instrumentationMetadata.json.expected
index 6f46d79b..2e9cfff6 100644
--- a/test/multifile_samples/arr_sum/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/arr_sum/instrumentationMetadata.json.expected
@@ -1,7 +1,7 @@
 {
   "instrToOriginalMap": [
     [
-      "146:3856:0",
+      "146:3863:0",
       "24:977:0"
     ],
     [
@@ -37,7 +37,7 @@
       "82:4:0"
     ],
     [
-      "683:71:0",
+      "683:72:0",
       "166:56:0"
     ],
     [
@@ -53,243 +53,243 @@
       "181:4:0"
     ],
     [
-      "728:26:0",
+      "729:26:0",
       "196:26:0"
     ],
     [
-      "738:9:0",
+      "739:9:0",
       "206:9:0"
     ],
     [
-      "738:9:0",
+      "739:9:0",
       "206:9:0"
     ],
     [
-      "738:6:0",
+      "739:6:0",
       "206:6:0"
     ],
     [
-      "738:1:0",
+      "739:1:0",
       "206:1:0"
     ],
     [
-      "745:1:0",
+      "746:1:0",
       "213:1:0"
     ],
     [
-      "1233:77:0",
+      "1234:78:0",
       "297:62:0"
     ],
     [
-      "1260:16:0",
+      "1261:16:0",
       "310:16:0"
     ],
     [
-      "1261:6:0",
+      "1262:6:0",
       "311:6:0"
     ],
     [
-      "1261:4:0",
+      "1262:4:0",
       "311:4:0"
     ],
     [
-      "1269:6:0",
+      "1270:6:0",
       "319:6:0"
     ],
     [
-      "1269:4:0",
+      "1270:4:0",
       "319:4:0"
     ],
     [
-      "1285:25:0",
+      "1287:25:0",
       "334:25:0"
     ],
     [
-      "1295:8:0",
+      "1297:8:0",
       "344:8:0"
     ],
     [
-      "1295:8:0",
+      "1297:8:0",
       "344:8:0"
     ],
     [
-      "1295:4:0",
+      "1297:4:0",
       "344:4:0"
     ],
     [
-      "1295:1:0",
+      "1297:1:0",
       "344:1:0"
     ],
     [
-      "1297:1:0",
+      "1299:1:0",
       "346:1:0"
     ],
     [
-      "1302:1:0",
+      "1304:1:0",
       "351:1:0"
     ],
     [
-      "1777:71:0",
+      "1779:72:0",
       "435:56:0"
     ],
     [
-      "1805:8:0",
+      "1807:8:0",
       "449:8:0"
     ],
     [
-      "1806:6:0",
+      "1808:6:0",
       "450:6:0"
     ],
     [
-      "1806:4:0",
+      "1808:4:0",
       "450:4:0"
     ],
     [
-      "1822:26:0",
+      "1825:26:0",
       "465:26:0"
     ],
     [
-      "1832:9:0",
+      "1835:9:0",
       "475:9:0"
     ],
     [
-      "1832:9:0",
+      "1835:9:0",
       "475:9:0"
     ],
     [
-      "1832:6:0",
+      "1835:6:0",
       "475:6:0"
     ],
     [
-      "1832:1:0",
+      "1835:1:0",
       "475:1:0"
     ],
     [
-      "1839:1:0",
+      "1842:1:0",
       "482:1:0"
     ],
     [
-      "2324:77:0",
+      "2327:78:0",
       "567:62:0"
     ],
     [
-      "2351:16:0",
+      "2354:16:0",
       "580:16:0"
     ],
     [
-      "2352:6:0",
+      "2355:6:0",
       "581:6:0"
     ],
     [
-      "2352:4:0",
+      "2355:4:0",
       "581:4:0"
     ],
     [
-      "2360:6:0",
+      "2363:6:0",
       "589:6:0"
     ],
     [
-      "2360:4:0",
+      "2363:4:0",
       "589:4:0"
     ],
     [
-      "2376:25:0",
+      "2380:25:0",
       "604:25:0"
     ],
     [
-      "2386:8:0",
+      "2390:8:0",
       "614:8:0"
     ],
     [
-      "2386:8:0",
+      "2390:8:0",
       "614:8:0"
     ],
     [
-      "2386:4:0",
+      "2390:4:0",
       "614:4:0"
     ],
     [
-      "2386:1:0",
+      "2390:1:0",
       "614:1:0"
     ],
     [
-      "2388:1:0",
+      "2392:1:0",
       "616:1:0"
     ],
     [
-      "2393:1:0",
+      "2397:1:0",
       "621:1:0"
     ],
     [
-      "2880:58:0",
+      "2884:59:0",
       "710:48:0"
     ],
     [
-      "2909:18:0",
+      "2913:18:0",
       "725:18:0"
     ],
     [
-      "2910:16:0",
+      "2914:16:0",
       "726:16:0"
     ],
     [
-      "2910:7:0",
+      "2914:7:0",
       "726:7:0"
     ],
     [
-      "2910:5:0",
+      "2914:5:0",
       "726:5:0"
     ],
     [
-      "2936:2:0",
+      "2941:2:0",
       "751:7:0"
     ],
     [
-      "3435:65:0",
+      "3440:66:0",
       "834:57:0"
     ],
     [
-      "3469:20:0",
+      "3474:20:0",
       "854:20:0"
     ],
     [
-      "3470:18:0",
+      "3475:18:0",
       "855:18:0"
     ],
     [
-      "3470:7:0",
+      "3475:7:0",
       "855:7:0"
     ],
     [
-      "3470:5:0",
+      "3475:5:0",
       "855:5:0"
     ],
     [
-      "3498:2:0",
+      "3504:2:0",
       "884:7:0"
     ],
     [
-      "3934:66:0",
+      "3940:67:0",
       "941:58:0"
     ],
     [
-      "3970:19:0",
+      "3976:19:0",
       "963:19:0"
     ],
     [
-      "3971:17:0",
+      "3977:17:0",
       "964:17:0"
     ],
     [
-      "3971:6:0",
+      "3977:6:0",
       "964:6:0"
     ],
     [
-      "3971:4:0",
+      "3977:4:0",
       "964:4:0"
     ],
     [
-      "3998:2:0",
+      "4005:2:0",
       "992:7:0"
     ],
     [
@@ -297,66 +297,66 @@
       "102:59:0"
     ],
     [
-      "869:127:0",
+      "870:127:0",
       "233:59:0"
     ],
     [
-      "1416:124:0",
+      "1418:124:0",
       "370:60:0"
     ],
     [
-      "1963:124:0",
+      "1966:124:0",
       "502:60:0"
     ],
     [
-      "2519:124:0",
+      "2523:124:0",
       "645:60:0"
     ],
     [
-      "3070:128:0",
+      "3075:128:0",
       "769:60:0"
     ],
     [
-      "3635:62:0",
+      "3641:62:0",
       "902:34:0"
     ]
   ],
   "otherInstrumentation": [
     "259:22:0",
-    "4220:22:0",
-    "4339:33:0",
-    "4427:8:0",
-    "4447:113:0",
-    "4622:110:0",
-    "4835:113:0",
-    "4822:11:0",
+    "4227:22:0",
+    "4346:33:0",
+    "4434:8:0",
+    "4454:113:0",
+    "4629:110:0",
+    "4842:113:0",
+    "4829:11:0",
     "322:50:0",
     "386:50:0",
-    "807:24:0",
-    "872:50:0",
-    "936:50:0",
-    "1356:22:0",
-    "5038:113:0",
-    "5026:10:0",
-    "1419:47:0",
-    "1483:47:0",
-    "1901:24:0",
-    "1966:47:0",
-    "2030:47:0",
-    "2458:23:0",
-    "5241:113:0",
-    "5229:10:0",
-    "2522:47:0",
-    "2586:47:0",
-    "3004:28:0",
-    "5448:113:0",
-    "5436:10:0",
-    "3073:49:0",
-    "3139:49:0",
-    "3567:30:0",
-    "5660:113:0",
-    "5647:11:0",
-    "3637:51:0"
+    "808:24:0",
+    "873:50:0",
+    "937:50:0",
+    "1358:22:0",
+    "5045:113:0",
+    "5033:10:0",
+    "1421:47:0",
+    "1485:47:0",
+    "1904:24:0",
+    "1969:47:0",
+    "2033:47:0",
+    "2462:23:0",
+    "5248:113:0",
+    "5236:10:0",
+    "2526:47:0",
+    "2590:47:0",
+    "3009:28:0",
+    "5455:113:0",
+    "5443:10:0",
+    "3078:49:0",
+    "3144:49:0",
+    "3573:30:0",
+    "5667:113:0",
+    "5654:11:0",
+    "3643:51:0"
   ],
   "propertyMap": [
     {
@@ -416,17 +416,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "1016:65:0",
-        "1099:66:0",
-        "865:346:0"
+        "1017:65:0",
+        "1100:66:0",
+        "866:346:0"
       ],
       "checkRanges": [
-        "869:127:0"
+        "870:127:0"
       ],
       "assertionRanges": [
-        "1016:65:0",
-        "1099:66:0",
-        "1183:13:0"
+        "1017:65:0",
+        "1100:66:0",
+        "1184:13:0"
       ]
     },
     {
@@ -451,17 +451,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "1560:65:0",
-        "1643:66:0",
-        "1412:343:0"
+        "1562:65:0",
+        "1645:66:0",
+        "1414:343:0"
       ],
       "checkRanges": [
-        "1416:124:0"
+        "1418:124:0"
       ],
       "assertionRanges": [
-        "1560:65:0",
-        "1643:66:0",
-        "1727:13:0"
+        "1562:65:0",
+        "1645:66:0",
+        "1729:13:0"
       ]
     },
     {
@@ -486,17 +486,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "2107:65:0",
-        "2190:66:0",
-        "1959:343:0"
+        "2110:65:0",
+        "2193:66:0",
+        "1962:343:0"
       ],
       "checkRanges": [
-        "1963:124:0"
+        "1966:124:0"
       ],
       "assertionRanges": [
-        "2107:65:0",
-        "2190:66:0",
-        "2274:13:0"
+        "2110:65:0",
+        "2193:66:0",
+        "2277:13:0"
       ]
     },
     {
@@ -521,17 +521,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "2663:65:0",
-        "2746:66:0",
-        "2515:343:0"
+        "2667:65:0",
+        "2750:66:0",
+        "2519:343:0"
       ],
       "checkRanges": [
-        "2519:124:0"
+        "2523:124:0"
       ],
       "assertionRanges": [
-        "2663:65:0",
-        "2746:66:0",
-        "2830:13:0"
+        "2667:65:0",
+        "2750:66:0",
+        "2834:13:0"
       ]
     },
     {
@@ -556,17 +556,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "3218:65:0",
-        "3301:66:0",
-        "3066:347:0"
+        "3223:65:0",
+        "3306:66:0",
+        "3071:347:0"
       ],
       "checkRanges": [
-        "3070:128:0"
+        "3075:128:0"
       ],
       "assertionRanges": [
-        "3218:65:0",
-        "3301:66:0",
-        "3385:13:0"
+        "3223:65:0",
+        "3306:66:0",
+        "3390:13:0"
       ]
     },
     {
@@ -590,17 +590,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "3717:65:0",
-        "3800:66:0",
-        "3631:281:0"
+        "3723:65:0",
+        "3806:66:0",
+        "3637:281:0"
       ],
       "checkRanges": [
-        "3635:62:0"
+        "3641:62:0"
       ],
       "assertionRanges": [
-        "3717:65:0",
-        "3800:66:0",
-        "3884:13:0"
+        "3723:65:0",
+        "3806:66:0",
+        "3890:13:0"
       ]
     }
   ],
@@ -610,5 +610,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/arr_sum/main.sol.instrumented.expected b/test/multifile_samples/arr_sum/main.sol.instrumented.expected
index b2179245..d19efd89 100644
--- a/test/multifile_samples/arr_sum/main.sol.instrumented.expected
+++ b/test/multifile_samples/arr_sum/main.sol.instrumented.expected
@@ -16,7 +16,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_pushA(uint k) private {
+    function _original_Foo_pushA(uint k) internal {
         a.push(k);
     }
 
@@ -24,13 +24,13 @@ contract Foo {
         _original_Foo_setA(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_uint256_arr_storage(a) > 10) && (__ScribbleUtilsLib__91.sum_arr_uint256_arr_storage(a) < 20))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("000933:0066:000 1: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("000934:0066:000 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setA(uint k, uint v) private {
+    function _original_Foo_setA(uint k, uint v) internal {
         a[k] = v;
     }
 
@@ -38,13 +38,13 @@ contract Foo {
         _original_Foo_pushB(k);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("001394:0066:000 2: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("001396:0066:000 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_pushB(int8 k) private {
+    function _original_Foo_pushB(int8 k) internal {
         b.push(k);
     }
 
@@ -52,13 +52,13 @@ contract Foo {
         _original_Foo_setB(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("001858:0066:000 3: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("001861:0066:000 3: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setB(uint k, int8 v) private {
+    function _original_Foo_setB(uint k, int8 v) internal {
         b[k] = v;
     }
 
@@ -66,37 +66,37 @@ contract Foo {
         _original_Foo_memArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int16_arr_memory(c) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int16_arr_memory(c) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("002331:0066:000 4: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("002335:0066:000 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_memArr(int16[] memory c) private {}
+    function _original_Foo_memArr(int16[] memory c) internal {}
 
     function calldataArr(int16[] calldata c) external {
         _original_Foo_calldataArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__91.sum_arr_int16_arr_calldata(c) > (-10)) && (__ScribbleUtilsLib__91.sum_arr_int16_arr_calldata(c) < 10))) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("002803:0066:000 5: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("002808:0066:000 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_calldataArr(int16[] calldata c) private {}
+    function _original_Foo_calldataArr(int16[] calldata c) internal {}
 
     function overflowCheck(uint[] calldata c) external {
         _original_Foo_overflowCheck(c);
         unchecked {
             if (!(__ScribbleUtilsLib__91.sum_arr_uint256_arr_calldata(c) < 10)) {
-                emit __ScribbleUtilsLib__91.AssertionFailed("003219:0066:000 6: ");
+                emit __ScribbleUtilsLib__91.AssertionFailed("003225:0066:000 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_overflowCheck(uint[] calldata c) private {}
+    function _original_Foo_overflowCheck(uint[] calldata c) internal {}
 }
 
 library __ScribbleUtilsLib__91 {
diff --git a/test/multifile_samples/asserts/B.sol.instrumented.expected b/test/multifile_samples/asserts/B.sol.instrumented.expected
index 92ea4f08..cd8b15b0 100644
--- a/test/multifile_samples/asserts/B.sol.instrumented.expected
+++ b/test/multifile_samples/asserts/B.sol.instrumented.expected
@@ -36,7 +36,7 @@ contract Base {
         __ScribbleUtilsLib__59.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Base_main(uint[] memory n) private {
+    function _original_Base_main(uint[] memory n) internal {
         vars4 memory _v;
         unchecked {
             _v.forall_0 = true;
@@ -45,14 +45,14 @@ contract Base {
                 if (!_v.forall_0) break;
             }
             if (!(_v.forall_0)) {
-                emit __ScribbleUtilsLib__59.AssertionFailed("001362:0066:000 3: ");
+                emit __ScribbleUtilsLib__59.AssertionFailed("001363:0066:000 3: ");
                 assert(false);
             }
         }
         for (uint i = 0; i < n.length; i++) {
             unchecked {
                 if (!(n[i] > X)) {
-                    emit __ScribbleUtilsLib__59.AssertionFailed("001610:0066:000 4: ");
+                    emit __ScribbleUtilsLib__59.AssertionFailed("001611:0066:000 4: ");
                     assert(false);
                 }
             }
@@ -64,7 +64,7 @@ contract Base {
     function __scribble_Base_check_state_invariants_internal() internal {
         unchecked {
             if (!(sum < 200)) {
-                emit __ScribbleUtilsLib__59.AssertionFailed("002011:0066:000 0: ");
+                emit __ScribbleUtilsLib__59.AssertionFailed("002012:0066:000 0: ");
                 assert(false);
             }
         }
@@ -90,7 +90,7 @@ contract Base {
         RET0 = sum;
         unchecked {
             if (!((sum - _v.old_0) > (X + 1))) {
-                emit __ScribbleUtilsLib__59.AssertionFailed("002828:0066:000 1: ");
+                emit __ScribbleUtilsLib__59.AssertionFailed("002829:0066:000 1: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/asserts/C.sol.instrumented.expected b/test/multifile_samples/asserts/C.sol.instrumented.expected
index cf87cadb..3fb069c4 100644
--- a/test/multifile_samples/asserts/C.sol.instrumented.expected
+++ b/test/multifile_samples/asserts/C.sol.instrumented.expected
@@ -21,10 +21,10 @@ contract Child is B.Base {
         __ScribbleUtilsLib__100.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Child_main1(uint t) private {
+    function _original_Child_main1(uint t) internal {
         unchecked {
             if (!(((((XA == 2) && (XB == 2)) && (A.X == 2)) && (B.X == 2)) && (t == B.X))) {
-                emit __ScribbleUtilsLib__100.AssertionFailed("000942:0067:001 5: ");
+                emit __ScribbleUtilsLib__100.AssertionFailed("000943:0067:001 5: ");
                 assert(false);
             }
         }
@@ -34,7 +34,7 @@ contract Child is B.Base {
         p.y = 2;
         unchecked {
             if (!(B.foo(p) == 3)) {
-                emit __ScribbleUtilsLib__100.AssertionFailed("001211:0067:001 6: ");
+                emit __ScribbleUtilsLib__100.AssertionFailed("001212:0067:001 6: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/asserts/flat.sol.expected b/test/multifile_samples/asserts/flat.sol.expected
index ee4c2678..c3e68655 100644
--- a/test/multifile_samples/asserts/flat.sol.expected
+++ b/test/multifile_samples/asserts/flat.sol.expected
@@ -45,7 +45,7 @@ contract Base {
         __ScribbleUtilsLib__59.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Base_main(uint[] memory n) private {
+    function _original_Base_main(uint[] memory n) internal {
         vars4 memory _v;
         unchecked {
             _v.forall_0 = true;
@@ -54,14 +54,14 @@ contract Base {
                 if (!_v.forall_0) break;
             }
             if (!(_v.forall_0)) {
-                emit __ScribbleUtilsLib__59.AssertionFailed("001483:0066:000 3: ");
+                emit __ScribbleUtilsLib__59.AssertionFailed("001484:0066:000 3: ");
                 assert(false);
             }
         }
         for (uint i = 0; i < n.length; i++) {
             unchecked {
                 if (!(n[i] > X)) {
-                    emit __ScribbleUtilsLib__59.AssertionFailed("001731:0066:000 4: ");
+                    emit __ScribbleUtilsLib__59.AssertionFailed("001732:0066:000 4: ");
                     assert(false);
                 }
             }
@@ -73,7 +73,7 @@ contract Base {
     function __scribble_Base_check_state_invariants_internal() internal {
         unchecked {
             if (!(sum < 200)) {
-                emit __ScribbleUtilsLib__59.AssertionFailed("002132:0066:000 0: ");
+                emit __ScribbleUtilsLib__59.AssertionFailed("002133:0066:000 0: ");
                 assert(false);
             }
         }
@@ -99,7 +99,7 @@ contract Base {
         RET0 = sum;
         unchecked {
             if (!((sum - _v.old_0) > (X + 1))) {
-                emit __ScribbleUtilsLib__59.AssertionFailed("002949:0066:000 1: ");
+                emit __ScribbleUtilsLib__59.AssertionFailed("002950:0066:000 1: ");
                 assert(false);
             }
         }
@@ -172,10 +172,10 @@ contract Child is Base {
         __ScribbleUtilsLib__100.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Child_main1(uint t) private {
+    function _original_Child_main1(uint t) internal {
         unchecked {
             if (!(((((X == 2) && (X == 2)) && (X == 2)) && (X == 2)) && (t == X))) {
-                emit __ScribbleUtilsLib__100.AssertionFailed("005227:0067:000 5: ");
+                emit __ScribbleUtilsLib__100.AssertionFailed("005229:0067:000 5: ");
                 assert(false);
             }
         }
@@ -185,7 +185,7 @@ contract Child is Base {
         p.y = 2;
         unchecked {
             if (!(foo(p) == 3)) {
-                emit __ScribbleUtilsLib__100.AssertionFailed("005492:0067:000 6: ");
+                emit __ScribbleUtilsLib__100.AssertionFailed("005494:0067:000 6: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/asserts/instrumentationMetadata.json.expected b/test/multifile_samples/asserts/instrumentationMetadata.json.expected
index a8a1d28b..e5588cb3 100644
--- a/test/multifile_samples/asserts/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/asserts/instrumentationMetadata.json.expected
@@ -93,7 +93,7 @@
       "132:1:0"
     ],
     [
-      "312:3206:0",
+      "312:3207:0",
       "68:278:1"
     ],
     [
@@ -105,7 +105,7 @@
       "124:4:1"
     ],
     [
-      "1225:970:0",
+      "1225:971:0",
       "169:175:1"
     ],
     [
@@ -125,195 +125,195 @@
       "183:4:1"
     ],
     [
-      "1279:916:0",
+      "1280:916:0",
       "207:137:1"
     ],
     [
-      "1787:402:0",
+      "1788:402:0",
       "259:82:1"
     ],
     [
-      "1792:10:0",
+      "1793:10:0",
       "264:10:1"
     ],
     [
-      "1792:6:0",
+      "1793:6:0",
       "264:6:1"
     ],
     [
-      "1792:4:0",
+      "1793:4:0",
       "264:4:1"
     ],
     [
-      "1801:1:0",
+      "1802:1:0",
       "273:1:1"
     ],
     [
-      "1804:12:0",
+      "1805:12:0",
       "276:12:1"
     ],
     [
-      "1804:1:0",
+      "1805:1:0",
       "276:1:1"
     ],
     [
-      "1808:8:0",
+      "1809:8:0",
       "280:8:1"
     ],
     [
-      "1808:1:0",
+      "1809:1:0",
       "280:1:1"
     ],
     [
-      "1818:3:0",
+      "1819:3:0",
       "290:3:1"
     ],
     [
-      "1818:3:0",
+      "1819:3:0",
       "290:3:1"
     ],
     [
-      "1818:1:0",
+      "1819:1:0",
       "290:1:1"
     ],
     [
-      "1823:366:0",
+      "1824:366:0",
       "295:46:1"
     ],
     [
-      "2144:34:0",
+      "2145:34:0",
       "325:11:1"
     ],
     [
-      "2144:34:0",
+      "2145:34:0",
       "325:11:1"
     ],
     [
-      "2173:4:0",
+      "2174:4:0",
       "332:4:1"
     ],
     [
-      "2173:1:0",
+      "2174:1:0",
       "332:1:1"
     ],
     [
-      "2175:1:0",
+      "2176:1:0",
       "334:1:1"
     ],
     [
-      "4997:1760:0",
+      "4998:1761:0",
       "136:268:2"
     ],
     [
-      "5015:4:0",
+      "5016:4:0",
       "154:6:2"
     ],
     [
-      "5015:4:0",
+      "5016:4:0",
       "154:6:2"
     ],
     [
-      "5496:664:0",
+      "5497:665:0",
       "167:235:2"
     ],
     [
-      "5526:8:0",
+      "5527:8:0",
       "181:8:2"
     ],
     [
-      "5527:6:0",
+      "5528:6:0",
       "182:6:2"
     ],
     [
-      "5527:4:0",
+      "5528:4:0",
       "182:4:2"
     ],
     [
-      "5543:617:0",
+      "5545:617:0",
       "197:205:2"
     ],
     [
-      "5885:3:0",
+      "5887:3:0",
       "283:3:2"
     ],
     [
-      "5885:3:0",
+      "5887:3:0",
       "283:3:2"
     ],
     [
-      "5885:1:0",
+      "5887:1:0",
       "283:1:2"
     ],
     [
-      "5898:14:0",
+      "5900:14:0",
       "297:16:2"
     ],
     [
-      "5898:14:0",
+      "5900:14:0",
       "297:16:2"
     ],
     [
-      "5898:5:0",
+      "5900:5:0",
       "297:7:2"
     ],
     [
-      "5898:5:0",
+      "5900:5:0",
       "297:7:2"
     ],
     [
-      "5922:7:0",
+      "5924:7:0",
       "323:7:2"
     ],
     [
-      "5922:7:0",
+      "5924:7:0",
       "323:7:2"
     ],
     [
-      "5922:3:0",
+      "5924:3:0",
       "323:3:2"
     ],
     [
-      "5922:1:0",
+      "5924:1:0",
       "323:1:2"
     ],
     [
-      "5928:1:0",
+      "5930:1:0",
       "329:1:2"
     ],
     [
-      "5939:7:0",
+      "5941:7:0",
       "340:7:2"
     ],
     [
-      "5939:7:0",
+      "5941:7:0",
       "340:7:2"
     ],
     [
-      "5939:3:0",
+      "5941:3:0",
       "340:3:2"
     ],
     [
-      "5939:1:0",
+      "5941:1:0",
       "340:1:2"
     ],
     [
-      "5945:1:0",
+      "5947:1:0",
       "346:1:2"
     ],
     [
-      "6150:3:0",
+      "6152:3:0",
       "392:3:2"
     ],
     [
-      "6150:3:0",
+      "6152:3:0",
       "392:3:2"
     ],
     [
-      "6150:1:0",
+      "6152:1:0",
       "392:1:2"
     ],
     [
-      "2366:12:0",
+      "2367:12:0",
       "47:20:1"
     ],
     [
@@ -321,65 +321,65 @@
       "141:26:1"
     ],
     [
-      "1532:14:0",
+      "1533:14:0",
       "216:39:1"
     ],
     [
-      "1869:11:0",
+      "1870:11:0",
       "305:16:1"
     ],
     [
-      "5581:65:0",
+      "5583:65:0",
       "212:62:2"
     ],
     [
-      "5984:14:0",
+      "5986:14:0",
       "362:21:2"
     ],
     [
-      "3251:29:0",
+      "3252:29:0",
       "90:32:1"
     ]
   ],
   "otherInstrumentation": [
-    "3736:22:0",
-    "3855:33:0",
-    "3943:8:0",
-    "3963:113:0",
-    "4138:110:0",
-    "2766:49:0",
-    "2852:42:0",
-    "2904:35:0",
-    "2949:43:0",
+    "3737:22:0",
+    "3856:33:0",
+    "3944:8:0",
+    "3964:113:0",
+    "4139:110:0",
+    "2767:49:0",
+    "2853:42:0",
+    "2905:35:0",
+    "2950:43:0",
     "750:22:0",
     "616:72:0",
     "698:42:0",
     "1060:72:0",
     "1142:70:0",
-    "6460:50:0",
-    "6520:49:0",
-    "4475:22:0",
-    "4594:33:0",
-    "4682:8:0",
-    "4702:113:0",
-    "4877:110:0",
-    "6606:43:0",
-    "6659:35:0",
-    "6704:44:0",
-    "5296:24:0",
-    "5160:73:0",
-    "5243:43:0",
-    "5330:72:0",
-    "5412:71:0",
-    "3089:427:0",
-    "3182:11:0",
-    "3075:12:0",
-    "3203:10:0",
-    "2144:34:0",
+    "6462:50:0",
+    "6522:49:0",
+    "4476:22:0",
+    "4595:33:0",
+    "4683:8:0",
+    "4703:113:0",
+    "4878:110:0",
+    "6608:43:0",
+    "6661:35:0",
+    "6706:44:0",
+    "5297:24:0",
+    "5161:73:0",
+    "5244:43:0",
+    "5331:72:0",
+    "5413:71:0",
+    "3090:427:0",
+    "3183:11:0",
+    "3076:12:0",
+    "3204:10:0",
+    "2145:34:0",
     "591:15:0",
-    "5135:15:0",
-    "1289:15:0",
-    "3099:15:0"
+    "5136:15:0",
+    "1290:15:0",
+    "3100:15:0"
   ],
   "propertyMap": [
     {
@@ -403,17 +403,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "2398:67:0",
-        "2483:66:0",
-        "2362:233:0"
+        "2399:67:0",
+        "2484:66:0",
+        "2363:233:0"
       ],
       "checkRanges": [
-        "2366:12:0"
+        "2367:12:0"
       ],
       "assertionRanges": [
-        "2398:67:0",
-        "2483:66:0",
-        "2567:13:0"
+        "2399:67:0",
+        "2484:66:0",
+        "2568:13:0"
       ]
     },
     {
@@ -445,18 +445,18 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "3148:14:0",
-        "3300:70:0",
-        "3388:66:0",
-        "3247:253:0"
+        "3149:14:0",
+        "3301:70:0",
+        "3389:66:0",
+        "3248:253:0"
       ],
       "checkRanges": [
-        "3251:29:0"
+        "3252:29:0"
       ],
       "assertionRanges": [
-        "3300:70:0",
-        "3388:66:0",
-        "3472:13:0"
+        "3301:70:0",
+        "3389:66:0",
+        "3473:13:0"
       ]
     },
     {
@@ -522,21 +522,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "1338:18:0",
-        "1370:145:0",
-        "1431:28:0",
-        "1477:23:0",
-        "1566:72:0",
-        "1656:66:0",
-        "1528:240:0"
+        "1339:18:0",
+        "1371:145:0",
+        "1432:28:0",
+        "1478:23:0",
+        "1567:72:0",
+        "1657:66:0",
+        "1529:240:0"
       ],
       "checkRanges": [
-        "1532:14:0"
+        "1533:14:0"
       ],
       "assertionRanges": [
-        "1566:72:0",
-        "1656:66:0",
-        "1740:13:0"
+        "1567:72:0",
+        "1657:66:0",
+        "1741:13:0"
       ]
     },
     {
@@ -574,17 +574,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "1904:71:0",
-        "1997:66:0",
-        "1865:252:0"
+        "1905:71:0",
+        "1998:66:0",
+        "1866:252:0"
       ],
       "checkRanges": [
-        "1869:11:0"
+        "1870:11:0"
       ],
       "assertionRanges": [
-        "1904:71:0",
-        "1997:66:0",
-        "2085:13:0"
+        "1905:71:0",
+        "1998:66:0",
+        "2086:13:0"
       ]
     },
     {
@@ -616,17 +616,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "5666:69:0",
-        "5753:67:0",
-        "5577:289:0"
+        "5668:69:0",
+        "5755:67:0",
+        "5579:289:0"
       ],
       "checkRanges": [
-        "5581:65:0"
+        "5583:65:0"
       ],
       "assertionRanges": [
-        "5666:69:0",
-        "5753:67:0",
-        "5838:13:0"
+        "5668:69:0",
+        "5755:67:0",
+        "5840:13:0"
       ]
     },
     {
@@ -642,15 +642,15 @@
       "debugEventEncoding": [],
       "message": "",
       "instrumentationRanges": [
-        "6018:67:0",
-        "5980:151:0"
+        "6020:67:0",
+        "5982:151:0"
       ],
       "checkRanges": [
-        "5984:14:0"
+        "5986:14:0"
       ],
       "assertionRanges": [
-        "6018:67:0",
-        "6103:13:0"
+        "6020:67:0",
+        "6105:13:0"
       ]
     }
   ],
@@ -662,5 +662,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/circular_imports/A.sol.instrumented.expected b/test/multifile_samples/circular_imports/A.sol.instrumented.expected
index 1e6337c9..66f9717f 100644
--- a/test/multifile_samples/circular_imports/A.sol.instrumented.expected
+++ b/test/multifile_samples/circular_imports/A.sol.instrumented.expected
@@ -11,7 +11,7 @@ contract A {
         __ScribbleUtilsLib__16.setInContract(false);
     }
 
-    function _original_A_a(B b) private returns (B) {
+    function _original_A_a(B b) internal returns (B) {
         return b;
     }
 
@@ -19,7 +19,7 @@ contract A {
     function __scribble_A_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__16.AssertionFailed("000687:0066:000 0: ");
+                emit __ScribbleUtilsLib__16.AssertionFailed("000688:0066:000 0: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/circular_imports/B.sol.instrumented.expected b/test/multifile_samples/circular_imports/B.sol.instrumented.expected
index c8967546..f59dcf25 100644
--- a/test/multifile_samples/circular_imports/B.sol.instrumented.expected
+++ b/test/multifile_samples/circular_imports/B.sol.instrumented.expected
@@ -11,7 +11,7 @@ contract B {
         __ScribbleUtilsLib__32.setInContract(false);
     }
 
-    function _original_B_a(A a) private returns (A) {
+    function _original_B_a(A a) internal returns (A) {
         return a;
     }
 
@@ -19,7 +19,7 @@ contract B {
     function __scribble_B_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__32.AssertionFailed("000687:0066:001 1: ");
+                emit __ScribbleUtilsLib__32.AssertionFailed("000688:0066:001 1: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/circular_imports/flat.sol.expected b/test/multifile_samples/circular_imports/flat.sol.expected
index cffe21dc..92663585 100644
--- a/test/multifile_samples/circular_imports/flat.sol.expected
+++ b/test/multifile_samples/circular_imports/flat.sol.expected
@@ -11,7 +11,7 @@ contract A {
         __ScribbleUtilsLib__16.setInContract(false);
     }
 
-    function _original_A_a(B b) private returns (B) {
+    function _original_A_a(B b) internal returns (B) {
         return b;
     }
 
@@ -19,7 +19,7 @@ contract A {
     function __scribble_A_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__16.AssertionFailed("000692:0066:000 0: ");
+                emit __ScribbleUtilsLib__16.AssertionFailed("000693:0066:000 0: ");
                 assert(false);
             }
         }
@@ -72,7 +72,7 @@ contract B {
         __ScribbleUtilsLib__32.setInContract(false);
     }
 
-    function _original_B_a(A a) private returns (A) {
+    function _original_B_a(A a) internal returns (A) {
         return a;
     }
 
@@ -80,7 +80,7 @@ contract B {
     function __scribble_B_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__32.AssertionFailed("002493:0066:000 1: ");
+                emit __ScribbleUtilsLib__32.AssertionFailed("002495:0066:000 1: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/circular_imports/instrumentationMetadata.json.expected b/test/multifile_samples/circular_imports/instrumentationMetadata.json.expected
index 251237a3..bf9606d8 100644
--- a/test/multifile_samples/circular_imports/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/circular_imports/instrumentationMetadata.json.expected
@@ -1,11 +1,11 @@
 {
   "instrToOriginalMap": [
     [
-      "167:1040:0",
+      "167:1041:0",
       "40:67:0"
     ],
     [
-      "424:73:0",
+      "424:74:0",
       "55:50:0"
     ],
     [
@@ -25,123 +25,123 @@
       "66:1:0"
     ],
     [
-      "468:3:0",
+      "469:3:0",
       "88:3:0"
     ],
     [
-      "469:1:0",
+      "470:1:0",
       "89:1:0"
     ],
     [
-      "469:1:0",
+      "470:1:0",
       "89:1:0"
     ],
     [
-      "469:1:0",
+      "470:1:0",
       "89:1:0"
     ],
     [
-      "472:25:0",
+      "473:25:0",
       "92:13:0"
     ],
     [
-      "482:8:0",
+      "483:8:0",
       "94:8:0"
     ],
     [
-      "489:1:0",
+      "490:1:0",
       "101:1:0"
     ],
     [
-      "1968:1040:0",
+      "1969:1041:0",
       "40:67:1"
     ],
     [
-      "2225:73:0",
+      "2226:74:0",
       "55:50:1"
     ],
     [
-      "2247:5:0",
+      "2248:5:0",
       "65:5:1"
     ],
     [
-      "2248:3:0",
+      "2249:3:0",
       "66:3:1"
     ],
     [
-      "2248:1:0",
+      "2249:1:0",
       "66:1:1"
     ],
     [
-      "2248:1:0",
+      "2249:1:0",
       "66:1:1"
     ],
     [
-      "2269:3:0",
+      "2271:3:0",
       "88:3:1"
     ],
     [
-      "2270:1:0",
+      "2272:1:0",
       "89:1:1"
     ],
     [
-      "2270:1:0",
+      "2272:1:0",
       "89:1:1"
     ],
     [
-      "2270:1:0",
+      "2272:1:0",
       "89:1:1"
     ],
     [
-      "2273:25:0",
+      "2275:25:0",
       "92:13:1"
     ],
     [
-      "2283:8:0",
+      "2285:8:0",
       "94:8:1"
     ],
     [
-      "2290:1:0",
+      "2292:1:0",
       "101:1:1"
     ],
     [
-      "665:7:0",
+      "666:7:0",
       "24:15:0"
     ],
     [
-      "2466:7:0",
+      "2468:7:0",
       "24:15:1"
     ]
   ],
   "otherInstrumentation": [
-    "1425:22:0",
-    "1544:33:0",
-    "1632:8:0",
-    "1652:113:0",
-    "1827:110:0",
-    "975:46:0",
-    "1058:42:0",
-    "1110:35:0",
-    "1155:43:0",
+    "1426:22:0",
+    "1545:33:0",
+    "1633:8:0",
+    "1653:113:0",
+    "1828:110:0",
+    "976:46:0",
+    "1059:42:0",
+    "1111:35:0",
+    "1156:43:0",
     "218:7:0",
     "289:24:0",
     "237:42:0",
     "323:35:0",
     "368:43:0",
-    "3226:22:0",
-    "3345:33:0",
-    "3433:8:0",
-    "3453:113:0",
-    "3628:110:0",
-    "2776:46:0",
-    "2859:42:0",
-    "2911:35:0",
-    "2956:43:0",
-    "2019:7:0",
-    "2090:24:0",
-    "2038:42:0",
-    "2124:35:0",
-    "2169:43:0"
+    "3228:22:0",
+    "3347:33:0",
+    "3435:8:0",
+    "3455:113:0",
+    "3630:110:0",
+    "2778:46:0",
+    "2861:42:0",
+    "2913:35:0",
+    "2958:43:0",
+    "2020:7:0",
+    "2091:24:0",
+    "2039:42:0",
+    "2125:35:0",
+    "2170:43:0"
   ],
   "propertyMap": [
     {
@@ -157,15 +157,15 @@
       "debugEventEncoding": [],
       "message": "",
       "instrumentationRanges": [
-        "692:66:0",
-        "661:143:0"
+        "693:66:0",
+        "662:143:0"
       ],
       "checkRanges": [
-        "665:7:0"
+        "666:7:0"
       ],
       "assertionRanges": [
-        "692:66:0",
-        "776:13:0"
+        "693:66:0",
+        "777:13:0"
       ]
     },
     {
@@ -181,15 +181,15 @@
       "debugEventEncoding": [],
       "message": "",
       "instrumentationRanges": [
-        "2493:66:0",
-        "2462:143:0"
+        "2495:66:0",
+        "2464:143:0"
       ],
       "checkRanges": [
-        "2466:7:0"
+        "2468:7:0"
       ],
       "assertionRanges": [
-        "2493:66:0",
-        "2577:13:0"
+        "2495:66:0",
+        "2579:13:0"
       ]
     }
   ],
@@ -200,5 +200,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/custom_operators/flat.sol.expected b/test/multifile_samples/custom_operators/flat.sol.expected
index bce3dca5..408211bf 100644
--- a/test/multifile_samples/custom_operators/flat.sol.expected
+++ b/test/multifile_samples/custom_operators/flat.sol.expected
@@ -32,7 +32,7 @@ contract Test {
         }
     }
 
-    function _original_Test_main() private {
+    function _original_Test_main() internal {
         Custom a = Custom.wrap(1);
         Custom b = Custom.wrap(2);
         a + b;
diff --git a/test/multifile_samples/custom_operators/instrumentationMetadata.json.expected b/test/multifile_samples/custom_operators/instrumentationMetadata.json.expected
index f78bda0f..d35cc80a 100644
--- a/test/multifile_samples/custom_operators/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/custom_operators/instrumentationMetadata.json.expected
@@ -329,7 +329,7 @@
       "446:6:0"
     ],
     [
-      "583:485:0",
+      "583:486:0",
       "53:225:1"
     ],
     [
@@ -357,7 +357,7 @@
       "87:6:1"
     ],
     [
-      "904:162:0",
+      "904:163:0",
       "129:147:1"
     ],
     [
@@ -365,119 +365,119 @@
       "142:2:1"
     ],
     [
-      "943:123:0",
+      "944:123:0",
       "152:124:1"
     ],
     [
-      "953:25:0",
+      "954:25:0",
       "162:25:1"
     ],
     [
-      "953:8:0",
+      "954:8:0",
       "162:8:1"
     ],
     [
-      "953:6:0",
+      "954:6:0",
       "162:6:1"
     ],
     [
-      "953:6:0",
+      "954:6:0",
       "162:6:1"
     ],
     [
-      "964:14:0",
+      "965:14:0",
       "173:14:1"
     ],
     [
-      "964:11:0",
+      "965:11:0",
       "173:11:1"
     ],
     [
-      "964:6:0",
+      "965:6:0",
       "173:6:1"
     ],
     [
-      "976:1:0",
+      "977:1:0",
       "185:1:1"
     ],
     [
-      "988:25:0",
+      "989:25:0",
       "197:25:1"
     ],
     [
-      "988:8:0",
+      "989:8:0",
       "197:8:1"
     ],
     [
-      "988:6:0",
+      "989:6:0",
       "197:6:1"
     ],
     [
-      "988:6:0",
+      "989:6:0",
       "197:6:1"
     ],
     [
-      "999:14:0",
+      "1000:14:0",
       "208:14:1"
     ],
     [
-      "999:11:0",
+      "1000:11:0",
       "208:11:1"
     ],
     [
-      "999:6:0",
+      "1000:6:0",
       "208:6:1"
     ],
     [
-      "1011:1:0",
+      "1012:1:0",
       "220:1:1"
     ],
     [
-      "1023:5:0",
+      "1024:5:0",
       "233:5:1"
     ],
     [
-      "1023:5:0",
+      "1024:5:0",
       "233:5:1"
     ],
     [
-      "1023:1:0",
+      "1024:1:0",
       "233:1:1"
     ],
     [
-      "1027:1:0",
+      "1028:1:0",
       "237:1:1"
     ],
     [
-      "1038:5:0",
+      "1039:5:0",
       "248:5:1"
     ],
     [
-      "1038:5:0",
+      "1039:5:0",
       "248:5:1"
     ],
     [
-      "1038:1:0",
+      "1039:1:0",
       "248:1:1"
     ],
     [
-      "1042:1:0",
+      "1043:1:0",
       "252:1:1"
     ],
     [
-      "1053:6:0",
+      "1054:6:0",
       "263:6:1"
     ],
     [
-      "1053:6:0",
+      "1054:6:0",
       "263:6:1"
     ],
     [
-      "1053:1:0",
+      "1054:1:0",
       "263:1:1"
     ],
     [
-      "1058:1:0",
+      "1059:1:0",
       "268:1:1"
     ],
     [
@@ -487,11 +487,11 @@
   ],
   "otherInstrumentation": [
     "683:21:0",
-    "1287:22:0",
-    "1406:33:0",
-    "1494:8:0",
-    "1514:113:0",
-    "1689:110:0"
+    "1288:22:0",
+    "1407:33:0",
+    "1495:8:0",
+    "1515:113:0",
+    "1690:110:0"
   ],
   "propertyMap": [
     {
@@ -526,5 +526,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.18"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/erc20_macro_inheritance/child.sol.instrumented.expected b/test/multifile_samples/erc20_macro_inheritance/child.sol.instrumented.expected
index ad7bfa1e..818b331d 100644
--- a/test/multifile_samples/erc20_macro_inheritance/child.sol.instrumented.expected
+++ b/test/multifile_samples/erc20_macro_inheritance/child.sol.instrumented.expected
@@ -42,14 +42,14 @@ contract Token is ERC20 {
         __ScribbleUtilsLib__30.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Token_allowance(address owner, address delegate) private returns (uint) {
+    function _original_Token_allowance(address owner, address delegate) internal returns (uint) {
         return ERC20.allowance(owner, delegate);
     }
 
     /// Check only the current contract's state invariants
     function __scribble_Token_check_state_invariants_internal() internal {
         if (!(balances.sum == _totalSupply)) {
-            emit __ScribbleUtilsLib__30.AssertionFailed("002206:0121:000 1: The sum of balances is always equal to the total supply");
+            emit __ScribbleUtilsLib__30.AssertionFailed("002207:0121:000 1: The sum of balances is always equal to the total supply");
             assert(false);
         }
     }
diff --git a/test/multifile_samples/erc20_macro_inheritance/erc20_base.sol.instrumented.expected b/test/multifile_samples/erc20_macro_inheritance/erc20_base.sol.instrumented.expected
index d7fc96f2..c5f2cb1e 100644
--- a/test/multifile_samples/erc20_macro_inheritance/erc20_base.sol.instrumented.expected
+++ b/test/multifile_samples/erc20_macro_inheritance/erc20_base.sol.instrumented.expected
@@ -88,7 +88,7 @@ contract ERC20 is IERC20 {
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_totalSupply() private view returns (uint) {
+    function _original_ERC20_totalSupply() internal view returns (uint) {
         return _totalSupply;
     }
 
@@ -98,14 +98,14 @@ contract ERC20 is IERC20 {
         __ScribbleUtilsLib__406.setInContract(true);
         RET_0 = _original_ERC20_balanceOf(account);
         if (!(RET_0 == address_to_uint256_406.get(balances, account))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("003365:0119:001 4: Returns the balance of owner in the balances mapping");
+            emit __ScribbleUtilsLib__406.AssertionFailed("003366:0119:001 4: Returns the balance of owner in the balances mapping");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_balanceOf(address account) private view returns (uint) {
+    function _original_ERC20_balanceOf(address account) internal view returns (uint) {
         return address_to_uint256_406.get(balances, account);
     }
 
@@ -120,26 +120,26 @@ contract ERC20 is IERC20 {
         _v.old_5 = address_to_uint256_406.get(balances, msg.sender);
         RET_0 = _original_ERC20_transfer(receiver, amount);
         if (!(_v.old_1)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("004551:0113:001 6: The sender has sufficient balance at the start");
+            emit __ScribbleUtilsLib__406.AssertionFailed("004553:0113:001 6: The sender has sufficient balance at the start");
             assert(false);
         }
         if (!((!(msg.sender != receiver)) || ((_v.old_2 - amount) == address_to_uint256_406.get(balances, msg.sender)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("004838:0100:001 7: The sender has value less balance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("004840:0100:001 7: The sender has value less balance");
             assert(false);
         }
         if (!((!(msg.sender != receiver)) || ((_v.old_3 + amount) == address_to_uint256_406.get(balances, receiver)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("005110:0095:001 8: The receiver receives _value");
+            emit __ScribbleUtilsLib__406.AssertionFailed("005112:0095:001 8: The receiver receives _value");
             assert(false);
         }
         if (!((_v.old_4 + _v.old_5) == (address_to_uint256_406.get(balances, receiver) + address_to_uint256_406.get(balances, msg.sender)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("005399:0111:001 9: Transfer does not modify the sum of balances");
+            emit __ScribbleUtilsLib__406.AssertionFailed("005401:0111:001 9: Transfer does not modify the sum of balances");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address receiver, uint amount) private returns (bool) {
+    function _original_ERC20_transfer(address receiver, uint amount) internal returns (bool) {
         require(amount <= address_to_uint256_406.get(balances, msg.sender));
         address_to_uint256_406.set(balances, msg.sender, address_to_uint256_406.get(balances, msg.sender).sub(amount));
         address_to_uint256_406.set(balances, receiver, address_to_uint256_406.get(balances, receiver).add(amount));
@@ -153,14 +153,14 @@ contract ERC20 is IERC20 {
         __ScribbleUtilsLib__406.setInContract(true);
         RET_0 = _original_ERC20_approve(delegate, amount);
         if (!(allowances[msg.sender][delegate] == amount)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("006591:0133:001 10: spender will have an allowance of value for this sender's balance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("006594:0133:001 10: spender will have an allowance of value for this sender's balance");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address delegate, uint amount) private returns (bool) {
+    function _original_ERC20_approve(address delegate, uint amount) internal returns (bool) {
         allowances[msg.sender][delegate] = amount;
         emit Approval(msg.sender, delegate, amount);
         return true;
@@ -183,34 +183,34 @@ contract ERC20 is IERC20 {
         _v.old_12 = address_to_uint256_406.get(balances, owner);
         RET_0 = _original_ERC20_transferFrom(owner, buyer, amount);
         if (!(_v.old_6)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("008115:0114:001 11: The sender has sufficient balance at the start");
+            emit __ScribbleUtilsLib__406.AssertionFailed("008119:0114:001 11: The sender has sufficient balance at the start");
             assert(false);
         }
         if (!((!(owner != buyer)) || ((_v.old_7 - amount) == address_to_uint256_406.get(balances, owner)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("008390:0101:001 12: The sender has value less balance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("008394:0101:001 12: The sender has value less balance");
             assert(false);
         }
         if (!((_v.old_8 - amount) == allowances[owner][msg.sender])) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("008613:0102:001 13: The actor has value less allowance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("008617:0102:001 13: The actor has value less allowance");
             assert(false);
         }
         if (!(_v.old_9 >= amount)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("008803:0098:001 14: The actor has enough allowance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("008807:0098:001 14: The actor has enough allowance");
             assert(false);
         }
         if (!((!(owner != buyer)) || ((_v.old_10 + amount) == address_to_uint256_406.get(balances, buyer)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("009063:0095:001 15: The receiver receives value");
+            emit __ScribbleUtilsLib__406.AssertionFailed("009067:0095:001 15: The receiver receives value");
             assert(false);
         }
         if (!((_v.old_11 + _v.old_12) == (address_to_uint256_406.get(balances, buyer) + address_to_uint256_406.get(balances, owner)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("009346:0112:001 16: Transfer does not modify the sum of balances");
+            emit __ScribbleUtilsLib__406.AssertionFailed("009350:0112:001 16: Transfer does not modify the sum of balances");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address owner, address buyer, uint amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address owner, address buyer, uint amount) internal returns (bool) {
         require(amount <= address_to_uint256_406.get(balances, owner));
         require(amount <= allowances[owner][msg.sender]);
         address_to_uint256_406.set(balances, owner, address_to_uint256_406.get(balances, owner).sub(amount));
diff --git a/test/multifile_samples/erc20_macro_inheritance/flat.sol.expected b/test/multifile_samples/erc20_macro_inheritance/flat.sol.expected
index a4ab8272..77e5fe25 100644
--- a/test/multifile_samples/erc20_macro_inheritance/flat.sol.expected
+++ b/test/multifile_samples/erc20_macro_inheritance/flat.sol.expected
@@ -196,7 +196,7 @@ contract ERC20 is IERC20 {
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_totalSupply() private view returns (uint) {
+    function _original_ERC20_totalSupply() internal view returns (uint) {
         return _totalSupply;
     }
 
@@ -206,14 +206,14 @@ contract ERC20 is IERC20 {
         __ScribbleUtilsLib__406.setInContract(true);
         RET_0 = _original_ERC20_balanceOf(account);
         if (!(RET_0 == address_to_uint256_406.get(balances, account))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("006296:0119:000 4: Returns the balance of owner in the balances mapping");
+            emit __ScribbleUtilsLib__406.AssertionFailed("006297:0119:000 4: Returns the balance of owner in the balances mapping");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_balanceOf(address account) private view returns (uint) {
+    function _original_ERC20_balanceOf(address account) internal view returns (uint) {
         return address_to_uint256_406.get(balances, account);
     }
 
@@ -228,26 +228,26 @@ contract ERC20 is IERC20 {
         _v.old_5 = address_to_uint256_406.get(balances, msg.sender);
         RET_0 = _original_ERC20_transfer(receiver, amount);
         if (!(_v.old_1)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("007482:0113:000 6: The sender has sufficient balance at the start");
+            emit __ScribbleUtilsLib__406.AssertionFailed("007484:0113:000 6: The sender has sufficient balance at the start");
             assert(false);
         }
         if (!((!(msg.sender != receiver)) || ((_v.old_2 - amount) == address_to_uint256_406.get(balances, msg.sender)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("007769:0100:000 7: The sender has value less balance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("007771:0100:000 7: The sender has value less balance");
             assert(false);
         }
         if (!((!(msg.sender != receiver)) || ((_v.old_3 + amount) == address_to_uint256_406.get(balances, receiver)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("008041:0095:000 8: The receiver receives _value");
+            emit __ScribbleUtilsLib__406.AssertionFailed("008043:0095:000 8: The receiver receives _value");
             assert(false);
         }
         if (!((_v.old_4 + _v.old_5) == (address_to_uint256_406.get(balances, receiver) + address_to_uint256_406.get(balances, msg.sender)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("008330:0111:000 9: Transfer does not modify the sum of balances");
+            emit __ScribbleUtilsLib__406.AssertionFailed("008332:0111:000 9: Transfer does not modify the sum of balances");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address receiver, uint amount) private returns (bool) {
+    function _original_ERC20_transfer(address receiver, uint amount) internal returns (bool) {
         require(amount <= address_to_uint256_406.get(balances, msg.sender));
         address_to_uint256_406.set(balances, msg.sender, address_to_uint256_406.get(balances, msg.sender).sub(amount));
         address_to_uint256_406.set(balances, receiver, address_to_uint256_406.get(balances, receiver).add(amount));
@@ -261,14 +261,14 @@ contract ERC20 is IERC20 {
         __ScribbleUtilsLib__406.setInContract(true);
         RET_0 = _original_ERC20_approve(delegate, amount);
         if (!(allowances[msg.sender][delegate] == amount)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("009522:0133:000 10: spender will have an allowance of value for this sender's balance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("009525:0133:000 10: spender will have an allowance of value for this sender's balance");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address delegate, uint amount) private returns (bool) {
+    function _original_ERC20_approve(address delegate, uint amount) internal returns (bool) {
         allowances[msg.sender][delegate] = amount;
         emit Approval(msg.sender, delegate, amount);
         return true;
@@ -291,34 +291,34 @@ contract ERC20 is IERC20 {
         _v.old_12 = address_to_uint256_406.get(balances, owner);
         RET_0 = _original_ERC20_transferFrom(owner, buyer, amount);
         if (!(_v.old_6)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("011046:0114:000 11: The sender has sufficient balance at the start");
+            emit __ScribbleUtilsLib__406.AssertionFailed("011050:0114:000 11: The sender has sufficient balance at the start");
             assert(false);
         }
         if (!((!(owner != buyer)) || ((_v.old_7 - amount) == address_to_uint256_406.get(balances, owner)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("011321:0101:000 12: The sender has value less balance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("011325:0101:000 12: The sender has value less balance");
             assert(false);
         }
         if (!((_v.old_8 - amount) == allowances[owner][msg.sender])) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("011544:0102:000 13: The actor has value less allowance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("011548:0102:000 13: The actor has value less allowance");
             assert(false);
         }
         if (!(_v.old_9 >= amount)) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("011734:0098:000 14: The actor has enough allowance");
+            emit __ScribbleUtilsLib__406.AssertionFailed("011738:0098:000 14: The actor has enough allowance");
             assert(false);
         }
         if (!((!(owner != buyer)) || ((_v.old_10 + amount) == address_to_uint256_406.get(balances, buyer)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("011994:0095:000 15: The receiver receives value");
+            emit __ScribbleUtilsLib__406.AssertionFailed("011998:0095:000 15: The receiver receives value");
             assert(false);
         }
         if (!((_v.old_11 + _v.old_12) == (address_to_uint256_406.get(balances, buyer) + address_to_uint256_406.get(balances, owner)))) {
-            emit __ScribbleUtilsLib__406.AssertionFailed("012277:0112:000 16: Transfer does not modify the sum of balances");
+            emit __ScribbleUtilsLib__406.AssertionFailed("012281:0112:000 16: Transfer does not modify the sum of balances");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__406.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address owner, address buyer, uint amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address owner, address buyer, uint amount) internal returns (bool) {
         require(amount <= address_to_uint256_406.get(balances, owner));
         require(amount <= allowances[owner][msg.sender]);
         address_to_uint256_406.set(balances, owner, address_to_uint256_406.get(balances, owner).sub(amount));
@@ -357,7 +357,7 @@ contract Token is ERC20 {
         __scribble_check_state_invariants();
         __ScribbleUtilsLib__30.setInContract(false);
         if (!((balances.sum == _v.old_0) || (msg.sig == bytes4(0x00)))) {
-            emit __ScribbleUtilsLib__30.AssertionFailed("014275:0095:000 2: The token has a fixed supply.");
+            emit __ScribbleUtilsLib__30.AssertionFailed("014280:0095:000 2: The token has a fixed supply.");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
@@ -370,21 +370,21 @@ contract Token is ERC20 {
         __ScribbleUtilsLib__30.setInContract(true);
         RET_0 = _original_Token_allowance(owner, delegate);
         if (!(RET_0 == allowances[owner][delegate])) {
-            emit __ScribbleUtilsLib__30.AssertionFailed("014959:0107:000 5: Returns spenders allowance for this owner");
+            emit __ScribbleUtilsLib__30.AssertionFailed("014964:0107:000 5: Returns spenders allowance for this owner");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__30.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Token_allowance(address owner, address delegate) private returns (uint) {
+    function _original_Token_allowance(address owner, address delegate) internal returns (uint) {
         return ERC20.allowance(owner, delegate);
     }
 
     /// Check only the current contract's state invariants
     function __scribble_Token_check_state_invariants_internal() internal {
         if (!(balances.sum == _totalSupply)) {
-            emit __ScribbleUtilsLib__30.AssertionFailed("015620:0121:000 1: The sum of balances is always equal to the total supply");
+            emit __ScribbleUtilsLib__30.AssertionFailed("015626:0121:000 1: The sum of balances is always equal to the total supply");
             assert(false);
         }
     }
diff --git a/test/multifile_samples/erc20_macro_inheritance/instrumentationMetadata.json.expected b/test/multifile_samples/erc20_macro_inheritance/instrumentationMetadata.json.expected
index 18d2f55b..189a3b82 100644
--- a/test/multifile_samples/erc20_macro_inheritance/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/erc20_macro_inheritance/instrumentationMetadata.json.expected
@@ -457,7 +457,7 @@
       "3014:1:1"
     ],
     [
-      "3752:11108:0",
+      "3752:11113:0",
       "708:2011:1"
     ],
     [
@@ -677,7 +677,7 @@
       "1288:12:1"
     ],
     [
-      "5883:103:0",
+      "5883:104:0",
       "1313:95:1"
     ],
     [
@@ -685,877 +685,877 @@
       "1333:2:1"
     ],
     [
-      "5943:6:0",
+      "5944:6:0",
       "1365:6:1"
     ],
     [
-      "5944:4:0",
+      "5945:4:0",
       "1366:4:1"
     ],
     [
-      "5944:4:0",
+      "5945:4:0",
       "1366:4:1"
     ],
     [
-      "5950:36:0",
+      "5951:36:0",
       "1372:36:1"
     ],
     [
-      "5960:19:0",
+      "5961:19:0",
       "1382:19:1"
     ],
     [
-      "5967:12:0",
+      "5968:12:0",
       "1389:12:1"
     ],
     [
-      "6783:149:0",
+      "6784:150:0",
       "1414:113:1"
     ],
     [
-      "6817:17:0",
+      "6818:17:0",
       "1432:17:1"
     ],
     [
-      "6818:15:0",
+      "6819:15:0",
       "1433:15:1"
     ],
     [
-      "6818:7:0",
+      "6819:7:0",
       "1433:7:1"
     ],
     [
-      "6856:6:0",
+      "6858:6:0",
       "1479:6:1"
     ],
     [
-      "6857:4:0",
+      "6859:4:0",
       "1480:4:1"
     ],
     [
-      "6857:4:0",
+      "6859:4:0",
       "1480:4:1"
     ],
     [
-      "6863:69:0",
+      "6865:69:0",
       "1486:41:1"
     ],
     [
-      "6873:52:0",
+      "6875:52:0",
       "1496:24:1"
     ],
     [
-      "6880:45:0",
+      "6882:45:0",
       "1503:17:1"
     ],
     [
-      "6907:8:0",
+      "6909:8:0",
       "1503:8:1"
     ],
     [
-      "6917:7:0",
+      "6919:7:0",
       "1512:7:1"
     ],
     [
-      "9204:482:0",
+      "9206:483:0",
       "1533:339:1"
     ],
     [
-      "9237:31:0",
+      "9239:31:0",
       "1550:31:1"
     ],
     [
-      "9238:16:0",
+      "9240:16:0",
       "1551:16:1"
     ],
     [
-      "9238:7:0",
+      "9240:7:0",
       "1551:7:1"
     ],
     [
-      "9256:11:0",
+      "9258:11:0",
       "1569:11:1"
     ],
     [
-      "9256:4:0",
+      "9258:4:0",
       "1569:4:1"
     ],
     [
-      "9285:6:0",
+      "9288:6:0",
       "1606:6:1"
     ],
     [
-      "9286:4:0",
+      "9289:4:0",
       "1607:4:1"
     ],
     [
-      "9286:4:0",
+      "9289:4:0",
       "1607:4:1"
     ],
     [
-      "9292:394:0",
+      "9295:394:0",
       "1613:259:1"
     ],
     [
-      "9302:67:0",
+      "9305:67:0",
       "1623:39:1"
     ],
     [
-      "9302:67:0",
+      "9305:67:0",
       "1623:39:1"
     ],
     [
-      "9302:7:0",
+      "9305:7:0",
       "1623:7:1"
     ],
     [
-      "9310:58:0",
+      "9313:58:0",
       "1631:30:1"
     ],
     [
-      "9310:6:0",
+      "9313:6:0",
       "1631:6:1"
     ],
     [
-      "9320:48:0",
+      "9323:48:0",
       "1641:20:1"
     ],
     [
-      "9347:8:0",
+      "9350:8:0",
       "1641:8:1"
     ],
     [
-      "9357:10:0",
+      "9360:10:0",
       "1650:10:1"
     ],
     [
-      "9357:3:0",
+      "9360:3:0",
       "1650:3:1"
     ],
     [
-      "9379:110:0",
+      "9382:110:0",
       "1673:55:1"
     ],
     [
-      "9379:110:0",
+      "9382:110:0",
       "1673:55:1"
     ],
     [
-      "9406:8:0",
+      "9409:8:0",
       "1673:8:1"
     ],
     [
-      "9416:10:0",
+      "9419:10:0",
       "1682:10:1"
     ],
     [
-      "9416:3:0",
+      "9419:3:0",
       "1682:3:1"
     ],
     [
-      "9428:60:0",
+      "9431:60:0",
       "1696:32:1"
     ],
     [
-      "9428:52:0",
+      "9431:52:0",
       "1696:24:1"
     ],
     [
-      "9428:48:0",
+      "9431:48:0",
       "1696:20:1"
     ],
     [
-      "9455:8:0",
+      "9458:8:0",
       "1696:8:1"
     ],
     [
-      "9465:10:0",
+      "9468:10:0",
       "1705:10:1"
     ],
     [
-      "9465:3:0",
+      "9468:3:0",
       "1705:3:1"
     ],
     [
-      "9481:6:0",
+      "9484:6:0",
       "1721:6:1"
     ],
     [
-      "9499:106:0",
+      "9502:106:0",
       "1738:51:1"
     ],
     [
-      "9499:106:0",
+      "9502:106:0",
       "1738:51:1"
     ],
     [
-      "9526:8:0",
+      "9529:8:0",
       "1738:8:1"
     ],
     [
-      "9536:8:0",
+      "9539:8:0",
       "1747:8:1"
     ],
     [
-      "9546:58:0",
+      "9549:58:0",
       "1759:30:1"
     ],
     [
-      "9546:50:0",
+      "9549:50:0",
       "1759:22:1"
     ],
     [
-      "9546:46:0",
+      "9549:46:0",
       "1759:18:1"
     ],
     [
-      "9573:8:0",
+      "9576:8:0",
       "1759:8:1"
     ],
     [
-      "9583:8:0",
+      "9586:8:0",
       "1768:8:1"
     ],
     [
-      "9597:6:0",
+      "9600:6:0",
       "1782:6:1"
     ],
     [
-      "9615:43:0",
+      "9618:43:0",
       "1800:43:1"
     ],
     [
-      "9620:38:0",
+      "9623:38:0",
       "1805:38:1"
     ],
     [
-      "9620:8:0",
+      "9623:8:0",
       "1805:8:1"
     ],
     [
-      "9629:10:0",
+      "9632:10:0",
       "1814:10:1"
     ],
     [
-      "9629:3:0",
+      "9632:3:0",
       "1814:3:1"
     ],
     [
-      "9641:8:0",
+      "9644:8:0",
       "1826:8:1"
     ],
     [
-      "9651:6:0",
+      "9654:6:0",
       "1836:6:1"
     ],
     [
-      "9668:11:0",
+      "9671:11:0",
       "1854:11:1"
     ],
     [
-      "9675:4:0",
+      "9678:4:0",
       "1861:4:1"
     ],
     [
-      "10514:219:0",
+      "10517:220:0",
       "1878:213:1"
     ],
     [
-      "10546:31:0",
+      "10549:31:0",
       "1894:31:1"
     ],
     [
-      "10547:16:0",
+      "10550:16:0",
       "1895:16:1"
     ],
     [
-      "10547:7:0",
+      "10550:7:0",
       "1895:7:1"
     ],
     [
-      "10565:11:0",
+      "10568:11:0",
       "1913:11:1"
     ],
     [
-      "10565:4:0",
+      "10568:4:0",
       "1913:4:1"
     ],
     [
-      "10594:6:0",
+      "10598:6:0",
       "1950:6:1"
     ],
     [
-      "10595:4:0",
+      "10599:4:0",
       "1951:4:1"
     ],
     [
-      "10595:4:0",
+      "10599:4:0",
       "1951:4:1"
     ],
     [
-      "10601:132:0",
+      "10605:132:0",
       "1957:134:1"
     ],
     [
-      "10611:41:0",
+      "10615:41:0",
       "1967:41:1"
     ],
     [
-      "10611:41:0",
+      "10615:41:0",
       "1967:41:1"
     ],
     [
-      "10611:32:0",
+      "10615:32:0",
       "1967:32:1"
     ],
     [
-      "10611:22:0",
+      "10615:22:0",
       "1967:22:1"
     ],
     [
-      "10611:10:0",
+      "10615:10:0",
       "1967:10:1"
     ],
     [
-      "10622:10:0",
+      "10626:10:0",
       "1978:10:1"
     ],
     [
-      "10622:3:0",
+      "10626:3:0",
       "1978:3:1"
     ],
     [
-      "10634:8:0",
+      "10638:8:0",
       "1990:8:1"
     ],
     [
-      "10646:6:0",
+      "10650:6:0",
       "2002:6:1"
     ],
     [
-      "10662:43:0",
+      "10666:43:0",
       "2019:43:1"
     ],
     [
-      "10667:38:0",
+      "10671:38:0",
       "2024:38:1"
     ],
     [
-      "10667:8:0",
+      "10671:8:0",
       "2024:8:1"
     ],
     [
-      "10676:10:0",
+      "10680:10:0",
       "2033:10:1"
     ],
     [
-      "10676:3:0",
+      "10680:3:0",
       "2033:3:1"
     ],
     [
-      "10688:8:0",
+      "10692:8:0",
       "2045:8:1"
     ],
     [
-      "10698:6:0",
+      "10702:6:0",
       "2055:6:1"
     ],
     [
-      "10715:11:0",
+      "10719:11:0",
       "2073:11:1"
     ],
     [
-      "10722:4:0",
+      "10726:4:0",
       "2080:4:1"
     ],
     [
-      "10739:142:0",
+      "10743:142:0",
       "2097:147:1"
     ],
     [
-      "10757:33:0",
+      "10761:33:0",
       "2115:33:1"
     ],
     [
-      "10758:13:0",
+      "10762:13:0",
       "2116:13:1"
     ],
     [
-      "10758:7:0",
+      "10762:7:0",
       "2116:7:1"
     ],
     [
-      "10773:16:0",
+      "10777:16:0",
       "2131:16:1"
     ],
     [
-      "10773:7:0",
+      "10777:7:0",
       "2131:7:1"
     ],
     [
-      "10799:8:0",
+      "10803:8:0",
       "2164:8:1"
     ],
     [
-      "10823:6:0",
+      "10827:6:0",
       "2186:6:1"
     ],
     [
-      "10824:4:0",
+      "10828:4:0",
       "2187:4:1"
     ],
     [
-      "10824:4:0",
+      "10828:4:0",
       "2187:4:1"
     ],
     [
-      "10830:51:0",
+      "10834:51:0",
       "2193:51:1"
     ],
     [
-      "10840:34:0",
+      "10844:34:0",
       "2203:34:1"
     ],
     [
-      "10847:27:0",
+      "10851:27:0",
       "2210:27:1"
     ],
     [
-      "10847:17:0",
+      "10851:17:0",
       "2210:17:1"
     ],
     [
-      "10847:10:0",
+      "10851:10:0",
       "2210:10:1"
     ],
     [
-      "10858:5:0",
+      "10862:5:0",
       "2221:5:1"
     ],
     [
-      "10865:8:0",
+      "10869:8:0",
       "2228:8:1"
     ],
     [
-      "13900:610:0",
+      "13904:611:0",
       "2250:467:1"
     ],
     [
-      "13937:43:0",
+      "13941:43:0",
       "2271:43:1"
     ],
     [
-      "13938:13:0",
+      "13942:13:0",
       "2272:13:1"
     ],
     [
-      "13938:7:0",
+      "13942:7:0",
       "2272:7:1"
     ],
     [
-      "13953:13:0",
+      "13957:13:0",
       "2287:13:1"
     ],
     [
-      "13953:7:0",
+      "13957:7:0",
       "2287:7:1"
     ],
     [
-      "13968:11:0",
+      "13972:11:0",
       "2302:11:1"
     ],
     [
-      "13968:4:0",
+      "13972:4:0",
       "2302:4:1"
     ],
     [
-      "13997:6:0",
+      "14002:6:0",
       "2339:6:1"
     ],
     [
-      "13998:4:0",
+      "14003:4:0",
       "2340:4:1"
     ],
     [
-      "13998:4:0",
+      "14003:4:0",
       "2340:4:1"
     ],
     [
-      "14004:506:0",
+      "14009:506:0",
       "2346:371:1"
     ],
     [
-      "14014:62:0",
+      "14019:62:0",
       "2356:34:1"
     ],
     [
-      "14014:62:0",
+      "14019:62:0",
       "2356:34:1"
     ],
     [
-      "14014:7:0",
+      "14019:7:0",
       "2356:7:1"
     ],
     [
-      "14022:53:0",
+      "14027:53:0",
       "2364:25:1"
     ],
     [
-      "14022:6:0",
+      "14027:6:0",
       "2364:6:1"
     ],
     [
-      "14032:43:0",
+      "14037:43:0",
       "2374:15:1"
     ],
     [
-      "14059:8:0",
+      "14064:8:0",
       "2374:8:1"
     ],
     [
-      "14069:5:0",
+      "14074:5:0",
       "2383:5:1"
     ],
     [
-      "14086:48:0",
+      "14091:48:0",
       "2400:48:1"
     ],
     [
-      "14086:48:0",
+      "14091:48:0",
       "2400:48:1"
     ],
     [
-      "14086:7:0",
+      "14091:7:0",
       "2400:7:1"
     ],
     [
-      "14094:39:0",
+      "14099:39:0",
       "2408:39:1"
     ],
     [
-      "14094:6:0",
+      "14099:6:0",
       "2408:6:1"
     ],
     [
-      "14104:29:0",
+      "14109:29:0",
       "2418:29:1"
     ],
     [
-      "14104:17:0",
+      "14109:17:0",
       "2418:17:1"
     ],
     [
-      "14104:10:0",
+      "14109:10:0",
       "2418:10:1"
     ],
     [
-      "14115:5:0",
+      "14120:5:0",
       "2429:5:1"
     ],
     [
-      "14122:10:0",
+      "14127:10:0",
       "2436:10:1"
     ],
     [
-      "14122:3:0",
+      "14127:3:0",
       "2436:3:1"
     ],
     [
-      "14144:100:0",
+      "14149:100:0",
       "2459:45:1"
     ],
     [
-      "14144:100:0",
+      "14149:100:0",
       "2459:45:1"
     ],
     [
-      "14171:8:0",
+      "14176:8:0",
       "2459:8:1"
     ],
     [
-      "14181:5:0",
+      "14186:5:0",
       "2468:5:1"
     ],
     [
-      "14188:55:0",
+      "14193:55:0",
       "2477:27:1"
     ],
     [
-      "14188:47:0",
+      "14193:47:0",
       "2477:19:1"
     ],
     [
-      "14188:43:0",
+      "14193:43:0",
       "2477:15:1"
     ],
     [
-      "14215:8:0",
+      "14220:8:0",
       "2477:8:1"
     ],
     [
-      "14225:5:0",
+      "14230:5:0",
       "2486:5:1"
     ],
     [
-      "14236:6:0",
+      "14241:6:0",
       "2497:6:1"
     ],
     [
-      "14254:73:0",
+      "14259:73:0",
       "2514:73:1"
     ],
     [
-      "14254:73:0",
+      "14259:73:0",
       "2514:73:1"
     ],
     [
-      "14254:29:0",
+      "14259:29:0",
       "2514:29:1"
     ],
     [
-      "14254:17:0",
+      "14259:17:0",
       "2514:17:1"
     ],
     [
-      "14254:10:0",
+      "14259:10:0",
       "2514:10:1"
     ],
     [
-      "14265:5:0",
+      "14270:5:0",
       "2525:5:1"
     ],
     [
-      "14272:10:0",
+      "14277:10:0",
       "2532:10:1"
     ],
     [
-      "14272:3:0",
+      "14277:3:0",
       "2532:3:1"
     ],
     [
-      "14286:41:0",
+      "14291:41:0",
       "2546:41:1"
     ],
     [
-      "14286:33:0",
+      "14291:33:0",
       "2546:33:1"
     ],
     [
-      "14286:29:0",
+      "14291:29:0",
       "2546:29:1"
     ],
     [
-      "14286:17:0",
+      "14291:17:0",
       "2546:17:1"
     ],
     [
-      "14286:10:0",
+      "14291:10:0",
       "2546:10:1"
     ],
     [
-      "14297:5:0",
+      "14302:5:0",
       "2557:5:1"
     ],
     [
-      "14304:10:0",
+      "14309:10:0",
       "2564:10:1"
     ],
     [
-      "14304:3:0",
+      "14309:3:0",
       "2564:3:1"
     ],
     [
-      "14320:6:0",
+      "14325:6:0",
       "2580:6:1"
     ],
     [
-      "14337:100:0",
+      "14342:100:0",
       "2597:45:1"
     ],
     [
-      "14337:100:0",
+      "14342:100:0",
       "2597:45:1"
     ],
     [
-      "14364:8:0",
+      "14369:8:0",
       "2597:8:1"
     ],
     [
-      "14374:5:0",
+      "14379:5:0",
       "2606:5:1"
     ],
     [
-      "14381:55:0",
+      "14386:55:0",
       "2615:27:1"
     ],
     [
-      "14381:47:0",
+      "14386:47:0",
       "2615:19:1"
     ],
     [
-      "14381:43:0",
+      "14386:43:0",
       "2615:15:1"
     ],
     [
-      "14408:8:0",
+      "14413:8:0",
       "2615:8:1"
     ],
     [
-      "14418:5:0",
+      "14423:5:0",
       "2624:5:1"
     ],
     [
-      "14429:6:0",
+      "14434:6:0",
       "2635:6:1"
     ],
     [
-      "14447:35:0",
+      "14452:35:0",
       "2653:35:1"
     ],
     [
-      "14452:30:0",
+      "14457:30:0",
       "2658:30:1"
     ],
     [
-      "14452:8:0",
+      "14457:8:0",
       "2658:8:1"
     ],
     [
-      "14461:5:0",
+      "14466:5:0",
       "2667:5:1"
     ],
     [
-      "14468:5:0",
+      "14473:5:0",
       "2674:5:1"
     ],
     [
-      "14475:6:0",
+      "14480:6:0",
       "2681:6:1"
     ],
     [
-      "14492:11:0",
+      "14497:11:0",
       "2699:11:1"
     ],
     [
-      "14499:4:0",
+      "14504:4:0",
       "2706:4:1"
     ],
     [
-      "14917:2632:0",
+      "14922:2633:0",
       "89:227:0"
     ],
     [
-      "14935:5:0",
+      "14940:5:0",
       "107:5:0"
     ],
     [
-      "14935:5:0",
+      "14940:5:0",
       "107:5:0"
     ],
     [
-      "15108:766:0",
+      "15113:766:0",
       "120:43:0"
     ],
     [
-      "15119:2:0",
+      "15124:2:0",
       "131:2:0"
     ],
     [
-      "15129:13:0",
+      "15134:13:0",
       "141:13:0"
     ],
     [
-      "15129:5:0",
+      "15134:5:0",
       "141:5:0"
     ],
     [
-      "15135:6:0",
+      "15140:6:0",
       "147:6:0"
     ],
     [
-      "15143:731:0",
+      "15148:731:0",
       "155:8:0"
     ],
     [
-      "16669:147:0",
+      "16674:148:0",
       "169:144:0"
     ],
     [
-      "16703:33:0",
+      "16708:33:0",
       "187:33:0"
     ],
     [
-      "16704:13:0",
+      "16709:13:0",
       "188:13:0"
     ],
     [
-      "16704:7:0",
+      "16709:7:0",
       "188:7:0"
     ],
     [
-      "16719:16:0",
+      "16724:16:0",
       "203:16:0"
     ],
     [
-      "16719:7:0",
+      "16724:7:0",
       "203:7:0"
     ],
     [
-      "16753:6:0",
+      "16759:6:0",
       "250:6:0"
     ],
     [
-      "16754:4:0",
+      "16760:4:0",
       "251:4:0"
     ],
     [
-      "16754:4:0",
+      "16760:4:0",
       "251:4:0"
     ],
     [
-      "16760:56:0",
+      "16766:56:0",
       "257:56:0"
     ],
     [
-      "16770:39:0",
+      "16776:39:0",
       "267:39:0"
     ],
     [
-      "16777:32:0",
+      "16783:32:0",
       "274:32:0"
     ],
     [
-      "16777:15:0",
+      "16783:15:0",
       "274:15:0"
     ],
     [
-      "16777:5:0",
+      "16783:5:0",
       "274:5:0"
     ],
     [
-      "16793:5:0",
+      "16799:5:0",
       "290:5:0"
     ],
     [
-      "16800:8:0",
+      "16806:8:0",
       "297:8:0"
     ],
     [
-      "16964:31:0",
+      "16970:31:0",
       [
         "302:49:2",
         "35:48:0"
       ]
     ],
     [
-      "15499:58:0",
+      "15504:58:0",
       [
         "426:101:2",
         "35:48:0"
       ]
     ],
     [
-      "16202:39:0",
+      "16207:39:0",
       [
         "962:50:2",
         "35:48:0"
@@ -1569,84 +1569,84 @@
       ]
     ],
     [
-      "6292:57:0",
+      "6293:57:0",
       [
         "801:39:2",
         "35:48:0"
       ]
     ],
     [
-      "7637:11:0",
+      "7639:11:0",
       [
         "1133:47:2",
         "35:48:0"
       ]
     ],
     [
-      "7915:107:0",
+      "7917:107:0",
       [
         "1259:91:2",
         "35:48:0"
       ]
     ],
     [
-      "8286:105:0",
+      "8288:105:0",
       [
         "1424:75:2",
         "35:48:0"
       ]
     ],
     [
-      "8650:127:0",
+      "8652:127:0",
       [
         "1589:97:2",
         "35:48:0"
       ]
     ],
     [
-      "10011:45:0",
+      "10014:45:0",
       [
         "1830:53:2",
         "35:48:0"
       ]
     ],
     [
-      "11718:11:0",
+      "11722:11:0",
       [
         "2014:41:2",
         "35:48:0"
       ]
     ],
     [
-      "12008:94:0",
+      "12012:94:0",
       [
         "2134:73:2",
         "35:48:0"
       ]
     ],
     [
-      "12375:55:0",
+      "12379:55:0",
       [
         "2287:86:2",
         "35:48:0"
       ]
     ],
     [
-      "12697:21:0",
+      "12701:21:0",
       [
         "2449:55:2",
         "35:48:0"
       ]
     ],
     [
-      "12981:95:0",
+      "12985:95:0",
       [
         "2577:69:2",
         "35:48:0"
       ]
     ],
     [
-      "13343:121:0",
+      "13347:121:0",
       [
         "2736:85:2",
         "35:48:0"
@@ -1660,40 +1660,40 @@
     "2742:7:0",
     "2844:6:0",
     "5073:26:0",
-    "9379:26:0",
-    "9499:26:0",
-    "14144:26:0",
-    "14337:26:0",
+    "9382:26:0",
+    "9502:26:0",
+    "14149:26:0",
+    "14342:26:0",
     "2972:37:0",
     "2963:7:0",
-    "6880:26:0",
-    "9320:26:0",
-    "9428:26:0",
-    "9546:26:0",
-    "14032:26:0",
-    "14188:26:0",
-    "14381:26:0",
+    "6882:26:0",
+    "9323:26:0",
+    "9431:26:0",
+    "9549:26:0",
+    "14037:26:0",
+    "14193:26:0",
+    "14386:26:0",
     "363:22:0",
     "482:33:0",
     "570:8:0",
     "590:113:0",
     "765:110:0",
-    "17430:50:0",
-    "17490:50:0",
-    "15345:42:0",
-    "15397:35:0",
-    "15442:43:0",
-    "15178:72:0",
-    "15260:42:0",
-    "15715:72:0",
-    "15797:70:0",
-    "15957:10:0",
-    "16138:50:0",
-    "16004:72:0",
-    "16086:42:0",
-    "16504:72:0",
-    "16586:70:0",
-    "14801:50:0",
+    "17436:50:0",
+    "17496:50:0",
+    "15350:42:0",
+    "15402:35:0",
+    "15447:43:0",
+    "15183:72:0",
+    "15265:42:0",
+    "15720:72:0",
+    "15802:70:0",
+    "15962:10:0",
+    "16143:50:0",
+    "16009:72:0",
+    "16091:42:0",
+    "16509:72:0",
+    "16591:70:0",
+    "14806:50:0",
     "3230:22:0",
     "3349:33:0",
     "3437:8:0",
@@ -1708,37 +1708,37 @@
     "5425:43:0",
     "5717:72:0",
     "5799:71:0",
-    "6053:10:0",
-    "6236:42:0",
-    "6100:73:0",
-    "6183:43:0",
-    "6617:72:0",
-    "6699:71:0",
-    "7012:10:0",
-    "7573:50:0",
-    "7059:73:0",
-    "7142:43:0",
-    "9038:72:0",
-    "9120:71:0",
-    "9765:10:0",
-    "9948:49:0",
-    "9812:73:0",
-    "9895:43:0",
-    "10348:72:0",
-    "10430:71:0",
-    "10977:10:0",
-    "11646:58:0",
-    "11024:73:0",
-    "11107:43:0",
-    "13734:72:0",
-    "13816:71:0",
-    "15153:15:0",
-    "15979:15:0",
+    "6054:10:0",
+    "6237:42:0",
+    "6101:73:0",
+    "6184:43:0",
+    "6618:72:0",
+    "6700:71:0",
+    "7014:10:0",
+    "7575:50:0",
+    "7061:73:0",
+    "7144:43:0",
+    "9040:72:0",
+    "9122:71:0",
+    "9768:10:0",
+    "9951:49:0",
+    "9815:73:0",
+    "9898:43:0",
+    "10351:72:0",
+    "10433:71:0",
+    "10981:10:0",
+    "11650:58:0",
+    "11028:73:0",
+    "11111:43:0",
+    "13738:72:0",
+    "13820:71:0",
+    "15158:15:0",
+    "15984:15:0",
     "5317:15:0",
-    "6075:15:0",
-    "7034:15:0",
-    "9787:15:0",
-    "10999:15:0"
+    "6076:15:0",
+    "7036:15:0",
+    "9790:15:0",
+    "11003:15:0"
   ],
   "propertyMap": [
     {
@@ -1768,17 +1768,17 @@
       ],
       "message": "The sum of balances is always equal to the total supply",
       "instrumentationRanges": [
-        "17011:76:0",
-        "17101:121:0",
-        "16960:300:0"
+        "17017:76:0",
+        "17107:121:0",
+        "16966:300:0"
       ],
       "checkRanges": [
-        "16964:31:0"
+        "16970:31:0"
       ],
       "assertionRanges": [
-        "17011:76:0",
-        "17101:121:0",
-        "17236:13:0"
+        "17017:76:0",
+        "17107:121:0",
+        "17242:13:0"
       ]
     },
     {
@@ -1800,16 +1800,16 @@
       "debugEventEncoding": [],
       "message": "The token has a fixed supply.",
       "instrumentationRanges": [
-        "15312:23:0",
-        "15573:95:0",
-        "15495:211:0"
+        "15317:23:0",
+        "15578:95:0",
+        "15500:211:0"
       ],
       "checkRanges": [
-        "15499:58:0"
+        "15504:58:0"
       ],
       "assertionRanges": [
-        "15573:95:0",
-        "15682:13:0"
+        "15578:95:0",
+        "15687:13:0"
       ]
     },
     {
@@ -1846,17 +1846,17 @@
       ],
       "message": "Returns spenders allowance for this owner",
       "instrumentationRanges": [
-        "16257:79:0",
-        "16350:107:0",
-        "16198:297:0"
+        "16262:79:0",
+        "16355:107:0",
+        "16203:297:0"
       ],
       "checkRanges": [
-        "16202:39:0"
+        "16207:39:0"
       ],
       "assertionRanges": [
-        "16257:79:0",
-        "16350:107:0",
-        "16471:13:0"
+        "16262:79:0",
+        "16355:107:0",
+        "16476:13:0"
       ]
     },
     {
@@ -1916,17 +1916,17 @@
       ],
       "message": "Returns the balance of owner in the balances mapping",
       "instrumentationRanges": [
-        "6365:72:0",
-        "6451:119:0",
-        "6288:320:0"
+        "6366:72:0",
+        "6452:119:0",
+        "6289:320:0"
       ],
       "checkRanges": [
-        "6292:57:0"
+        "6293:57:0"
       ],
       "assertionRanges": [
-        "6365:72:0",
-        "6451:119:0",
-        "6584:13:0"
+        "6366:72:0",
+        "6452:119:0",
+        "6585:13:0"
       ]
     },
     {
@@ -1956,19 +1956,19 @@
       ],
       "message": "The sender has sufficient balance at the start",
       "instrumentationRanges": [
-        "7195:17:0",
-        "7222:69:0",
-        "7664:73:0",
-        "7751:113:0",
-        "7633:269:0"
+        "7197:17:0",
+        "7224:69:0",
+        "7666:73:0",
+        "7753:113:0",
+        "7635:269:0"
       ],
       "checkRanges": [
-        "7637:11:0"
+        "7639:11:0"
       ],
       "assertionRanges": [
-        "7664:73:0",
-        "7751:113:0",
-        "7878:13:0"
+        "7666:73:0",
+        "7753:113:0",
+        "7880:13:0"
       ]
     },
     {
@@ -2005,18 +2005,18 @@
       ],
       "message": "The sender has value less balance",
       "instrumentationRanges": [
-        "7301:59:0",
-        "8038:83:0",
-        "8135:100:0",
-        "7911:362:0"
+        "7303:59:0",
+        "8040:83:0",
+        "8137:100:0",
+        "7913:362:0"
       ],
       "checkRanges": [
-        "7915:107:0"
+        "7917:107:0"
       ],
       "assertionRanges": [
-        "8038:83:0",
-        "8135:100:0",
-        "8249:13:0"
+        "8040:83:0",
+        "8137:100:0",
+        "8251:13:0"
       ]
     },
     {
@@ -2055,18 +2055,18 @@
       ],
       "message": "The receiver receives _value",
       "instrumentationRanges": [
-        "7370:57:0",
-        "8407:83:0",
-        "8504:95:0",
-        "8282:355:0"
+        "7372:57:0",
+        "8409:83:0",
+        "8506:95:0",
+        "8284:355:0"
       ],
       "checkRanges": [
-        "8286:105:0"
+        "8288:105:0"
       ],
       "assertionRanges": [
-        "8407:83:0",
-        "8504:95:0",
-        "8613:13:0"
+        "8409:83:0",
+        "8506:95:0",
+        "8615:13:0"
       ]
     },
     {
@@ -2097,19 +2097,19 @@
       ],
       "message": "Transfer does not modify the sum of balances",
       "instrumentationRanges": [
-        "7437:57:0",
-        "7504:59:0",
-        "8793:73:0",
-        "8880:111:0",
-        "8646:383:0"
+        "7439:57:0",
+        "7506:59:0",
+        "8795:73:0",
+        "8882:111:0",
+        "8648:383:0"
       ],
       "checkRanges": [
-        "8650:127:0"
+        "8652:127:0"
       ],
       "assertionRanges": [
-        "8793:73:0",
-        "8880:111:0",
-        "9005:13:0"
+        "8795:73:0",
+        "8882:111:0",
+        "9007:13:0"
       ]
     },
     {
@@ -2146,17 +2146,17 @@
       ],
       "message": "spender will have an allowance of value for this sender's balance",
       "instrumentationRanges": [
-        "10072:82:0",
-        "10168:133:0",
-        "10007:332:0"
+        "10075:82:0",
+        "10171:133:0",
+        "10010:332:0"
       ],
       "checkRanges": [
-        "10011:45:0"
+        "10014:45:0"
       ],
       "assertionRanges": [
-        "10072:82:0",
-        "10168:133:0",
-        "10315:13:0"
+        "10075:82:0",
+        "10171:133:0",
+        "10318:13:0"
       ]
     },
     {
@@ -2193,20 +2193,20 @@
       ],
       "message": "The sender has sufficient balance at the start",
       "instrumentationRanges": [
-        "11160:16:0",
-        "11186:17:0",
-        "11213:64:0",
-        "11745:84:0",
-        "11843:114:0",
-        "11714:281:0"
+        "11164:16:0",
+        "11190:17:0",
+        "11217:64:0",
+        "11749:84:0",
+        "11847:114:0",
+        "11718:281:0"
       ],
       "checkRanges": [
-        "11718:11:0"
+        "11722:11:0"
       ],
       "assertionRanges": [
-        "11745:84:0",
-        "11843:114:0",
-        "11971:13:0"
+        "11749:84:0",
+        "11847:114:0",
+        "11975:13:0"
       ]
     },
     {
@@ -2252,18 +2252,18 @@
       ],
       "message": "The sender has value less balance",
       "instrumentationRanges": [
-        "11287:54:0",
-        "12118:91:0",
-        "12223:101:0",
-        "12004:358:0"
+        "11291:54:0",
+        "12122:91:0",
+        "12227:101:0",
+        "12008:358:0"
       ],
       "checkRanges": [
-        "12008:94:0"
+        "12012:94:0"
       ],
       "assertionRanges": [
-        "12118:91:0",
-        "12223:101:0",
-        "12338:13:0"
+        "12122:91:0",
+        "12227:101:0",
+        "12342:13:0"
       ]
     },
     {
@@ -2301,18 +2301,18 @@
       ],
       "message": "The actor has value less allowance",
       "instrumentationRanges": [
-        "11351:40:0",
-        "12446:84:0",
-        "12544:102:0",
-        "12371:313:0"
+        "11355:40:0",
+        "12450:84:0",
+        "12548:102:0",
+        "12375:313:0"
       ],
       "checkRanges": [
-        "12375:55:0"
+        "12379:55:0"
       ],
       "assertionRanges": [
-        "12446:84:0",
-        "12544:102:0",
-        "12660:13:0"
+        "12450:84:0",
+        "12548:102:0",
+        "12664:13:0"
       ]
     },
     {
@@ -2349,18 +2349,18 @@
       ],
       "message": "The actor has enough allowance",
       "instrumentationRanges": [
-        "11401:40:0",
-        "12734:84:0",
-        "12832:98:0",
-        "12693:275:0"
+        "11405:40:0",
+        "12738:84:0",
+        "12836:98:0",
+        "12697:275:0"
       ],
       "checkRanges": [
-        "12697:21:0"
+        "12701:21:0"
       ],
       "assertionRanges": [
-        "12734:84:0",
-        "12832:98:0",
-        "12944:13:0"
+        "12738:84:0",
+        "12836:98:0",
+        "12948:13:0"
       ]
     },
     {
@@ -2406,18 +2406,18 @@
       ],
       "message": "The receiver receives value",
       "instrumentationRanges": [
-        "11451:55:0",
-        "13092:91:0",
-        "13197:95:0",
-        "12977:353:0"
+        "11455:55:0",
+        "13096:91:0",
+        "13201:95:0",
+        "12981:353:0"
       ],
       "checkRanges": [
-        "12981:95:0"
+        "12985:95:0"
       ],
       "assertionRanges": [
-        "13092:91:0",
-        "13197:95:0",
-        "13306:13:0"
+        "13096:91:0",
+        "13201:95:0",
+        "13310:13:0"
       ]
     },
     {
@@ -2456,19 +2456,19 @@
       ],
       "message": "Transfer does not modify the sum of balances",
       "instrumentationRanges": [
-        "11516:55:0",
-        "11581:55:0",
-        "13480:81:0",
-        "13575:112:0",
-        "13339:386:0"
+        "11520:55:0",
+        "11585:55:0",
+        "13484:81:0",
+        "13579:112:0",
+        "13343:386:0"
       ],
       "checkRanges": [
-        "13343:121:0"
+        "13347:121:0"
       ],
       "assertionRanges": [
-        "13480:81:0",
-        "13575:112:0",
-        "13701:13:0"
+        "13484:81:0",
+        "13579:112:0",
+        "13705:13:0"
       ]
     }
   ],
@@ -2480,5 +2480,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.24"
+  "scribbleVersion": "0.7.0"
 }
diff --git a/test/multifile_samples/forall_maps/child.sol.instrumented.expected b/test/multifile_samples/forall_maps/child.sol.instrumented.expected
index c112e36b..3ea25878 100644
--- a/test/multifile_samples/forall_maps/child.sol.instrumented.expected
+++ b/test/multifile_samples/forall_maps/child.sol.instrumented.expected
@@ -92,7 +92,7 @@ contract Foo is Base {
         }
     }
 
-    function _original_Foo_setA(uint key, uint val) private {
+    function _original_Foo_setA(uint key, uint val) internal {
         uint256_to_uint256_61.set(a, key, val);
     }
 
@@ -107,13 +107,13 @@ contract Foo is Base {
                 if (!_v.forall_1) break;
             }
             if (!(_v.forall_1)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("002365:0067:001 1: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("002366:0067:001 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_decA(uint key) private {
+    function _original_Foo_decA(uint key) internal {
         uint256_to_uint256_61.dec(a, key);
     }
 
@@ -128,13 +128,13 @@ contract Foo is Base {
                 if (!_v.forall_2) break;
             }
             if (!(_v.forall_2)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("003042:0067:001 2: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("003044:0067:001 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setC(string memory s, int16 v) private {
+    function _original_Foo_setC(string memory s, int16 v) internal {
         string_to_int16_61.set(c0, s, v);
     }
 
@@ -155,13 +155,13 @@ contract Foo is Base {
                 if (!_v.forall_3) break;
             }
             if (!(_v.forall_3)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("004136:0067:001 3: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("004139:0067:001 3: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setD(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setD(string memory s, uint8 k, int8 v) internal {
         uint8_to_int8_61.set(string_to_uint8_to_int8_61_S_472_61.get_lhs(d, s), k, v);
     }
 
@@ -176,13 +176,13 @@ contract Foo is Base {
                 if (!_v.forall_5) break;
             }
             if (!(_v.forall_5)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("004888:0067:001 4: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("004892:0067:001 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setE(uint k, uint[] memory v) private {
+    function _original_Foo_setE(uint k, uint[] memory v) internal {
         uint256_to_uint256_arr_61.set(e, k, v);
     }
 
@@ -200,13 +200,13 @@ contract Foo is Base {
                 if (!_v.forall_6) break;
             }
             if (!(_v.forall_6)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("005570:0067:001 5: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("005575:0067:001 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setF(uint i, uint j, uint v) private {
+    function _original_Foo_setF(uint i, uint j, uint v) internal {
         f[i][j] = v;
     }
 
@@ -225,13 +225,13 @@ contract Foo is Base {
                 if (!_v.forall_7) break;
             }
             if (!(_v.forall_7)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("006301:0067:001 6: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("006307:0067:001 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setG(uint i, uint j, uint v) private {
+    function _original_Foo_setG(uint i, uint j, uint v) internal {
         uint256_to_uint256_61.set(g[i], j, v);
     }
 
@@ -246,13 +246,13 @@ contract Foo is Base {
                 if (!_v.forall_8) break;
             }
             if (!(_v.forall_8)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("007020:0067:001 7: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("007027:0067:001 7: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setH(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setH(string memory s, uint8 k, int8 v) internal {
         string_to_mapping_uint8_to_int8_61.get_lhs(h, s)[k] = v;
     }
 
@@ -267,13 +267,13 @@ contract Foo is Base {
                 if (!_v.forall_9) break;
             }
             if (!(_v.forall_9)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("007755:0067:001 8: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("007763:0067:001 8: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setI(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setI(string memory s, uint8 k, int8 v) internal {
         uint8_to_int8_61.set(i[s], k, v);
     }
 
@@ -292,13 +292,13 @@ contract Foo is Base {
                 if (!_v.forall_10) break;
             }
             if (!(_v.forall_10)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("008565:0067:001 9: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("008574:0067:001 9: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setJ(uint saI, string memory x, uint v) private {
+    function _original_Foo_setJ(uint saI, string memory x, uint v) internal {
         string_to_uint256_61.set(j.sas[saI].m, x, v);
     }
 
@@ -318,13 +318,13 @@ contract Foo is Base {
                 if (!_v.forall_11) break;
             }
             if (!(_v.forall_11)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("009563:0068:001 10: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("009573:0068:001 10: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setJ2(uint saI, string memory x, uint v) private {
+    function _original_Foo_setJ2(uint saI, string memory x, uint v) internal {
         string_to_uint256_61.set(j.sas[saI].m, x, v);
     }
 }
diff --git a/test/multifile_samples/forall_maps/flat.sol.expected b/test/multifile_samples/forall_maps/flat.sol.expected
index bced02ae..2b0b48a4 100644
--- a/test/multifile_samples/forall_maps/flat.sol.expected
+++ b/test/multifile_samples/forall_maps/flat.sol.expected
@@ -452,7 +452,7 @@ contract Foo is Base {
         }
     }
 
-    function _original_Foo_setA(uint key, uint val) private {
+    function _original_Foo_setA(uint key, uint val) internal {
         uint256_to_uint256_61.set(a, key, val);
     }
 
@@ -467,13 +467,13 @@ contract Foo is Base {
                 if (!_v.forall_1) break;
             }
             if (!(_v.forall_1)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("012322:0067:000 1: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("012323:0067:000 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_decA(uint key) private {
+    function _original_Foo_decA(uint key) internal {
         uint256_to_uint256_61.dec(a, key);
     }
 
@@ -488,13 +488,13 @@ contract Foo is Base {
                 if (!_v.forall_2) break;
             }
             if (!(_v.forall_2)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("012999:0067:000 2: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("013001:0067:000 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setC(string memory s, int16 v) private {
+    function _original_Foo_setC(string memory s, int16 v) internal {
         string_to_int16_61.set(c0, s, v);
     }
 
@@ -515,13 +515,13 @@ contract Foo is Base {
                 if (!_v.forall_3) break;
             }
             if (!(_v.forall_3)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("014093:0067:000 3: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("014096:0067:000 3: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setD(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setD(string memory s, uint8 k, int8 v) internal {
         uint8_to_int8_61.set(string_to_uint8_to_int8_61_S_472_61.get_lhs(d, s), k, v);
     }
 
@@ -536,13 +536,13 @@ contract Foo is Base {
                 if (!_v.forall_5) break;
             }
             if (!(_v.forall_5)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("014845:0067:000 4: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("014849:0067:000 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setE(uint k, uint[] memory v) private {
+    function _original_Foo_setE(uint k, uint[] memory v) internal {
         uint256_to_uint256_arr_61.set(e, k, v);
     }
 
@@ -560,13 +560,13 @@ contract Foo is Base {
                 if (!_v.forall_6) break;
             }
             if (!(_v.forall_6)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("015527:0067:000 5: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("015532:0067:000 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setF(uint i, uint j, uint v) private {
+    function _original_Foo_setF(uint i, uint j, uint v) internal {
         f[i][j] = v;
     }
 
@@ -585,13 +585,13 @@ contract Foo is Base {
                 if (!_v.forall_7) break;
             }
             if (!(_v.forall_7)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("016258:0067:000 6: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("016264:0067:000 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setG(uint i, uint j, uint v) private {
+    function _original_Foo_setG(uint i, uint j, uint v) internal {
         uint256_to_uint256_61.set(g[i], j, v);
     }
 
@@ -606,13 +606,13 @@ contract Foo is Base {
                 if (!_v.forall_8) break;
             }
             if (!(_v.forall_8)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("016977:0067:000 7: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("016984:0067:000 7: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setH(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setH(string memory s, uint8 k, int8 v) internal {
         string_to_mapping_uint8_to_int8_61.get_lhs(h, s)[k] = v;
     }
 
@@ -627,13 +627,13 @@ contract Foo is Base {
                 if (!_v.forall_9) break;
             }
             if (!(_v.forall_9)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("017712:0067:000 8: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("017720:0067:000 8: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setI(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setI(string memory s, uint8 k, int8 v) internal {
         uint8_to_int8_61.set(i[s], k, v);
     }
 
@@ -652,13 +652,13 @@ contract Foo is Base {
                 if (!_v.forall_10) break;
             }
             if (!(_v.forall_10)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("018522:0067:000 9: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("018531:0067:000 9: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setJ(uint saI, string memory x, uint v) private {
+    function _original_Foo_setJ(uint saI, string memory x, uint v) internal {
         string_to_uint256_61.set(j.sas[saI].m, x, v);
     }
 
@@ -678,13 +678,13 @@ contract Foo is Base {
                 if (!_v.forall_11) break;
             }
             if (!(_v.forall_11)) {
-                emit __ScribbleUtilsLib__293.AssertionFailed("019520:0068:000 10: ");
+                emit __ScribbleUtilsLib__293.AssertionFailed("019530:0068:000 10: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setJ2(uint saI, string memory x, uint v) private {
+    function _original_Foo_setJ2(uint saI, string memory x, uint v) internal {
         string_to_uint256_61.set(j.sas[saI].m, x, v);
     }
 }
\ No newline at end of file
diff --git a/test/multifile_samples/forall_maps/instrumentationMetadata.json.expected b/test/multifile_samples/forall_maps/instrumentationMetadata.json.expected
index f717fbbe..61a0465b 100644
--- a/test/multifile_samples/forall_maps/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/forall_maps/instrumentationMetadata.json.expected
@@ -121,7 +121,7 @@
       "732:2:0"
     ],
     [
-      "10125:10661:0",
+      "10125:10672:0",
       "45:1840:1"
     ],
     [
@@ -133,7 +133,7 @@
       "61:4:1"
     ],
     [
-      "11873:111:0",
+      "11873:112:0",
       "123:70:1"
     ],
     [
@@ -157,723 +157,723 @@
       "147:4:1"
     ],
     [
-      "11929:55:0",
+      "11930:55:0",
       "164:29:1"
     ],
     [
-      "11939:38:0",
+      "11940:38:0",
       "174:12:1"
     ],
     [
-      "11939:38:0",
+      "11940:38:0",
       "174:12:1"
     ],
     [
-      "11965:1:0",
+      "11966:1:0",
       "174:1:1"
     ],
     [
-      "11968:3:0",
+      "11969:3:0",
       "176:3:1"
     ],
     [
-      "11973:3:0",
+      "11974:3:0",
       "183:3:1"
     ],
     [
-      "12633:96:0",
+      "12634:97:0",
       "250:56:1"
     ],
     [
-      "12660:10:0",
+      "12661:10:0",
       "263:10:1"
     ],
     [
-      "12661:8:0",
+      "12662:8:0",
       "264:8:1"
     ],
     [
-      "12661:4:0",
+      "12662:4:0",
       "264:4:1"
     ],
     [
-      "12679:50:0",
+      "12681:50:0",
       "281:25:1"
     ],
     [
-      "12689:33:0",
+      "12691:33:0",
       "291:8:1"
     ],
     [
-      "12689:33:0",
+      "12691:33:0",
       "291:8:1"
     ],
     [
-      "12715:1:0",
+      "12717:1:0",
       "291:1:1"
     ],
     [
-      "12718:3:0",
+      "12720:3:0",
       "293:3:1"
     ],
     [
-      "13398:111:0",
+      "13400:112:0",
       "374:72:1"
     ],
     [
-      "13425:26:0",
+      "13427:26:0",
       "387:26:1"
     ],
     [
-      "13426:15:0",
+      "13428:15:0",
       "388:15:1"
     ],
     [
-      "13426:6:0",
+      "13428:6:0",
       "388:6:1"
     ],
     [
-      "13443:7:0",
+      "13445:7:0",
       "405:7:1"
     ],
     [
-      "13443:5:0",
+      "13445:5:0",
       "405:5:1"
     ],
     [
-      "13460:49:0",
+      "13463:49:0",
       "421:25:1"
     ],
     [
-      "13470:32:0",
+      "13473:32:0",
       "431:8:1"
     ],
     [
-      "13470:32:0",
+      "13473:32:0",
       "431:8:1"
     ],
     [
-      "13493:2:0",
+      "13496:2:0",
       "431:1:1"
     ],
     [
-      "13497:1:0",
+      "13500:1:0",
       "433:1:1"
     ],
     [
-      "13500:1:0",
+      "13503:1:0",
       "438:1:1"
     ],
     [
-      "14587:164:0",
+      "14590:165:0",
       "541:83:1"
     ],
     [
-      "14614:34:0",
+      "14617:34:0",
       "554:34:1"
     ],
     [
-      "14615:15:0",
+      "14618:15:0",
       "555:15:1"
     ],
     [
-      "14615:6:0",
+      "14618:6:0",
       "555:6:1"
     ],
     [
-      "14632:7:0",
+      "14635:7:0",
       "572:7:1"
     ],
     [
-      "14632:5:0",
+      "14635:5:0",
       "572:5:1"
     ],
     [
-      "14641:6:0",
+      "14644:6:0",
       "581:6:1"
     ],
     [
-      "14641:4:0",
+      "14644:4:0",
       "581:4:1"
     ],
     [
-      "14657:94:0",
+      "14661:94:0",
       "596:28:1"
     ],
     [
-      "14667:77:0",
+      "14671:77:0",
       "606:11:1"
     ],
     [
-      "14667:77:0",
+      "14671:77:0",
       "606:11:1"
     ],
     [
-      "14688:49:0",
+      "14692:49:0",
       "606:4:1"
     ],
     [
-      "14732:1:0",
+      "14736:1:0",
       "606:1:1"
     ],
     [
-      "14735:1:0",
+      "14739:1:0",
       "608:1:1"
     ],
     [
-      "14739:1:0",
+      "14743:1:0",
       "611:1:1"
     ],
     [
-      "14742:1:0",
+      "14746:1:0",
       "616:1:1"
     ],
     [
-      "15427:116:0",
+      "15431:117:0",
       "689:71:1"
     ],
     [
-      "15454:25:0",
+      "15458:25:0",
       "702:25:1"
     ],
     [
-      "15455:6:0",
+      "15459:6:0",
       "703:6:1"
     ],
     [
-      "15455:4:0",
+      "15459:4:0",
       "703:4:1"
     ],
     [
-      "15463:15:0",
+      "15467:15:0",
       "711:15:1"
     ],
     [
-      "15463:6:0",
+      "15467:6:0",
       "711:6:1"
     ],
     [
-      "15463:4:0",
+      "15467:4:0",
       "711:4:1"
     ],
     [
-      "15488:55:0",
+      "15493:55:0",
       "735:25:1"
     ],
     [
-      "15498:38:0",
+      "15503:38:0",
       "745:8:1"
     ],
     [
-      "15498:38:0",
+      "15503:38:0",
       "745:8:1"
     ],
     [
-      "15528:1:0",
+      "15533:1:0",
       "745:1:1"
     ],
     [
-      "15531:1:0",
+      "15536:1:0",
       "747:1:1"
     ],
     [
-      "15534:1:0",
+      "15539:1:0",
       "752:1:1"
     ],
     [
-      "15549:49:0",
+      "15554:49:0",
       "766:49:1"
     ],
     [
-      "15563:2:0",
+      "15568:2:0",
       "780:2:1"
     ],
     [
-      "15573:25:0",
+      "15578:25:0",
       "790:25:1"
     ],
     [
-      "15583:8:0",
+      "15588:8:0",
       "800:8:1"
     ],
     [
-      "15583:8:0",
+      "15588:8:0",
       "800:8:1"
     ],
     [
-      "15583:6:0",
+      "15588:6:0",
       "800:6:1"
     ],
     [
-      "15583:1:0",
+      "15588:1:0",
       "800:1:1"
     ],
     [
-      "16197:88:0",
+      "16202:89:0",
       "875:73:1"
     ],
     [
-      "16224:24:0",
+      "16229:24:0",
       "888:24:1"
     ],
     [
-      "16225:6:0",
+      "16230:6:0",
       "889:6:1"
     ],
     [
-      "16225:4:0",
+      "16230:4:0",
       "889:4:1"
     ],
     [
-      "16233:6:0",
+      "16238:6:0",
       "897:6:1"
     ],
     [
-      "16233:4:0",
+      "16238:4:0",
       "897:4:1"
     ],
     [
-      "16241:6:0",
+      "16246:6:0",
       "905:6:1"
     ],
     [
-      "16241:4:0",
+      "16246:4:0",
       "905:4:1"
     ],
     [
-      "16257:28:0",
+      "16263:28:0",
       "920:28:1"
     ],
     [
-      "16267:11:0",
+      "16273:11:0",
       "930:11:1"
     ],
     [
-      "16267:11:0",
+      "16273:11:0",
       "930:11:1"
     ],
     [
-      "16267:7:0",
+      "16273:7:0",
       "930:7:1"
     ],
     [
-      "16267:4:0",
+      "16273:4:0",
       "930:4:1"
     ],
     [
-      "16267:1:0",
+      "16273:1:0",
       "930:1:1"
     ],
     [
-      "16269:1:0",
+      "16275:1:0",
       "932:1:1"
     ],
     [
-      "16272:1:0",
+      "16278:1:0",
       "935:1:1"
     ],
     [
-      "16277:1:0",
+      "16283:1:0",
       "940:1:1"
     ],
     [
-      "16291:49:0",
+      "16297:49:0",
       "954:49:1"
     ],
     [
-      "16305:2:0",
+      "16311:2:0",
       "968:2:1"
     ],
     [
-      "16315:25:0",
+      "16321:25:0",
       "978:25:1"
     ],
     [
-      "16325:8:0",
+      "16331:8:0",
       "988:8:1"
     ],
     [
-      "16325:8:0",
+      "16331:8:0",
       "988:8:1"
     ],
     [
-      "16325:6:0",
+      "16331:6:0",
       "988:6:1"
     ],
     [
-      "16325:1:0",
+      "16331:1:0",
       "988:1:1"
     ],
     [
-      "17019:114:0",
+      "17025:115:0",
       "1067:73:1"
     ],
     [
-      "17046:24:0",
+      "17052:24:0",
       "1080:24:1"
     ],
     [
-      "17047:6:0",
+      "17053:6:0",
       "1081:6:1"
     ],
     [
-      "17047:4:0",
+      "17053:4:0",
       "1081:4:1"
     ],
     [
-      "17055:6:0",
+      "17061:6:0",
       "1089:6:1"
     ],
     [
-      "17055:4:0",
+      "17061:4:0",
       "1089:4:1"
     ],
     [
-      "17063:6:0",
+      "17069:6:0",
       "1097:6:1"
     ],
     [
-      "17063:4:0",
+      "17069:4:0",
       "1097:4:1"
     ],
     [
-      "17079:54:0",
+      "17086:54:0",
       "1112:28:1"
     ],
     [
-      "17089:37:0",
+      "17096:37:0",
       "1122:11:1"
     ],
     [
-      "17089:37:0",
+      "17096:37:0",
       "1122:11:1"
     ],
     [
-      "17115:4:0",
+      "17122:4:0",
       "1122:4:1"
     ],
     [
-      "17115:1:0",
+      "17122:1:0",
       "1122:1:1"
     ],
     [
-      "17117:1:0",
+      "17124:1:0",
       "1124:1:1"
     ],
     [
-      "17121:1:0",
+      "17128:1:0",
       "1127:1:1"
     ],
     [
-      "17124:1:0",
+      "17131:1:0",
       "1132:1:1"
     ],
     [
-      "17826:142:0",
+      "17833:143:0",
       "1210:83:1"
     ],
     [
-      "17853:34:0",
+      "17860:34:0",
       "1223:34:1"
     ],
     [
-      "17854:15:0",
+      "17861:15:0",
       "1224:15:1"
     ],
     [
-      "17854:6:0",
+      "17861:6:0",
       "1224:6:1"
     ],
     [
-      "17871:7:0",
+      "17878:7:0",
       "1241:7:1"
     ],
     [
-      "17871:5:0",
+      "17878:5:0",
       "1241:5:1"
     ],
     [
-      "17880:6:0",
+      "17887:6:0",
       "1250:6:1"
     ],
     [
-      "17880:4:0",
+      "17887:4:0",
       "1250:4:1"
     ],
     [
-      "17896:72:0",
+      "17904:72:0",
       "1265:28:1"
     ],
     [
-      "17906:55:0",
+      "17914:55:0",
       "1275:11:1"
     ],
     [
-      "17906:55:0",
+      "17914:55:0",
       "1275:11:1"
     ],
     [
-      "17906:51:0",
+      "17914:51:0",
       "1275:7:1"
     ],
     [
-      "17906:48:0",
+      "17914:48:0",
       "1275:4:1"
     ],
     [
-      "17949:1:0",
+      "17957:1:0",
       "1275:1:1"
     ],
     [
-      "17952:1:0",
+      "17960:1:0",
       "1277:1:1"
     ],
     [
-      "17955:1:0",
+      "17963:1:0",
       "1280:1:1"
     ],
     [
-      "17960:1:0",
+      "17968:1:0",
       "1285:1:1"
     ],
     [
-      "18652:119:0",
+      "18660:120:0",
       "1358:83:1"
     ],
     [
-      "18679:34:0",
+      "18687:34:0",
       "1371:34:1"
     ],
     [
-      "18680:15:0",
+      "18688:15:0",
       "1372:15:1"
     ],
     [
-      "18680:6:0",
+      "18688:6:0",
       "1372:6:1"
     ],
     [
-      "18697:7:0",
+      "18705:7:0",
       "1389:7:1"
     ],
     [
-      "18697:5:0",
+      "18705:5:0",
       "1389:5:1"
     ],
     [
-      "18706:6:0",
+      "18714:6:0",
       "1398:6:1"
     ],
     [
-      "18706:4:0",
+      "18714:4:0",
       "1398:4:1"
     ],
     [
-      "18722:49:0",
+      "18731:49:0",
       "1413:28:1"
     ],
     [
-      "18732:32:0",
+      "18741:32:0",
       "1423:11:1"
     ],
     [
-      "18732:32:0",
+      "18741:32:0",
       "1423:11:1"
     ],
     [
-      "18753:4:0",
+      "18762:4:0",
       "1423:4:1"
     ],
     [
-      "18753:1:0",
+      "18762:1:0",
       "1423:1:1"
     ],
     [
-      "18755:1:0",
+      "18764:1:0",
       "1425:1:1"
     ],
     [
-      "18759:1:0",
+      "18768:1:0",
       "1428:1:1"
     ],
     [
-      "18762:1:0",
+      "18771:1:0",
       "1433:1:1"
     ],
     [
-      "18777:53:0",
+      "18786:53:0",
       "1447:53:1"
     ],
     [
-      "18791:2:0",
+      "18800:2:0",
       "1461:2:1"
     ],
     [
-      "18801:29:0",
+      "18810:29:0",
       "1471:29:1"
     ],
     [
-      "18811:12:0",
+      "18820:12:0",
       "1481:12:1"
     ],
     [
-      "18811:12:0",
+      "18820:12:0",
       "1481:12:1"
     ],
     [
-      "18811:10:0",
+      "18820:10:0",
       "1481:10:1"
     ],
     [
-      "18811:5:0",
+      "18820:5:0",
       "1481:5:1"
     ],
     [
-      "18811:1:0",
+      "18820:1:0",
       "1481:1:1"
     ],
     [
-      "19555:132:0",
+      "19564:133:0",
       "1589:92:1"
     ],
     [
-      "19582:35:0",
+      "19591:35:0",
       "1602:35:1"
     ],
     [
-      "19583:8:0",
+      "19592:8:0",
       "1603:8:1"
     ],
     [
-      "19583:4:0",
+      "19592:4:0",
       "1603:4:1"
     ],
     [
-      "19593:15:0",
+      "19602:15:0",
       "1613:15:1"
     ],
     [
-      "19593:6:0",
+      "19602:6:0",
       "1613:6:1"
     ],
     [
-      "19610:6:0",
+      "19619:6:0",
       "1630:6:1"
     ],
     [
-      "19610:4:0",
+      "19619:4:0",
       "1630:4:1"
     ],
     [
-      "19626:61:0",
+      "19636:61:0",
       "1645:36:1"
     ],
     [
-      "19636:44:0",
+      "19646:44:0",
       "1655:19:1"
     ],
     [
-      "19636:44:0",
+      "19646:44:0",
       "1655:19:1"
     ],
     [
-      "19661:12:0",
+      "19671:12:0",
       "1655:12:1"
     ],
     [
-      "19661:10:0",
+      "19671:10:0",
       "1655:10:1"
     ],
     [
-      "19661:5:0",
+      "19671:5:0",
       "1655:5:1"
     ],
     [
-      "19661:1:0",
+      "19671:1:0",
       "1655:1:1"
     ],
     [
-      "19667:3:0",
+      "19677:3:0",
       "1661:3:1"
     ],
     [
-      "19675:1:0",
+      "19685:1:0",
       "1668:1:1"
     ],
     [
-      "19678:1:0",
+      "19688:1:0",
       "1673:1:1"
     ],
     [
-      "20651:133:0",
+      "20661:134:0",
       "1790:93:1"
     ],
     [
-      "20679:35:0",
+      "20689:35:0",
       "1804:35:1"
     ],
     [
-      "20680:8:0",
+      "20690:8:0",
       "1805:8:1"
     ],
     [
-      "20680:4:0",
+      "20690:4:0",
       "1805:4:1"
     ],
     [
-      "20690:15:0",
+      "20700:15:0",
       "1815:15:1"
     ],
     [
-      "20690:6:0",
+      "20700:6:0",
       "1815:6:1"
     ],
     [
-      "20707:6:0",
+      "20717:6:0",
       "1832:6:1"
     ],
     [
-      "20707:4:0",
+      "20717:4:0",
       "1832:4:1"
     ],
     [
-      "20723:61:0",
+      "20734:61:0",
       "1847:36:1"
     ],
     [
-      "20733:44:0",
+      "20744:44:0",
       "1857:19:1"
     ],
     [
-      "20733:44:0",
+      "20744:44:0",
       "1857:19:1"
     ],
     [
-      "20758:12:0",
+      "20769:12:0",
       "1857:12:1"
     ],
     [
-      "20758:10:0",
+      "20769:10:0",
       "1857:10:1"
     ],
     [
-      "20758:5:0",
+      "20769:5:0",
       "1857:5:1"
     ],
     [
-      "20758:1:0",
+      "20769:1:0",
       "1857:1:1"
     ],
     [
-      "20764:3:0",
+      "20775:3:0",
       "1863:3:1"
     ],
     [
-      "20772:1:0",
+      "20783:1:0",
       "1870:1:1"
     ],
     [
-      "20775:1:0",
+      "20786:1:0",
       "1875:1:1"
     ],
     [
@@ -881,43 +881,43 @@
       "77:41:1"
     ],
     [
-      "12376:14:0",
+      "12377:14:0",
       "204:41:1"
     ],
     [
-      "13141:14:0",
+      "13143:14:0",
       "317:52:1"
     ],
     [
-      "14323:14:0",
+      "14326:14:0",
       "457:79:1"
     ],
     [
-      "15170:14:0",
+      "15174:14:0",
       "635:49:1"
     ],
     [
-      "15940:14:0",
+      "15945:14:0",
       "825:45:1"
     ],
     [
-      "16759:14:0",
+      "16765:14:0",
       "1014:48:1"
     ],
     [
-      "17569:14:0",
+      "17576:14:0",
       "1151:54:1"
     ],
     [
-      "18392:14:0",
+      "18400:14:0",
       "1304:49:1"
     ],
     [
-      "19292:15:0",
+      "19301:15:0",
       "1511:73:1"
     ],
     [
-      "20383:15:0",
+      "20393:15:0",
       "1692:93:1"
     ]
   ],
@@ -927,31 +927,31 @@
     "1759:182:0",
     "1750:7:0",
     "1890:6:0",
-    "19636:24:0",
-    "20733:24:0",
+    "19646:24:0",
+    "20744:24:0",
     "2290:233:0",
     "2580:308:0",
     "2965:182:0",
     "2959:4:0",
     "3096:6:0",
-    "14667:20:0",
+    "14671:20:0",
     "3502:233:0",
     "3794:310:0",
     "4189:182:0",
     "4180:7:0",
     "4320:6:0",
-    "17089:25:0",
-    "18732:20:0",
-    "11939:25:0",
+    "17096:25:0",
+    "18741:20:0",
+    "11940:25:0",
     "4447:76:0",
     "4434:11:0",
-    "12689:25:0",
+    "12691:25:0",
     "4880:233:0",
     "5178:317:0",
     "5582:182:0",
     "5575:5:0",
     "5713:6:0",
-    "13470:22:0",
+    "13473:22:0",
     "6135:233:0",
     "6433:317:0",
     "7282:233:0",
@@ -959,17 +959,17 @@
     "7988:90:0",
     "7969:17:0",
     "8027:6:0",
-    "15498:29:0",
+    "15503:29:0",
     "8458:233:0",
     "8756:317:0",
     "6851:61:0",
     "6823:26:0",
     "6861:6:0",
-    "14688:43:0",
+    "14692:43:0",
     "9178:61:0",
     "9146:30:0",
     "9188:6:0",
-    "17906:42:0",
+    "17914:42:0",
     "748:57:0",
     "5845:37:0",
     "5838:5:0",
@@ -983,37 +983,37 @@
     "9810:8:0",
     "9830:113:0",
     "10005:110:0",
-    "12056:23:0",
-    "12817:24:0",
-    "13605:27:0",
+    "12057:23:0",
+    "12819:24:0",
+    "13608:27:0",
     "7014:37:0",
     "6986:26:0",
     "3219:37:0",
     "3213:4:0",
-    "14838:24:0",
+    "14842:24:0",
     "8165:37:0",
     "8146:17:0",
-    "15684:27:0",
-    "16426:27:0",
-    "17229:27:0",
+    "15689:27:0",
+    "16432:27:0",
+    "17236:27:0",
     "9345:37:0",
     "9313:30:0",
-    "18064:27:0",
-    "18927:29:0",
+    "18072:27:0",
+    "18936:29:0",
     "2024:37:0",
     "2015:7:0",
-    "19786:30:0",
+    "19796:30:0",
     "11266:15:0",
-    "12031:15:0",
-    "12792:15:0",
-    "13580:15:0",
-    "14813:15:0",
-    "15659:15:0",
-    "16401:15:0",
-    "17204:15:0",
-    "18039:15:0",
-    "18902:15:0",
-    "19760:16:0"
+    "12032:15:0",
+    "12794:15:0",
+    "13583:15:0",
+    "14817:15:0",
+    "15664:15:0",
+    "16407:15:0",
+    "17211:15:0",
+    "18047:15:0",
+    "18911:15:0",
+    "19770:16:0"
   ],
   "propertyMap": [
     {
@@ -1075,21 +1075,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "12113:18:0",
-        "12145:214:0",
-        "12250:53:0",
-        "12321:23:0",
-        "12410:70:0",
-        "12498:67:0",
-        "12372:239:0"
+        "12114:18:0",
+        "12146:214:0",
+        "12251:53:0",
+        "12322:23:0",
+        "12411:70:0",
+        "12499:67:0",
+        "12373:239:0"
       ],
       "checkRanges": [
-        "12376:14:0"
+        "12377:14:0"
       ],
       "assertionRanges": [
-        "12410:70:0",
-        "12498:67:0",
-        "12583:13:0"
+        "12411:70:0",
+        "12499:67:0",
+        "12584:13:0"
       ]
     },
     {
@@ -1113,21 +1113,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "12875:18:0",
-        "12907:217:0",
-        "13014:54:0",
-        "13086:23:0",
-        "13175:70:0",
-        "13263:67:0",
-        "13137:239:0"
+        "12877:18:0",
+        "12909:217:0",
+        "13016:54:0",
+        "13088:23:0",
+        "13177:70:0",
+        "13265:67:0",
+        "13139:239:0"
       ],
       "checkRanges": [
-        "13141:14:0"
+        "13143:14:0"
       ],
       "assertionRanges": [
-        "13175:70:0",
-        "13263:67:0",
-        "13348:13:0"
+        "13177:70:0",
+        "13265:67:0",
+        "13350:13:0"
       ]
     },
     {
@@ -1159,25 +1159,25 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "13666:18:0",
-        "13698:608:0",
-        "13803:18:0",
-        "13839:369:0",
-        "14048:96:0",
-        "14166:23:0",
-        "14225:25:0",
-        "14268:23:0",
-        "14357:77:0",
-        "14452:67:0",
-        "14319:246:0"
+        "13669:18:0",
+        "13701:608:0",
+        "13806:18:0",
+        "13842:369:0",
+        "14051:96:0",
+        "14169:23:0",
+        "14228:25:0",
+        "14271:23:0",
+        "14360:77:0",
+        "14455:67:0",
+        "14322:246:0"
       ],
       "checkRanges": [
-        "14323:14:0"
+        "14326:14:0"
       ],
       "assertionRanges": [
-        "14357:77:0",
-        "14452:67:0",
-        "14537:13:0"
+        "14360:77:0",
+        "14455:67:0",
+        "14540:13:0"
       ]
     },
     {
@@ -1201,21 +1201,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "14896:18:0",
-        "14928:225:0",
-        "15033:64:0",
-        "15115:23:0",
-        "15204:70:0",
-        "15292:67:0",
-        "15166:239:0"
+        "14900:18:0",
+        "14932:225:0",
+        "15037:64:0",
+        "15119:23:0",
+        "15208:70:0",
+        "15296:67:0",
+        "15170:239:0"
       ],
       "checkRanges": [
-        "15170:14:0"
+        "15174:14:0"
       ],
       "assertionRanges": [
-        "15204:70:0",
-        "15292:67:0",
-        "15377:13:0"
+        "15208:70:0",
+        "15296:67:0",
+        "15381:13:0"
       ]
     },
     {
@@ -1239,21 +1239,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "15745:18:0",
-        "15777:146:0",
-        "15838:29:0",
-        "15885:23:0",
-        "15974:70:0",
-        "16062:67:0",
-        "15936:239:0"
+        "15750:18:0",
+        "15782:146:0",
+        "15843:29:0",
+        "15890:23:0",
+        "15979:70:0",
+        "16067:67:0",
+        "15941:239:0"
       ],
       "checkRanges": [
-        "15940:14:0"
+        "15945:14:0"
       ],
       "assertionRanges": [
-        "15974:70:0",
-        "16062:67:0",
-        "16147:13:0"
+        "15979:70:0",
+        "16067:67:0",
+        "16152:13:0"
       ]
     },
     {
@@ -1285,21 +1285,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "16487:18:0",
-        "16519:223:0",
-        "16630:56:0",
-        "16704:23:0",
-        "16793:73:0",
-        "16884:67:0",
-        "16755:242:0"
+        "16493:18:0",
+        "16525:223:0",
+        "16636:56:0",
+        "16710:23:0",
+        "16799:73:0",
+        "16890:67:0",
+        "16761:242:0"
       ],
       "checkRanges": [
-        "16759:14:0"
+        "16765:14:0"
       ],
       "assertionRanges": [
-        "16793:73:0",
-        "16884:67:0",
-        "16969:13:0"
+        "16799:73:0",
+        "16890:67:0",
+        "16975:13:0"
       ]
     },
     {
@@ -1323,21 +1323,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "17290:18:0",
-        "17322:230:0",
-        "17427:69:0",
-        "17514:23:0",
-        "17603:70:0",
-        "17691:67:0",
-        "17565:239:0"
+        "17297:18:0",
+        "17329:230:0",
+        "17434:69:0",
+        "17521:23:0",
+        "17610:70:0",
+        "17698:67:0",
+        "17572:239:0"
       ],
       "checkRanges": [
-        "17569:14:0"
+        "17576:14:0"
       ],
       "assertionRanges": [
-        "17603:70:0",
-        "17691:67:0",
-        "17776:13:0"
+        "17610:70:0",
+        "17698:67:0",
+        "17783:13:0"
       ]
     },
     {
@@ -1369,21 +1369,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "18125:18:0",
-        "18157:218:0",
-        "18268:51:0",
-        "18337:23:0",
-        "18426:73:0",
-        "18517:67:0",
-        "18388:242:0"
+        "18133:18:0",
+        "18165:218:0",
+        "18276:51:0",
+        "18345:23:0",
+        "18434:73:0",
+        "18525:67:0",
+        "18396:242:0"
       ],
       "checkRanges": [
-        "18392:14:0"
+        "18400:14:0"
       ],
       "assertionRanges": [
-        "18426:73:0",
-        "18517:67:0",
-        "18602:13:0"
+        "18434:73:0",
+        "18525:67:0",
+        "18610:13:0"
       ]
     },
     {
@@ -1415,21 +1415,21 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "18990:19:0",
-        "19023:252:0",
-        "19154:64:0",
-        "19236:24:0",
-        "19327:75:0",
-        "19420:67:0",
-        "19288:245:0"
+        "18999:19:0",
+        "19032:252:0",
+        "19163:64:0",
+        "19245:24:0",
+        "19336:75:0",
+        "19429:67:0",
+        "19297:245:0"
       ],
       "checkRanges": [
-        "19292:15:0"
+        "19301:15:0"
       ],
       "assertionRanges": [
-        "19327:75:0",
-        "19420:67:0",
-        "19505:13:0"
+        "19336:75:0",
+        "19429:67:0",
+        "19514:13:0"
       ]
     },
     {
@@ -1461,25 +1461,25 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "19850:19:0",
-        "19883:483:0",
-        "19951:19:0",
-        "19988:277:0",
-        "20133:67:0",
-        "20222:24:0",
-        "20282:27:0",
-        "20327:24:0",
-        "20418:79:0",
-        "20515:68:0",
-        "20379:250:0"
+        "19860:19:0",
+        "19893:483:0",
+        "19961:19:0",
+        "19998:277:0",
+        "20143:67:0",
+        "20232:24:0",
+        "20292:27:0",
+        "20337:24:0",
+        "20428:79:0",
+        "20525:68:0",
+        "20389:250:0"
       ],
       "checkRanges": [
-        "20383:15:0"
+        "20393:15:0"
       ],
       "assertionRanges": [
-        "20418:79:0",
-        "20515:68:0",
-        "20601:13:0"
+        "20428:79:0",
+        "20525:68:0",
+        "20611:13:0"
       ]
     }
   ],
@@ -1490,5 +1490,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/import_rewrites/instrumentationMetadata.json.expected b/test/multifile_samples/import_rewrites/instrumentationMetadata.json.expected
index aa817460..1bdc00a5 100644
--- a/test/multifile_samples/import_rewrites/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/import_rewrites/instrumentationMetadata.json.expected
@@ -120,5 +120,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/inheritance1/flat.sol.expected b/test/multifile_samples/inheritance1/flat.sol.expected
index a5f7a401..f95e245a 100644
--- a/test/multifile_samples/inheritance1/flat.sol.expected
+++ b/test/multifile_samples/inheritance1/flat.sol.expected
@@ -20,7 +20,7 @@ contract A {
         __ScribbleUtilsLib__15.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_A_foo(uint x) private returns (uint) {
+    function _original_A_foo(uint x) internal returns (uint) {
         return x + 1;
     }
 
@@ -171,25 +171,25 @@ contract C is B, A {
         __ScribbleUtilsLib__40.setInContract(true);
         RET_0 = _original_C_foo(x);
         if (!(RET_0 >= x)) {
-            emit __ScribbleUtilsLib__40.AssertionFailed("005341:0066:000 0: ");
+            emit __ScribbleUtilsLib__40.AssertionFailed("005342:0066:000 0: ");
             assert(false);
         }
         if (!(RET_0 >= (x + 2))) {
-            emit __ScribbleUtilsLib__40.AssertionFailed("005493:0066:000 2: ");
+            emit __ScribbleUtilsLib__40.AssertionFailed("005494:0066:000 2: ");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__40.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_C_foo(uint x) private returns (uint) {
+    function _original_C_foo(uint x) internal returns (uint) {
         return x + 2;
     }
 
     /// Check only the current contract's state invariants
     function __scribble_C_check_state_invariants_internal() internal {
         if (!(true)) {
-            emit __ScribbleUtilsLib__40.AssertionFailed("006023:0068:000 1: P1");
+            emit __ScribbleUtilsLib__40.AssertionFailed("006025:0068:000 1: P1");
             assert(false);
         }
     }
diff --git a/test/multifile_samples/inheritance1/instrumentationMetadata.json.expected b/test/multifile_samples/inheritance1/instrumentationMetadata.json.expected
index 6f5fb115..943d5e17 100644
--- a/test/multifile_samples/inheritance1/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/inheritance1/instrumentationMetadata.json.expected
@@ -1,11 +1,11 @@
 {
   "instrToOriginalMap": [
     [
-      "147:1349:0",
+      "147:1350:0",
       "0:133:0"
     ],
     [
-      "885:85:0",
+      "885:86:0",
       "53:78:0"
     ],
     [
@@ -21,127 +21,127 @@
       "66:4:0"
     ],
     [
-      "934:6:0",
+      "935:6:0",
       "97:6:0"
     ],
     [
-      "935:4:0",
+      "936:4:0",
       "98:4:0"
     ],
     [
-      "935:4:0",
+      "936:4:0",
       "98:4:0"
     ],
     [
-      "941:29:0",
+      "942:29:0",
       "104:27:0"
     ],
     [
-      "951:12:0",
+      "952:12:0",
       "114:10:0"
     ],
     [
-      "958:5:0",
+      "959:5:0",
       "121:3:0"
     ],
     [
-      "958:1:0",
+      "959:1:0",
       "121:1:0"
     ],
     [
-      "962:1:0",
+      "963:1:0",
       "123:1:0"
     ],
     [
-      "2236:537:0",
+      "2237:537:0",
       "0:15:1"
     ],
     [
-      "5022:1871:0",
+      "5023:1872:0",
       "69:152:2"
     ],
     [
-      "5036:1:0",
+      "5037:1:0",
       "83:1:2"
     ],
     [
-      "5036:1:0",
+      "5037:1:0",
       "83:1:2"
     ],
     [
-      "5039:1:0",
+      "5040:1:0",
       "86:1:2"
     ],
     [
-      "5039:1:0",
+      "5040:1:0",
       "86:1:2"
     ],
     [
-      "6008:85:0",
+      "6009:86:0",
       "132:87:2"
     ],
     [
-      "6032:8:0",
+      "6033:8:0",
       "144:8:2"
     ],
     [
-      "6033:6:0",
+      "6034:6:0",
       "145:6:2"
     ],
     [
-      "6033:4:0",
+      "6034:4:0",
       "145:4:2"
     ],
     [
-      "6057:6:0",
+      "6059:6:0",
       "185:6:2"
     ],
     [
-      "6058:4:0",
+      "6060:4:0",
       "186:4:2"
     ],
     [
-      "6058:4:0",
+      "6060:4:0",
       "186:4:2"
     ],
     [
-      "6064:29:0",
+      "6066:29:0",
       "192:27:2"
     ],
     [
-      "6074:12:0",
+      "6076:12:0",
       "202:10:2"
     ],
     [
-      "6081:5:0",
+      "6083:5:0",
       "209:3:2"
     ],
     [
-      "6081:1:0",
+      "6083:1:0",
       "209:1:2"
     ],
     [
-      "6085:1:0",
+      "6087:1:0",
       "211:1:2"
     ],
     [
-      "6895:672:0",
+      "6897:672:0",
       "36:23:3"
     ],
     [
-      "6909:1:0",
+      "6911:1:0",
       "50:1:3"
     ],
     [
-      "6909:1:0",
+      "6911:1:0",
       "50:1:3"
     ],
     [
-      "6912:1:0",
+      "6914:1:0",
       "53:1:3"
     ],
     [
-      "6912:1:0",
+      "6914:1:0",
       "53:1:3"
     ],
     [
@@ -149,73 +149,73 @@
       "23:25:0"
     ],
     [
-      "5391:13:0",
+      "5392:13:0",
       "23:25:0"
     ],
     [
-      "6237:7:0",
+      "6239:7:0",
       "41:27:2"
     ],
     [
-      "5616:19:0",
+      "5617:19:0",
       "100:27:2"
     ]
   ],
   "otherInstrumentation": [
-    "1257:46:0",
-    "1714:22:0",
-    "1833:33:0",
-    "1921:8:0",
-    "1941:113:0",
-    "2116:110:0",
-    "1347:42:0",
-    "1399:35:0",
-    "1444:43:0",
+    "1258:46:0",
+    "1715:22:0",
+    "1834:33:0",
+    "1922:8:0",
+    "1942:113:0",
+    "2117:110:0",
+    "1348:42:0",
+    "1400:35:0",
+    "1445:43:0",
     "278:10:0",
     "459:26:0",
     "325:72:0",
     "407:42:0",
     "720:72:0",
     "802:70:0",
-    "2534:46:0",
-    "2991:22:0",
-    "3110:33:0",
-    "3198:8:0",
-    "3218:113:0",
-    "3393:110:0",
-    "2624:42:0",
-    "2676:35:0",
-    "2721:43:0",
-    "3729:22:0",
-    "3848:33:0",
-    "3936:8:0",
-    "3956:113:0",
-    "4131:110:0",
-    "6542:46:0",
-    "6598:46:0",
-    "6654:46:0",
-    "6744:42:0",
-    "6796:35:0",
-    "6841:43:0",
-    "5170:10:0",
-    "5351:26:0",
-    "5217:72:0",
-    "5299:42:0",
-    "5843:72:0",
-    "5925:70:0",
-    "7216:46:0",
-    "7272:46:0",
-    "7328:46:0",
-    "4467:22:0",
-    "4586:33:0",
-    "4674:8:0",
-    "4694:113:0",
-    "4869:110:0",
-    "7418:42:0",
-    "7470:35:0",
-    "7515:43:0",
+    "2535:46:0",
+    "2992:22:0",
+    "3111:33:0",
+    "3199:8:0",
+    "3219:113:0",
+    "3394:110:0",
+    "2625:42:0",
+    "2677:35:0",
+    "2722:43:0",
+    "3730:22:0",
+    "3849:33:0",
+    "3937:8:0",
+    "3957:113:0",
+    "4132:110:0",
+    "6544:46:0",
+    "6600:46:0",
+    "6656:46:0",
+    "6746:42:0",
+    "6798:35:0",
+    "6843:43:0",
+    "5171:10:0",
+    "5352:26:0",
+    "5218:72:0",
+    "5300:42:0",
+    "5844:72:0",
+    "5926:70:0",
+    "7218:46:0",
+    "7274:46:0",
+    "7330:46:0",
+    "4468:22:0",
+    "4587:33:0",
+    "4675:8:0",
+    "4695:113:0",
+    "4870:110:0",
+    "7420:42:0",
+    "7472:35:0",
+    "7517:43:0",
     "300:15:0",
-    "5192:15:0"
+    "5193:15:0"
   ],
   "propertyMap": [
     {
@@ -242,21 +242,21 @@
         "528:65:0",
         "607:66:0",
         "495:216:0",
-        "5420:65:0",
-        "5499:66:0",
-        "5387:216:0"
+        "5421:65:0",
+        "5500:66:0",
+        "5388:216:0"
       ],
       "checkRanges": [
         "499:13:0",
-        "5391:13:0"
+        "5392:13:0"
       ],
       "assertionRanges": [
         "528:65:0",
         "607:66:0",
         "687:13:0",
-        "5420:65:0",
-        "5499:66:0",
-        "5579:13:0"
+        "5421:65:0",
+        "5500:66:0",
+        "5580:13:0"
       ]
     },
     {
@@ -272,15 +272,15 @@
       "debugEventEncoding": [],
       "message": "P1",
       "instrumentationRanges": [
-        "6260:68:0",
-        "6233:133:0"
+        "6262:68:0",
+        "6235:133:0"
       ],
       "checkRanges": [
-        "6237:7:0"
+        "6239:7:0"
       ],
       "assertionRanges": [
-        "6260:68:0",
-        "6342:13:0"
+        "6262:68:0",
+        "6344:13:0"
       ]
     },
     {
@@ -304,17 +304,17 @@
       ],
       "message": "",
       "instrumentationRanges": [
-        "5651:65:0",
-        "5730:66:0",
-        "5612:222:0"
+        "5652:65:0",
+        "5731:66:0",
+        "5613:222:0"
       ],
       "checkRanges": [
-        "5616:19:0"
+        "5617:19:0"
       ],
       "assertionRanges": [
-        "5651:65:0",
-        "5730:66:0",
-        "5810:13:0"
+        "5652:65:0",
+        "5731:66:0",
+        "5811:13:0"
       ]
     }
   ],
@@ -327,5 +327,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/macros/child.sol.instrumented.expected b/test/multifile_samples/macros/child.sol.instrumented.expected
index 5af3961a..8417cd9d 100644
--- a/test/multifile_samples/macros/child.sol.instrumented.expected
+++ b/test/multifile_samples/macros/child.sol.instrumented.expected
@@ -14,7 +14,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_foo(uint z, uint w) private {}
+    function _original_Foo_foo(uint z, uint w) internal {}
 }
 
 library __ScribbleUtilsLib__69 {
diff --git a/test/multifile_samples/macros/flat.sol.expected b/test/multifile_samples/macros/flat.sol.expected
index a749846c..50e10db4 100644
--- a/test/multifile_samples/macros/flat.sol.expected
+++ b/test/multifile_samples/macros/flat.sol.expected
@@ -81,7 +81,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_foo(uint z, uint w) private {}
+    function _original_Foo_foo(uint z, uint w) internal {}
 }
 
 library __ScribbleUtilsLib__69 {
diff --git a/test/multifile_samples/macros/instrumentationMetadata.json.expected b/test/multifile_samples/macros/instrumentationMetadata.json.expected
index cd266281..214a2479 100644
--- a/test/multifile_samples/macros/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/macros/instrumentationMetadata.json.expected
@@ -193,11 +193,11 @@
       "583:2:0"
     ],
     [
-      "2106:440:0",
+      "2106:441:0",
       "43:57:1"
     ],
     [
-      "2491:53:0",
+      "2491:54:0",
       "60:38:1"
     ],
     [
@@ -221,19 +221,19 @@
       "81:4:1"
     ],
     [
-      "2542:2:0",
+      "2543:2:0",
       "96:2:1"
     ],
     [
-      "3286:27:0",
+      "3287:27:0",
       "597:27:0"
     ],
     [
-      "3303:7:0",
+      "3304:7:0",
       "614:7:0"
     ],
     [
-      "3303:7:0",
+      "3304:7:0",
       "614:7:0"
     ],
     [
@@ -253,11 +253,11 @@
   ],
   "otherInstrumentation": [
     "2171:23:0",
-    "2764:22:0",
-    "2883:33:0",
-    "2971:8:0",
-    "2991:113:0",
-    "3166:110:0",
+    "2765:22:0",
+    "2884:33:0",
+    "2972:8:0",
+    "2992:113:0",
+    "3167:110:0",
     "852:491:0",
     "977:12:0",
     "838:12:0",
@@ -370,5 +370,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
-}
\ No newline at end of file
+  "scribbleVersion": "0.7.0"
+}
diff --git a/test/multifile_samples/node_modules_erc20/flat.sol.expected b/test/multifile_samples/node_modules_erc20/flat.sol.expected
index c08040e5..829a6d71 100644
--- a/test/multifile_samples/node_modules_erc20/flat.sol.expected
+++ b/test/multifile_samples/node_modules_erc20/flat.sol.expected
@@ -259,7 +259,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transfer(address to, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _transfer(owner, to, amount);
         return true;
@@ -279,7 +279,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address spender, uint256 amount) private returns (bool) {
+    function _original_ERC20_approve(address spender, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, amount);
         return true;
@@ -294,7 +294,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address from, address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address from, address to, uint256 amount) internal returns (bool) {
         address spender = _msgSender();
         _spendAllowance(from, spender, amount);
         _transfer(from, to, amount);
@@ -310,7 +310,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) private returns (bool) {
+    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, _allowances[owner][spender] + addedValue);
         return true;
@@ -325,7 +325,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) private returns (bool) {
+    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) internal returns (bool) {
         address owner = _msgSender();
         uint256 currentAllowance = _allowances[owner][spender];
         require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero");
@@ -456,7 +456,7 @@ abstract contract Foo is ERC20 {
     function __scribble_Foo_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__6.AssertionFailed("019779:0065:000 0: ");
+                emit __ScribbleUtilsLib__6.AssertionFailed("019784:0065:000 0: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/node_modules_erc20/instrumentationMetadata.json.expected b/test/multifile_samples/node_modules_erc20/instrumentationMetadata.json.expected
index 19934225..d79c2a99 100644
--- a/test/multifile_samples/node_modules_erc20/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/node_modules_erc20/instrumentationMetadata.json.expected
@@ -345,7 +345,7 @@
       "826:3:2"
     ],
     [
-      "7282:12246:0",
+      "7282:12251:0",
       "3975:11180:1"
     ],
     [
@@ -673,7 +673,7 @@
       "6047:7:1"
     ],
     [
-      "10265:189:0",
+      "10265:190:0",
       "6258:189:1"
     ],
     [
@@ -697,1855 +697,1855 @@
       "6288:7:1"
     ],
     [
-      "10343:6:0",
+      "10344:6:0",
       "6336:6:1"
     ],
     [
-      "10344:4:0",
+      "10345:4:0",
       "6337:4:1"
     ],
     [
-      "10344:4:0",
+      "10345:4:0",
       "6337:4:1"
     ],
     [
-      "10350:104:0",
+      "10351:104:0",
       "6343:104:1"
     ],
     [
-      "10360:28:0",
+      "10361:28:0",
       "6353:28:1"
     ],
     [
-      "10360:13:0",
+      "10361:13:0",
       "6353:13:1"
     ],
     [
-      "10360:7:0",
+      "10361:7:0",
       "6353:7:1"
     ],
     [
-      "10376:12:0",
+      "10377:12:0",
       "6369:12:1"
     ],
     [
-      "10376:10:0",
+      "10377:10:0",
       "6369:10:1"
     ],
     [
-      "10398:28:0",
+      "10399:28:0",
       "6391:28:1"
     ],
     [
-      "10398:28:0",
+      "10399:28:0",
       "6391:28:1"
     ],
     [
-      "10398:9:0",
+      "10399:9:0",
       "6391:9:1"
     ],
     [
-      "10408:5:0",
+      "10409:5:0",
       "6401:5:1"
     ],
     [
-      "10415:2:0",
+      "10416:2:0",
       "6408:2:1"
     ],
     [
-      "10419:6:0",
+      "10420:6:0",
       "6412:6:1"
     ],
     [
-      "10436:11:0",
+      "10437:11:0",
       "6429:11:1"
     ],
     [
-      "10443:4:0",
+      "10444:4:0",
       "6436:4:1"
     ],
     [
-      "10498:149:0",
+      "10499:149:0",
       "6505:149:1"
     ],
     [
-      "10516:32:0",
+      "10517:32:0",
       "6523:32:1"
     ],
     [
-      "10517:13:0",
+      "10518:13:0",
       "6524:13:1"
     ],
     [
-      "10517:7:0",
+      "10518:7:0",
       "6524:7:1"
     ],
     [
-      "10532:15:0",
+      "10533:15:0",
       "6539:15:1"
     ],
     [
-      "10532:7:0",
+      "10533:7:0",
       "6539:7:1"
     ],
     [
-      "10557:8:0",
+      "10558:8:0",
       "6576:8:1"
     ],
     [
-      "10586:9:0",
+      "10587:9:0",
       "6593:9:1"
     ],
     [
-      "10587:7:0",
+      "10588:7:0",
       "6594:7:1"
     ],
     [
-      "10587:7:0",
+      "10588:7:0",
       "6594:7:1"
     ],
     [
-      "10596:51:0",
+      "10597:51:0",
       "6603:51:1"
     ],
     [
-      "10606:34:0",
+      "10607:34:0",
       "6613:34:1"
     ],
     [
-      "10613:27:0",
+      "10614:27:0",
       "6620:27:1"
     ],
     [
-      "10613:18:0",
+      "10614:18:0",
       "6620:18:1"
     ],
     [
-      "10613:11:0",
+      "10614:11:0",
       "6620:11:1"
     ],
     [
-      "10625:5:0",
+      "10626:5:0",
       "6632:5:1"
     ],
     [
-      "10632:7:0",
+      "10633:7:0",
       "6639:7:1"
     ],
     [
-      "11143:197:0",
+      "11144:198:0",
       "6962:197:1"
     ],
     [
-      "11175:33:0",
+      "11176:33:0",
       "6978:33:1"
     ],
     [
-      "11176:15:0",
+      "11177:15:0",
       "6979:15:1"
     ],
     [
-      "11176:7:0",
+      "11177:7:0",
       "6979:7:1"
     ],
     [
-      "11193:14:0",
+      "11194:14:0",
       "6996:14:1"
     ],
     [
-      "11193:7:0",
+      "11194:7:0",
       "6996:7:1"
     ],
     [
-      "11225:6:0",
+      "11227:6:0",
       "7044:6:1"
     ],
     [
-      "11226:4:0",
+      "11228:4:0",
       "7045:4:1"
     ],
     [
-      "11226:4:0",
+      "11228:4:0",
       "7045:4:1"
     ],
     [
-      "11232:108:0",
+      "11234:108:0",
       "7051:108:1"
     ],
     [
-      "11242:28:0",
+      "11244:28:0",
       "7061:28:1"
     ],
     [
-      "11242:13:0",
+      "11244:13:0",
       "7061:13:1"
     ],
     [
-      "11242:7:0",
+      "11244:7:0",
       "7061:7:1"
     ],
     [
-      "11258:12:0",
+      "11260:12:0",
       "7077:12:1"
     ],
     [
-      "11258:10:0",
+      "11260:10:0",
       "7077:10:1"
     ],
     [
-      "11280:32:0",
+      "11282:32:0",
       "7099:32:1"
     ],
     [
-      "11280:32:0",
+      "11282:32:0",
       "7099:32:1"
     ],
     [
-      "11280:8:0",
+      "11282:8:0",
       "7099:8:1"
     ],
     [
-      "11289:5:0",
+      "11291:5:0",
       "7108:5:1"
     ],
     [
-      "11296:7:0",
+      "11298:7:0",
       "7115:7:1"
     ],
     [
-      "11305:6:0",
+      "11307:6:0",
       "7124:6:1"
     ],
     [
-      "11322:11:0",
+      "11324:11:0",
       "7141:11:1"
     ],
     [
-      "11329:4:0",
+      "11331:4:0",
       "7148:4:1"
     ],
     [
-      "11856:256:0",
+      "11858:257:0",
       "7721:286:1"
     ],
     [
-      "11893:42:0",
+      "11895:42:0",
       "7742:72:1"
     ],
     [
-      "11894:12:0",
+      "11896:12:0",
       "7752:12:1"
     ],
     [
-      "11894:7:0",
+      "11896:7:0",
       "7752:7:1"
     ],
     [
-      "11908:10:0",
+      "11910:10:0",
       "7774:10:1"
     ],
     [
-      "11908:7:0",
+      "11910:7:0",
       "7774:7:1"
     ],
     [
-      "11920:14:0",
+      "11922:14:0",
       "7794:14:1"
     ],
     [
-      "11920:7:0",
+      "11922:7:0",
       "7794:7:1"
     ],
     [
-      "11952:6:0",
+      "11955:6:0",
       "7847:6:1"
     ],
     [
-      "11953:4:0",
+      "11956:4:0",
       "7848:4:1"
     ],
     [
-      "11953:4:0",
+      "11956:4:0",
       "7848:4:1"
     ],
     [
-      "11959:153:0",
+      "11962:153:0",
       "7854:153:1"
     ],
     [
-      "11969:30:0",
+      "11972:30:0",
       "7864:30:1"
     ],
     [
-      "11969:15:0",
+      "11972:15:0",
       "7864:15:1"
     ],
     [
-      "11969:7:0",
+      "11972:7:0",
       "7864:7:1"
     ],
     [
-      "11987:12:0",
+      "11990:12:0",
       "7882:12:1"
     ],
     [
-      "11987:10:0",
+      "11990:10:0",
       "7882:10:1"
     ],
     [
-      "12009:38:0",
+      "12012:38:0",
       "7904:38:1"
     ],
     [
-      "12009:38:0",
+      "12012:38:0",
       "7904:38:1"
     ],
     [
-      "12009:15:0",
+      "12012:15:0",
       "7904:15:1"
     ],
     [
-      "12025:4:0",
+      "12028:4:0",
       "7920:4:1"
     ],
     [
-      "12031:7:0",
+      "12034:7:0",
       "7926:7:1"
     ],
     [
-      "12040:6:0",
+      "12043:6:0",
       "7935:6:1"
     ],
     [
-      "12057:27:0",
+      "12060:27:0",
       "7952:27:1"
     ],
     [
-      "12057:27:0",
+      "12060:27:0",
       "7952:27:1"
     ],
     [
-      "12057:9:0",
+      "12060:9:0",
       "7952:9:1"
     ],
     [
-      "12067:4:0",
+      "12070:4:0",
       "7962:4:1"
     ],
     [
-      "12073:2:0",
+      "12076:2:0",
       "7968:2:1"
     ],
     [
-      "12077:6:0",
+      "12080:6:0",
       "7972:6:1"
     ],
     [
-      "12094:11:0",
+      "12097:11:0",
       "7989:11:1"
     ],
     [
-      "12101:4:0",
+      "12104:4:0",
       "7996:4:1"
     ],
     [
-      "12627:245:0",
+      "12630:246:0",
       "8402:236:1"
     ],
     [
-      "12669:37:0",
+      "12672:37:0",
       "8428:37:1"
     ],
     [
-      "12670:15:0",
+      "12673:15:0",
       "8429:15:1"
     ],
     [
-      "12670:7:0",
+      "12673:7:0",
       "8429:7:1"
     ],
     [
-      "12687:18:0",
+      "12690:18:0",
       "8446:18:1"
     ],
     [
-      "12687:7:0",
+      "12690:7:0",
       "8446:7:1"
     ],
     [
-      "12723:6:0",
+      "12727:6:0",
       "8489:6:1"
     ],
     [
-      "12724:4:0",
+      "12728:4:0",
       "8490:4:1"
     ],
     [
-      "12724:4:0",
+      "12728:4:0",
       "8490:4:1"
     ],
     [
-      "12730:142:0",
+      "12734:142:0",
       "8496:142:1"
     ],
     [
-      "12740:28:0",
+      "12744:28:0",
       "8506:28:1"
     ],
     [
-      "12740:13:0",
+      "12744:13:0",
       "8506:13:1"
     ],
     [
-      "12740:7:0",
+      "12744:7:0",
       "8506:7:1"
     ],
     [
-      "12756:12:0",
+      "12760:12:0",
       "8522:12:1"
     ],
     [
-      "12756:10:0",
+      "12760:10:0",
       "8522:10:1"
     ],
     [
-      "12778:66:0",
+      "12782:66:0",
       "8544:66:1"
     ],
     [
-      "12778:66:0",
+      "12782:66:0",
       "8544:66:1"
     ],
     [
-      "12778:8:0",
+      "12782:8:0",
       "8544:8:1"
     ],
     [
-      "12787:5:0",
+      "12791:5:0",
       "8553:5:1"
     ],
     [
-      "12794:7:0",
+      "12798:7:0",
       "8560:7:1"
     ],
     [
-      "12803:40:0",
+      "12807:40:0",
       "8569:40:1"
     ],
     [
-      "12803:27:0",
+      "12807:27:0",
       "8569:27:1"
     ],
     [
-      "12803:18:0",
+      "12807:18:0",
       "8569:18:1"
     ],
     [
-      "12803:11:0",
+      "12807:11:0",
       "8569:11:1"
     ],
     [
-      "12815:5:0",
+      "12819:5:0",
       "8581:5:1"
     ],
     [
-      "12822:7:0",
+      "12826:7:0",
       "8588:7:1"
     ],
     [
-      "12833:10:0",
+      "12837:10:0",
       "8599:10:1"
     ],
     [
-      "12854:11:0",
+      "12858:11:0",
       "8620:11:1"
     ],
     [
-      "12861:4:0",
+      "12865:4:0",
       "8627:4:1"
     ],
     [
-      "13397:437:0",
+      "13401:438:0",
       "9125:429:1"
     ],
     [
-      "13439:42:0",
+      "13443:42:0",
       "9151:42:1"
     ],
     [
-      "13440:15:0",
+      "13444:15:0",
       "9152:15:1"
     ],
     [
-      "13440:7:0",
+      "13444:7:0",
       "9152:7:1"
     ],
     [
-      "13457:23:0",
+      "13461:23:0",
       "9169:23:1"
     ],
     [
-      "13457:7:0",
+      "13461:7:0",
       "9169:7:1"
     ],
     [
-      "13498:6:0",
+      "13503:6:0",
       "9217:6:1"
     ],
     [
-      "13499:4:0",
+      "13504:4:0",
       "9218:4:1"
     ],
     [
-      "13499:4:0",
+      "13504:4:0",
       "9218:4:1"
     ],
     [
-      "13505:329:0",
+      "13510:329:0",
       "9224:330:1"
     ],
     [
-      "13515:28:0",
+      "13520:28:0",
       "9234:28:1"
     ],
     [
-      "13515:13:0",
+      "13520:13:0",
       "9234:13:1"
     ],
     [
-      "13515:7:0",
+      "13520:7:0",
       "9234:7:1"
     ],
     [
-      "13531:12:0",
+      "13536:12:0",
       "9250:12:1"
     ],
     [
-      "13531:10:0",
+      "13536:10:0",
       "9250:10:1"
     ],
     [
-      "13553:54:0",
+      "13558:54:0",
       "9272:54:1"
     ],
     [
-      "13553:24:0",
+      "13558:24:0",
       "9272:24:1"
     ],
     [
-      "13553:7:0",
+      "13558:7:0",
       "9272:7:1"
     ],
     [
-      "13580:27:0",
+      "13585:27:0",
       "9299:27:1"
     ],
     [
-      "13580:18:0",
+      "13585:18:0",
       "9299:18:1"
     ],
     [
-      "13580:11:0",
+      "13585:11:0",
       "9299:11:1"
     ],
     [
-      "13592:5:0",
+      "13597:5:0",
       "9311:5:1"
     ],
     [
-      "13599:7:0",
+      "13604:7:0",
       "9318:7:1"
     ],
     [
-      "13617:85:0",
+      "13622:85:0",
       "9336:85:1"
     ],
     [
-      "13617:85:0",
+      "13622:85:0",
       "9336:85:1"
     ],
     [
-      "13617:7:0",
+      "13622:7:0",
       "9336:7:1"
     ],
     [
-      "13625:35:0",
+      "13630:35:0",
       "9344:35:1"
     ],
     [
-      "13625:16:0",
+      "13630:16:0",
       "9344:16:1"
     ],
     [
-      "13645:15:0",
+      "13650:15:0",
       "9364:15:1"
     ],
     [
-      "13662:39:0",
+      "13667:39:0",
       "9381:39:1"
     ],
     [
-      "13712:95:0",
+      "13717:95:0",
       "9431:95:1"
     ],
     [
-      "13736:60:0",
+      "13741:60:0",
       "9455:60:1"
     ],
     [
-      "13736:60:0",
+      "13741:60:0",
       "9455:60:1"
     ],
     [
-      "13736:8:0",
+      "13741:8:0",
       "9455:8:1"
     ],
     [
-      "13745:5:0",
+      "13750:5:0",
       "9464:5:1"
     ],
     [
-      "13752:7:0",
+      "13757:7:0",
       "9471:7:1"
     ],
     [
-      "13761:34:0",
+      "13766:34:0",
       "9480:34:1"
     ],
     [
-      "13761:16:0",
+      "13766:16:0",
       "9480:16:1"
     ],
     [
-      "13780:15:0",
+      "13785:15:0",
       "9499:15:1"
     ],
     [
-      "13816:11:0",
+      "13821:11:0",
       "9536:11:1"
     ],
     [
-      "13823:4:0",
+      "13828:4:0",
       "9543:4:1"
     ],
     [
-      "14269:617:0",
+      "14274:617:0",
       "10017:651:1"
     ],
     [
-      "14287:42:0",
+      "14292:42:0",
       "10035:72:1"
     ],
     [
-      "14288:12:0",
+      "14293:12:0",
       "10045:12:1"
     ],
     [
-      "14288:7:0",
+      "14293:7:0",
       "10045:7:1"
     ],
     [
-      "14302:10:0",
+      "14307:10:0",
       "10067:10:1"
     ],
     [
-      "14302:7:0",
+      "14307:7:0",
       "10067:7:1"
     ],
     [
-      "14314:14:0",
+      "14319:14:0",
       "10087:14:1"
     ],
     [
-      "14314:7:0",
+      "14319:7:0",
       "10087:7:1"
     ],
     [
-      "14347:539:0",
+      "14352:539:0",
       "10125:543:1"
     ],
     [
-      "14357:68:0",
+      "14362:68:0",
       "10135:68:1"
     ],
     [
-      "14357:68:0",
+      "14362:68:0",
       "10135:68:1"
     ],
     [
-      "14357:7:0",
+      "14362:7:0",
       "10135:7:1"
     ],
     [
-      "14365:18:0",
+      "14370:18:0",
       "10143:18:1"
     ],
     [
-      "14365:4:0",
+      "14370:4:0",
       "10143:4:1"
     ],
     [
-      "14373:10:0",
+      "14378:10:0",
       "10151:10:1"
     ],
     [
-      "14373:7:0",
+      "14378:7:0",
       "10151:7:1"
     ],
     [
-      "14373:7:0",
+      "14378:7:0",
       "10151:7:1"
     ],
     [
-      "14381:1:0",
+      "14386:1:0",
       "10159:1:1"
     ],
     [
-      "14385:39:0",
+      "14390:39:0",
       "10163:39:1"
     ],
     [
-      "14435:64:0",
+      "14440:64:0",
       "10213:64:1"
     ],
     [
-      "14435:64:0",
+      "14440:64:0",
       "10213:64:1"
     ],
     [
-      "14435:7:0",
+      "14440:7:0",
       "10213:7:1"
     ],
     [
-      "14443:16:0",
+      "14448:16:0",
       "10221:16:1"
     ],
     [
-      "14443:2:0",
+      "14448:2:0",
       "10221:2:1"
     ],
     [
-      "14449:10:0",
+      "14454:10:0",
       "10227:10:1"
     ],
     [
-      "14449:7:0",
+      "14454:7:0",
       "10227:7:1"
     ],
     [
-      "14449:7:0",
+      "14454:7:0",
       "10227:7:1"
     ],
     [
-      "14457:1:0",
+      "14462:1:0",
       "10235:1:1"
     ],
     [
-      "14461:37:0",
+      "14466:37:0",
       "10239:37:1"
     ],
     [
-      "14509:38:0",
+      "14514:38:0",
       "10288:38:1"
     ],
     [
-      "14509:38:0",
+      "14514:38:0",
       "10288:38:1"
     ],
     [
-      "14509:20:0",
+      "14514:20:0",
       "10288:20:1"
     ],
     [
-      "14530:4:0",
+      "14535:4:0",
       "10309:4:1"
     ],
     [
-      "14536:2:0",
+      "14541:2:0",
       "10315:2:1"
     ],
     [
-      "14540:6:0",
+      "14545:6:0",
       "10319:6:1"
     ],
     [
-      "14557:37:0",
+      "14562:37:0",
       "10337:37:1"
     ],
     [
-      "14557:19:0",
+      "14562:19:0",
       "10337:19:1"
     ],
     [
-      "14557:7:0",
+      "14562:7:0",
       "10337:7:1"
     ],
     [
-      "14579:15:0",
+      "14584:15:0",
       "10359:15:1"
     ],
     [
-      "14579:9:0",
+      "14584:9:0",
       "10359:9:1"
     ],
     [
-      "14589:4:0",
+      "14594:4:0",
       "10369:4:1"
     ],
     [
-      "14604:72:0",
+      "14609:72:0",
       "10384:72:1"
     ],
     [
-      "14604:72:0",
+      "14609:72:0",
       "10384:72:1"
     ],
     [
-      "14604:7:0",
+      "14609:7:0",
       "10384:7:1"
     ],
     [
-      "14612:21:0",
+      "14617:21:0",
       "10392:21:1"
     ],
     [
-      "14612:11:0",
+      "14617:11:0",
       "10392:11:1"
     ],
     [
-      "14627:6:0",
+      "14632:6:0",
       "10407:6:1"
     ],
     [
-      "14635:40:0",
+      "14640:40:0",
       "10415:40:1"
     ],
     [
-      "14686:73:0",
+      "14691:73:0",
       "10466:73:1"
     ],
     [
-      "14710:38:0",
+      "14715:38:0",
       "10490:38:1"
     ],
     [
-      "14710:38:0",
+      "14715:38:0",
       "10490:38:1"
     ],
     [
-      "14710:15:0",
+      "14715:15:0",
       "10490:15:1"
     ],
     [
-      "14710:9:0",
+      "14715:9:0",
       "10490:9:1"
     ],
     [
-      "14720:4:0",
+      "14725:4:0",
       "10500:4:1"
     ],
     [
-      "14728:20:0",
+      "14733:20:0",
       "10508:20:1"
     ],
     [
-      "14728:11:0",
+      "14733:11:0",
       "10508:11:1"
     ],
     [
-      "14742:6:0",
+      "14747:6:0",
       "10522:6:1"
     ],
     [
-      "14768:23:0",
+      "14773:23:0",
       "10548:23:1"
     ],
     [
-      "14768:23:0",
+      "14773:23:0",
       "10548:23:1"
     ],
     [
-      "14768:13:0",
+      "14773:13:0",
       "10548:13:1"
     ],
     [
-      "14768:9:0",
+      "14773:9:0",
       "10548:9:1"
     ],
     [
-      "14778:2:0",
+      "14783:2:0",
       "10558:2:1"
     ],
     [
-      "14785:6:0",
+      "14790:6:0",
       "10565:6:1"
     ],
     [
-      "14801:31:0",
+      "14806:31:0",
       "10582:31:1"
     ],
     [
-      "14806:26:0",
+      "14811:26:0",
       "10587:26:1"
     ],
     [
-      "14806:8:0",
+      "14811:8:0",
       "10587:8:1"
     ],
     [
-      "14815:4:0",
+      "14820:4:0",
       "10596:4:1"
     ],
     [
-      "14821:2:0",
+      "14826:2:0",
       "10602:2:1"
     ],
     [
-      "14825:6:0",
+      "14830:6:0",
       "10606:6:1"
     ],
     [
-      "14842:37:0",
+      "14847:37:0",
       "10624:37:1"
     ],
     [
-      "14842:37:0",
+      "14847:37:0",
       "10624:37:1"
     ],
     [
-      "14842:19:0",
+      "14847:19:0",
       "10624:19:1"
     ],
     [
-      "14862:4:0",
+      "14867:4:0",
       "10644:4:1"
     ],
     [
-      "14868:2:0",
+      "14873:2:0",
       "10650:2:1"
     ],
     [
-      "14872:6:0",
+      "14877:6:0",
       "10654:6:1"
     ],
     [
-      "15141:386:0",
+      "15146:386:0",
       "10944:389:1"
     ],
     [
-      "15155:33:0",
+      "15160:33:0",
       "10958:33:1"
     ],
     [
-      "15156:15:0",
+      "15161:15:0",
       "10959:15:1"
     ],
     [
-      "15156:7:0",
+      "15161:7:0",
       "10959:7:1"
     ],
     [
-      "15173:14:0",
+      "15178:14:0",
       "10976:14:1"
     ],
     [
-      "15173:7:0",
+      "15178:7:0",
       "10976:7:1"
     ],
     [
-      "15206:321:0",
+      "15211:321:0",
       "11009:324:1"
     ],
     [
-      "15216:65:0",
+      "15221:65:0",
       "11019:65:1"
     ],
     [
-      "15216:65:0",
+      "15221:65:0",
       "11019:65:1"
     ],
     [
-      "15216:7:0",
+      "15221:7:0",
       "11019:7:1"
     ],
     [
-      "15224:21:0",
+      "15229:21:0",
       "11027:21:1"
     ],
     [
-      "15224:7:0",
+      "15229:7:0",
       "11027:7:1"
     ],
     [
-      "15235:10:0",
+      "15240:10:0",
       "11038:10:1"
     ],
     [
-      "15235:7:0",
+      "15240:7:0",
       "11038:7:1"
     ],
     [
-      "15235:7:0",
+      "15240:7:0",
       "11038:7:1"
     ],
     [
-      "15243:1:0",
+      "15248:1:0",
       "11046:1:1"
     ],
     [
-      "15247:33:0",
+      "15252:33:0",
       "11050:33:1"
     ],
     [
-      "15291:49:0",
+      "15296:49:0",
       "11095:49:1"
     ],
     [
-      "15291:49:0",
+      "15296:49:0",
       "11095:49:1"
     ],
     [
-      "15291:20:0",
+      "15296:20:0",
       "11095:20:1"
     ],
     [
-      "15312:10:0",
+      "15317:10:0",
       "11116:10:1"
     ],
     [
-      "15312:7:0",
+      "15317:7:0",
       "11116:7:1"
     ],
     [
-      "15312:7:0",
+      "15317:7:0",
       "11116:7:1"
     ],
     [
-      "15320:1:0",
+      "15325:1:0",
       "11124:1:1"
     ],
     [
-      "15324:7:0",
+      "15329:7:0",
       "11128:7:1"
     ],
     [
-      "15333:6:0",
+      "15338:6:0",
       "11137:6:1"
     ],
     [
-      "15350:22:0",
+      "15355:22:0",
       "11155:22:1"
     ],
     [
-      "15350:22:0",
+      "15355:22:0",
       "11155:22:1"
     ],
     [
-      "15350:12:0",
+      "15355:12:0",
       "11155:12:1"
     ],
     [
-      "15366:6:0",
+      "15371:6:0",
       "11171:6:1"
     ],
     [
-      "15382:28:0",
+      "15387:28:0",
       "11187:28:1"
     ],
     [
-      "15382:28:0",
+      "15387:28:0",
       "11187:28:1"
     ],
     [
-      "15382:18:0",
+      "15387:18:0",
       "11187:18:1"
     ],
     [
-      "15382:9:0",
+      "15387:9:0",
       "11187:9:1"
     ],
     [
-      "15392:7:0",
+      "15397:7:0",
       "11197:7:1"
     ],
     [
-      "15404:6:0",
+      "15409:6:0",
       "11209:6:1"
     ],
     [
-      "15420:42:0",
+      "15425:42:0",
       "11225:42:1"
     ],
     [
-      "15425:37:0",
+      "15430:37:0",
       "11230:37:1"
     ],
     [
-      "15425:8:0",
+      "15430:8:0",
       "11230:8:1"
     ],
     [
-      "15434:10:0",
+      "15439:10:0",
       "11239:10:1"
     ],
     [
-      "15434:7:0",
+      "15439:7:0",
       "11239:7:1"
     ],
     [
-      "15434:7:0",
+      "15439:7:0",
       "11239:7:1"
     ],
     [
-      "15442:1:0",
+      "15447:1:0",
       "11247:1:1"
     ],
     [
-      "15446:7:0",
+      "15451:7:0",
       "11251:7:1"
     ],
     [
-      "15455:6:0",
+      "15460:6:0",
       "11260:6:1"
     ],
     [
-      "15472:48:0",
+      "15477:48:0",
       "11278:48:1"
     ],
     [
-      "15472:48:0",
+      "15477:48:0",
       "11278:48:1"
     ],
     [
-      "15472:19:0",
+      "15477:19:0",
       "11278:19:1"
     ],
     [
-      "15492:10:0",
+      "15497:10:0",
       "11298:10:1"
     ],
     [
-      "15492:7:0",
+      "15497:7:0",
       "11298:7:1"
     ],
     [
-      "15492:7:0",
+      "15497:7:0",
       "11298:7:1"
     ],
     [
-      "15500:1:0",
+      "15505:1:0",
       "11306:1:1"
     ],
     [
-      "15504:7:0",
+      "15509:7:0",
       "11310:7:1"
     ],
     [
-      "15513:6:0",
+      "15518:6:0",
       "11319:6:1"
     ],
     [
-      "15822:572:0",
+      "15827:572:0",
       "11653:576:1"
     ],
     [
-      "15836:33:0",
+      "15841:33:0",
       "11667:33:1"
     ],
     [
-      "15837:15:0",
+      "15842:15:0",
       "11668:15:1"
     ],
     [
-      "15837:7:0",
+      "15842:7:0",
       "11668:7:1"
     ],
     [
-      "15854:14:0",
+      "15859:14:0",
       "11685:14:1"
     ],
     [
-      "15854:7:0",
+      "15859:7:0",
       "11685:7:1"
     ],
     [
-      "15887:507:0",
+      "15892:507:0",
       "11718:511:1"
     ],
     [
-      "15897:67:0",
+      "15902:67:0",
       "11728:67:1"
     ],
     [
-      "15897:67:0",
+      "15902:67:0",
       "11728:67:1"
     ],
     [
-      "15897:7:0",
+      "15902:7:0",
       "11728:7:1"
     ],
     [
-      "15905:21:0",
+      "15910:21:0",
       "11736:21:1"
     ],
     [
-      "15905:7:0",
+      "15910:7:0",
       "11736:7:1"
     ],
     [
-      "15916:10:0",
+      "15921:10:0",
       "11747:10:1"
     ],
     [
-      "15916:7:0",
+      "15921:7:0",
       "11747:7:1"
     ],
     [
-      "15916:7:0",
+      "15921:7:0",
       "11747:7:1"
     ],
     [
-      "15924:1:0",
+      "15929:1:0",
       "11755:1:1"
     ],
     [
-      "15928:35:0",
+      "15933:35:0",
       "11759:35:1"
     ],
     [
-      "15974:49:0",
+      "15979:49:0",
       "11806:49:1"
     ],
     [
-      "15974:49:0",
+      "15979:49:0",
       "11806:49:1"
     ],
     [
-      "15974:20:0",
+      "15979:20:0",
       "11806:20:1"
     ],
     [
-      "15995:7:0",
+      "16000:7:0",
       "11827:7:1"
     ],
     [
-      "16004:10:0",
+      "16009:10:0",
       "11836:10:1"
     ],
     [
-      "16004:7:0",
+      "16009:7:0",
       "11836:7:1"
     ],
     [
-      "16004:7:0",
+      "16009:7:0",
       "11836:7:1"
     ],
     [
-      "16012:1:0",
+      "16017:1:0",
       "11844:1:1"
     ],
     [
-      "16016:6:0",
+      "16021:6:0",
       "11848:6:1"
     ],
     [
-      "16033:43:0",
+      "16038:43:0",
       "11866:43:1"
     ],
     [
-      "16033:22:0",
+      "16038:22:0",
       "11866:22:1"
     ],
     [
-      "16033:7:0",
+      "16038:7:0",
       "11866:7:1"
     ],
     [
-      "16058:18:0",
+      "16063:18:0",
       "11891:18:1"
     ],
     [
-      "16058:9:0",
+      "16063:9:0",
       "11891:9:1"
     ],
     [
-      "16068:7:0",
+      "16073:7:0",
       "11901:7:1"
     ],
     [
-      "16086:71:0",
+      "16091:71:0",
       "11919:71:1"
     ],
     [
-      "16086:71:0",
+      "16091:71:0",
       "11919:71:1"
     ],
     [
-      "16086:7:0",
+      "16091:7:0",
       "11919:7:1"
     ],
     [
-      "16094:24:0",
+      "16099:24:0",
       "11927:24:1"
     ],
     [
-      "16094:14:0",
+      "16099:14:0",
       "11927:14:1"
     ],
     [
-      "16112:6:0",
+      "16117:6:0",
       "11945:6:1"
     ],
     [
-      "16120:36:0",
+      "16125:36:0",
       "11953:36:1"
     ],
     [
-      "16167:79:0",
+      "16172:79:0",
       "12000:79:1"
     ],
     [
-      "16191:44:0",
+      "16196:44:0",
       "12024:44:1"
     ],
     [
-      "16191:44:0",
+      "16196:44:0",
       "12024:44:1"
     ],
     [
-      "16191:18:0",
+      "16196:18:0",
       "12024:18:1"
     ],
     [
-      "16191:9:0",
+      "16196:9:0",
       "12024:9:1"
     ],
     [
-      "16201:7:0",
+      "16206:7:0",
       "12034:7:1"
     ],
     [
-      "16212:23:0",
+      "16217:23:0",
       "12045:23:1"
     ],
     [
-      "16212:14:0",
+      "16217:14:0",
       "12045:14:1"
     ],
     [
-      "16229:6:0",
+      "16234:6:0",
       "12062:6:1"
     ],
     [
-      "16255:22:0",
+      "16260:22:0",
       "12088:22:1"
     ],
     [
-      "16255:22:0",
+      "16260:22:0",
       "12088:22:1"
     ],
     [
-      "16255:12:0",
+      "16260:12:0",
       "12088:12:1"
     ],
     [
-      "16271:6:0",
+      "16276:6:0",
       "12104:6:1"
     ],
     [
-      "16287:42:0",
+      "16292:42:0",
       "12121:42:1"
     ],
     [
-      "16292:37:0",
+      "16297:37:0",
       "12126:37:1"
     ],
     [
-      "16292:8:0",
+      "16297:8:0",
       "12126:8:1"
     ],
     [
-      "16301:7:0",
+      "16306:7:0",
       "12135:7:1"
     ],
     [
-      "16310:10:0",
+      "16315:10:0",
       "12144:10:1"
     ],
     [
-      "16310:7:0",
+      "16315:7:0",
       "12144:7:1"
     ],
     [
-      "16310:7:0",
+      "16315:7:0",
       "12144:7:1"
     ],
     [
-      "16318:1:0",
+      "16323:1:0",
       "12152:1:1"
     ],
     [
-      "16322:6:0",
+      "16327:6:0",
       "12156:6:1"
     ],
     [
-      "16339:48:0",
+      "16344:48:0",
       "12174:48:1"
     ],
     [
-      "16339:48:0",
+      "16344:48:0",
       "12174:48:1"
     ],
     [
-      "16339:19:0",
+      "16344:19:0",
       "12174:19:1"
     ],
     [
-      "16359:7:0",
+      "16364:7:0",
       "12194:7:1"
     ],
     [
-      "16368:10:0",
+      "16373:10:0",
       "12203:10:1"
     ],
     [
-      "16368:7:0",
+      "16373:7:0",
       "12203:7:1"
     ],
     [
-      "16368:7:0",
+      "16373:7:0",
       "12203:7:1"
     ],
     [
-      "16376:1:0",
+      "16381:1:0",
       "12211:1:1"
     ],
     [
-      "16380:6:0",
+      "16385:6:0",
       "12215:6:1"
     ],
     [
-      "16787:339:0",
+      "16792:339:0",
       "12652:370:1"
     ],
     [
-      "16804:48:0",
+      "16809:48:0",
       "12669:78:1"
     ],
     [
-      "16805:13:0",
+      "16810:13:0",
       "12679:13:1"
     ],
     [
-      "16805:7:0",
+      "16810:7:0",
       "12679:7:1"
     ],
     [
-      "16820:15:0",
+      "16825:15:0",
       "12702:15:1"
     ],
     [
-      "16820:7:0",
+      "16825:7:0",
       "12702:7:1"
     ],
     [
-      "16837:14:0",
+      "16842:14:0",
       "12727:14:1"
     ],
     [
-      "16837:7:0",
+      "16842:7:0",
       "12727:7:1"
     ],
     [
-      "16870:256:0",
+      "16875:256:0",
       "12765:257:1"
     ],
     [
-      "16880:68:0",
+      "16885:68:0",
       "12775:68:1"
     ],
     [
-      "16880:68:0",
+      "16885:68:0",
       "12775:68:1"
     ],
     [
-      "16880:7:0",
+      "16885:7:0",
       "12775:7:1"
     ],
     [
-      "16888:19:0",
+      "16893:19:0",
       "12783:19:1"
     ],
     [
-      "16888:5:0",
+      "16893:5:0",
       "12783:5:1"
     ],
     [
-      "16897:10:0",
+      "16902:10:0",
       "12792:10:1"
     ],
     [
-      "16897:7:0",
+      "16902:7:0",
       "12792:7:1"
     ],
     [
-      "16897:7:0",
+      "16902:7:0",
       "12792:7:1"
     ],
     [
-      "16905:1:0",
+      "16910:1:0",
       "12800:1:1"
     ],
     [
-      "16909:38:0",
+      "16914:38:0",
       "12804:38:1"
     ],
     [
-      "16958:68:0",
+      "16963:68:0",
       "12853:68:1"
     ],
     [
-      "16958:68:0",
+      "16963:68:0",
       "12853:68:1"
     ],
     [
-      "16958:7:0",
+      "16963:7:0",
       "12853:7:1"
     ],
     [
-      "16966:21:0",
+      "16971:21:0",
       "12861:21:1"
     ],
     [
-      "16966:7:0",
+      "16971:7:0",
       "12861:7:1"
     ],
     [
-      "16977:10:0",
+      "16982:10:0",
       "12872:10:1"
     ],
     [
-      "16977:7:0",
+      "16982:7:0",
       "12872:7:1"
     ],
     [
-      "16977:7:0",
+      "16982:7:0",
       "12872:7:1"
     ],
     [
-      "16985:1:0",
+      "16990:1:0",
       "12880:1:1"
     ],
     [
-      "16989:36:0",
+      "16994:36:0",
       "12884:36:1"
     ],
     [
-      "17036:36:0",
+      "17041:36:0",
       "12932:36:1"
     ],
     [
-      "17036:36:0",
+      "17041:36:0",
       "12932:36:1"
     ],
     [
-      "17036:27:0",
+      "17041:27:0",
       "12932:27:1"
     ],
     [
-      "17036:18:0",
+      "17041:18:0",
       "12932:18:1"
     ],
     [
-      "17036:11:0",
+      "17041:11:0",
       "12932:11:1"
     ],
     [
-      "17048:5:0",
+      "17053:5:0",
       "12944:5:1"
     ],
     [
-      "17055:7:0",
+      "17060:7:0",
       "12951:7:1"
     ],
     [
-      "17066:6:0",
+      "17071:6:0",
       "12962:6:1"
     ],
     [
-      "17082:37:0",
+      "17087:37:0",
       "12978:37:1"
     ],
     [
-      "17087:32:0",
+      "17092:32:0",
       "12983:32:1"
     ],
     [
-      "17087:8:0",
+      "17092:8:0",
       "12983:8:1"
     ],
     [
-      "17096:5:0",
+      "17101:5:0",
       "12992:5:1"
     ],
     [
-      "17103:7:0",
+      "17108:7:0",
       "12999:7:1"
     ],
     [
-      "17112:6:0",
+      "17117:6:0",
       "13008:6:1"
     ],
     [
-      "17381:411:0",
+      "17386:411:0",
       "13299:441:1"
     ],
     [
-      "17405:48:0",
+      "17410:48:0",
       "13323:78:1"
     ],
     [
-      "17406:13:0",
+      "17411:13:0",
       "13333:13:1"
     ],
     [
-      "17406:7:0",
+      "17411:7:0",
       "13333:7:1"
     ],
     [
-      "17421:15:0",
+      "17426:15:0",
       "13356:15:1"
     ],
     [
-      "17421:7:0",
+      "17426:7:0",
       "13356:7:1"
     ],
     [
-      "17438:14:0",
+      "17443:14:0",
       "13381:14:1"
     ],
     [
-      "17438:7:0",
+      "17443:7:0",
       "13381:7:1"
     ],
     [
-      "17471:321:0",
+      "17476:321:0",
       "13419:321:1"
     ],
     [
-      "17481:52:0",
+      "17486:52:0",
       "13429:52:1"
     ],
     [
-      "17481:24:0",
+      "17486:24:0",
       "13429:24:1"
     ],
     [
-      "17481:7:0",
+      "17486:7:0",
       "13429:7:1"
     ],
     [
-      "17508:25:0",
+      "17513:25:0",
       "13456:25:1"
     ],
     [
-      "17508:9:0",
+      "17513:9:0",
       "13456:9:1"
     ],
     [
-      "17518:5:0",
+      "17523:5:0",
       "13466:5:1"
     ],
     [
-      "17525:7:0",
+      "17530:7:0",
       "13473:7:1"
     ],
     [
-      "17543:243:0",
+      "17548:243:0",
       "13491:243:1"
     ],
     [
-      "17547:37:0",
+      "17552:37:0",
       "13495:37:1"
     ],
     [
-      "17547:16:0",
+      "17552:16:0",
       "13495:16:1"
     ],
     [
-      "17567:17:0",
+      "17572:17:0",
       "13515:17:1"
     ],
     [
-      "17567:13:0",
+      "17572:13:0",
       "13515:13:1"
     ],
     [
-      "17567:4:0",
+      "17572:4:0",
       "13515:4:1"
     ],
     [
-      "17572:7:0",
+      "17577:7:0",
       "13520:7:1"
     ],
     [
-      "17572:7:0",
+      "17577:7:0",
       "13520:7:1"
     ],
     [
-      "17586:200:0",
+      "17591:200:0",
       "13534:200:1"
     ],
     [
-      "17600:68:0",
+      "17605:68:0",
       "13548:68:1"
     ],
     [
-      "17600:68:0",
+      "17605:68:0",
       "13548:68:1"
     ],
     [
-      "17600:7:0",
+      "17605:7:0",
       "13548:7:1"
     ],
     [
-      "17608:26:0",
+      "17613:26:0",
       "13556:26:1"
     ],
     [
-      "17608:16:0",
+      "17613:16:0",
       "13556:16:1"
     ],
     [
-      "17628:6:0",
+      "17633:6:0",
       "13576:6:1"
     ],
     [
-      "17636:31:0",
+      "17641:31:0",
       "13584:31:1"
     ],
     [
-      "17682:94:0",
+      "17687:94:0",
       "13630:94:1"
     ],
     [
-      "17710:51:0",
+      "17715:51:0",
       "13658:51:1"
     ],
     [
-      "17710:51:0",
+      "17715:51:0",
       "13658:51:1"
     ],
     [
-      "17710:8:0",
+      "17715:8:0",
       "13658:8:1"
     ],
     [
-      "17719:5:0",
+      "17724:5:0",
       "13667:5:1"
     ],
     [
-      "17726:7:0",
+      "17731:7:0",
       "13674:7:1"
     ],
     [
-      "17735:25:0",
+      "17740:25:0",
       "13683:25:1"
     ],
     [
-      "17735:16:0",
+      "17740:16:0",
       "13683:16:1"
     ],
     [
-      "17754:6:0",
+      "17759:6:0",
       "13702:6:1"
     ],
     [
-      "18357:91:0",
+      "18362:91:0",
       "14324:121:1"
     ],
     [
-      "18386:42:0",
+      "18391:42:0",
       "14353:72:1"
     ],
     [
-      "18387:12:0",
+      "18392:12:0",
       "14363:12:1"
     ],
     [
-      "18387:7:0",
+      "18392:7:0",
       "14363:7:1"
     ],
     [
-      "18401:10:0",
+      "18406:10:0",
       "14385:10:1"
     ],
     [
-      "18401:7:0",
+      "18406:7:0",
       "14385:7:1"
     ],
     [
-      "18413:14:0",
+      "18418:14:0",
       "14405:14:1"
     ],
     [
-      "18413:7:0",
+      "18418:7:0",
       "14405:7:1"
     ],
     [
-      "18446:2:0",
+      "18451:2:0",
       "14443:2:1"
     ],
     [
-      "19017:90:0",
+      "19022:90:0",
       "15033:120:1"
     ],
     [
-      "19045:42:0",
+      "19050:42:0",
       "15061:72:1"
     ],
     [
-      "19046:12:0",
+      "19051:12:0",
       "15071:12:1"
     ],
     [
-      "19046:7:0",
+      "19051:7:0",
       "15071:7:1"
     ],
     [
-      "19060:10:0",
+      "19065:10:0",
       "15093:10:1"
     ],
     [
-      "19060:7:0",
+      "19065:7:0",
       "15093:7:1"
     ],
     [
-      "19072:14:0",
+      "19077:14:0",
       "15113:14:1"
     ],
     [
-      "19072:7:0",
+      "19077:7:0",
       "15113:7:1"
     ],
     [
-      "19105:2:0",
+      "19110:2:0",
       "15151:2:1"
     ],
     [
-      "19551:873:0",
+      "19556:873:0",
       "78:34:0"
     ],
     [
-      "19576:5:0",
+      "19581:5:0",
       "103:5:0"
     ],
     [
-      "19576:5:0",
+      "19581:5:0",
       "103:5:0"
     ],
     [
-      "19752:7:0",
+      "19757:7:0",
       "62:15:0"
     ]
   ],
@@ -2555,14 +2555,14 @@
     "569:8:0",
     "589:113:0",
     "764:110:0",
-    "20070:48:0",
-    "20128:50:0",
-    "20188:52:0",
-    "20277:41:0",
-    "20328:35:0",
-    "20373:42:0",
-    "19407:50:0",
-    "19467:52:0",
+    "20075:48:0",
+    "20133:50:0",
+    "20193:52:0",
+    "20282:41:0",
+    "20333:35:0",
+    "20378:42:0",
+    "19412:50:0",
+    "19472:52:0",
     "3567:22:0",
     "3686:33:0",
     "3774:8:0",
@@ -2577,30 +2577,30 @@
     "9992:43:0",
     "10099:72:0",
     "10181:71:0",
-    "10736:10:0",
-    "10919:48:0",
-    "10783:73:0",
-    "10866:43:0",
-    "10977:72:0",
-    "11059:71:0",
-    "11443:10:0",
-    "11626:54:0",
-    "11490:73:0",
-    "11573:43:0",
-    "11690:72:0",
-    "11772:71:0",
-    "12206:10:0",
-    "12389:62:0",
-    "12253:73:0",
-    "12336:43:0",
-    "12461:72:0",
-    "12543:71:0",
-    "12971:10:0",
-    "13154:67:0",
-    "13018:73:0",
-    "13101:43:0",
-    "13231:72:0",
-    "13313:71:0",
+    "10737:10:0",
+    "10920:48:0",
+    "10784:73:0",
+    "10867:43:0",
+    "10978:72:0",
+    "11060:71:0",
+    "11445:10:0",
+    "11628:54:0",
+    "11492:73:0",
+    "11575:43:0",
+    "11692:72:0",
+    "11774:71:0",
+    "12209:10:0",
+    "12392:62:0",
+    "12256:73:0",
+    "12339:43:0",
+    "12464:72:0",
+    "12546:71:0",
+    "12975:10:0",
+    "13158:67:0",
+    "13022:73:0",
+    "13105:43:0",
+    "13235:72:0",
+    "13317:71:0",
     "5115:52:0",
     "5574:22:0",
     "5693:33:0",
@@ -2611,10 +2611,10 @@
     "5257:35:0",
     "5302:44:0",
     "9884:15:0",
-    "10758:15:0",
-    "11465:15:0",
-    "12228:15:0",
-    "12993:15:0"
+    "10759:15:0",
+    "11467:15:0",
+    "12231:15:0",
+    "12997:15:0"
   ],
   "propertyMap": [
     {
@@ -2630,15 +2630,15 @@
       "debugEventEncoding": [],
       "message": "",
       "instrumentationRanges": [
-        "19779:65:0",
-        "19748:142:0"
+        "19784:65:0",
+        "19753:142:0"
       ],
       "checkRanges": [
-        "19752:7:0"
+        "19757:7:0"
       ],
       "assertionRanges": [
-        "19779:65:0",
-        "19862:13:0"
+        "19784:65:0",
+        "19867:13:0"
       ]
     }
   ],
@@ -2650,5 +2650,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/node_modules_erc20/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected b/test/multifile_samples/node_modules_erc20/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
index 826f08ad..ace24ecb 100644
--- a/test/multifile_samples/node_modules_erc20/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
+++ b/test/multifile_samples/node_modules_erc20/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
@@ -153,7 +153,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transfer(address to, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _transfer(owner, to, amount);
         return true;
@@ -173,7 +173,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address spender, uint256 amount) private returns (bool) {
+    function _original_ERC20_approve(address spender, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, amount);
         return true;
@@ -188,7 +188,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address from, address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address from, address to, uint256 amount) internal returns (bool) {
         address spender = _msgSender();
         _spendAllowance(from, spender, amount);
         _transfer(from, to, amount);
@@ -204,7 +204,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) private returns (bool) {
+    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, _allowances[owner][spender] + addedValue);
         return true;
@@ -219,7 +219,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__663.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) private returns (bool) {
+    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) internal returns (bool) {
         address owner = _msgSender();
         uint256 currentAllowance = _allowances[owner][spender];
         require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero");
diff --git a/test/multifile_samples/node_modules_erc20_2/flat.sol.expected b/test/multifile_samples/node_modules_erc20_2/flat.sol.expected
index 540350fb..8dde3587 100644
--- a/test/multifile_samples/node_modules_erc20_2/flat.sol.expected
+++ b/test/multifile_samples/node_modules_erc20_2/flat.sol.expected
@@ -259,7 +259,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transfer(address to, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _transfer(owner, to, amount);
         return true;
@@ -279,7 +279,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address spender, uint256 amount) private returns (bool) {
+    function _original_ERC20_approve(address spender, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, amount);
         return true;
@@ -294,7 +294,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address from, address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address from, address to, uint256 amount) internal returns (bool) {
         address spender = _msgSender();
         _spendAllowance(from, spender, amount);
         _transfer(from, to, amount);
@@ -310,7 +310,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) private returns (bool) {
+    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, _allowances[owner][spender] + addedValue);
         return true;
@@ -325,7 +325,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) private returns (bool) {
+    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) internal returns (bool) {
         address owner = _msgSender();
         uint256 currentAllowance = _allowances[owner][spender];
         require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero");
@@ -456,7 +456,7 @@ abstract contract Foo is ERC20 {
     function __scribble_Foo_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__685.AssertionFailed("019781:0067:000 0: ");
+                emit __ScribbleUtilsLib__685.AssertionFailed("019786:0067:000 0: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/node_modules_erc20_2/instrumentationMetadata.json.expected b/test/multifile_samples/node_modules_erc20_2/instrumentationMetadata.json.expected
index 99664328..eee8705f 100644
--- a/test/multifile_samples/node_modules_erc20_2/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/node_modules_erc20_2/instrumentationMetadata.json.expected
@@ -345,7 +345,7 @@
       "826:3:1"
     ],
     [
-      "7284:12246:0",
+      "7284:12251:0",
       "3975:11180:0"
     ],
     [
@@ -673,7 +673,7 @@
       "6047:7:0"
     ],
     [
-      "10267:189:0",
+      "10267:190:0",
       "6258:189:0"
     ],
     [
@@ -697,1861 +697,1861 @@
       "6288:7:0"
     ],
     [
-      "10345:6:0",
+      "10346:6:0",
       "6336:6:0"
     ],
     [
-      "10346:4:0",
+      "10347:4:0",
       "6337:4:0"
     ],
     [
-      "10346:4:0",
+      "10347:4:0",
       "6337:4:0"
     ],
     [
-      "10352:104:0",
+      "10353:104:0",
       "6343:104:0"
     ],
     [
-      "10362:28:0",
+      "10363:28:0",
       "6353:28:0"
     ],
     [
-      "10362:13:0",
+      "10363:13:0",
       "6353:13:0"
     ],
     [
-      "10362:7:0",
+      "10363:7:0",
       "6353:7:0"
     ],
     [
-      "10378:12:0",
+      "10379:12:0",
       "6369:12:0"
     ],
     [
-      "10378:10:0",
+      "10379:10:0",
       "6369:10:0"
     ],
     [
-      "10400:28:0",
+      "10401:28:0",
       "6391:28:0"
     ],
     [
-      "10400:28:0",
+      "10401:28:0",
       "6391:28:0"
     ],
     [
-      "10400:9:0",
+      "10401:9:0",
       "6391:9:0"
     ],
     [
-      "10410:5:0",
+      "10411:5:0",
       "6401:5:0"
     ],
     [
-      "10417:2:0",
+      "10418:2:0",
       "6408:2:0"
     ],
     [
-      "10421:6:0",
+      "10422:6:0",
       "6412:6:0"
     ],
     [
-      "10438:11:0",
+      "10439:11:0",
       "6429:11:0"
     ],
     [
-      "10445:4:0",
+      "10446:4:0",
       "6436:4:0"
     ],
     [
-      "10500:149:0",
+      "10501:149:0",
       "6505:149:0"
     ],
     [
-      "10518:32:0",
+      "10519:32:0",
       "6523:32:0"
     ],
     [
-      "10519:13:0",
+      "10520:13:0",
       "6524:13:0"
     ],
     [
-      "10519:7:0",
+      "10520:7:0",
       "6524:7:0"
     ],
     [
-      "10534:15:0",
+      "10535:15:0",
       "6539:15:0"
     ],
     [
-      "10534:7:0",
+      "10535:7:0",
       "6539:7:0"
     ],
     [
-      "10559:8:0",
+      "10560:8:0",
       "6576:8:0"
     ],
     [
-      "10588:9:0",
+      "10589:9:0",
       "6593:9:0"
     ],
     [
-      "10589:7:0",
+      "10590:7:0",
       "6594:7:0"
     ],
     [
-      "10589:7:0",
+      "10590:7:0",
       "6594:7:0"
     ],
     [
-      "10598:51:0",
+      "10599:51:0",
       "6603:51:0"
     ],
     [
-      "10608:34:0",
+      "10609:34:0",
       "6613:34:0"
     ],
     [
-      "10615:27:0",
+      "10616:27:0",
       "6620:27:0"
     ],
     [
-      "10615:18:0",
+      "10616:18:0",
       "6620:18:0"
     ],
     [
-      "10615:11:0",
+      "10616:11:0",
       "6620:11:0"
     ],
     [
-      "10627:5:0",
+      "10628:5:0",
       "6632:5:0"
     ],
     [
-      "10634:7:0",
+      "10635:7:0",
       "6639:7:0"
     ],
     [
-      "11145:197:0",
+      "11146:198:0",
       "6962:197:0"
     ],
     [
-      "11177:33:0",
+      "11178:33:0",
       "6978:33:0"
     ],
     [
-      "11178:15:0",
+      "11179:15:0",
       "6979:15:0"
     ],
     [
-      "11178:7:0",
+      "11179:7:0",
       "6979:7:0"
     ],
     [
-      "11195:14:0",
+      "11196:14:0",
       "6996:14:0"
     ],
     [
-      "11195:7:0",
+      "11196:7:0",
       "6996:7:0"
     ],
     [
-      "11227:6:0",
+      "11229:6:0",
       "7044:6:0"
     ],
     [
-      "11228:4:0",
+      "11230:4:0",
       "7045:4:0"
     ],
     [
-      "11228:4:0",
+      "11230:4:0",
       "7045:4:0"
     ],
     [
-      "11234:108:0",
+      "11236:108:0",
       "7051:108:0"
     ],
     [
-      "11244:28:0",
+      "11246:28:0",
       "7061:28:0"
     ],
     [
-      "11244:13:0",
+      "11246:13:0",
       "7061:13:0"
     ],
     [
-      "11244:7:0",
+      "11246:7:0",
       "7061:7:0"
     ],
     [
-      "11260:12:0",
+      "11262:12:0",
       "7077:12:0"
     ],
     [
-      "11260:10:0",
+      "11262:10:0",
       "7077:10:0"
     ],
     [
-      "11282:32:0",
+      "11284:32:0",
       "7099:32:0"
     ],
     [
-      "11282:32:0",
+      "11284:32:0",
       "7099:32:0"
     ],
     [
-      "11282:8:0",
+      "11284:8:0",
       "7099:8:0"
     ],
     [
-      "11291:5:0",
+      "11293:5:0",
       "7108:5:0"
     ],
     [
-      "11298:7:0",
+      "11300:7:0",
       "7115:7:0"
     ],
     [
-      "11307:6:0",
+      "11309:6:0",
       "7124:6:0"
     ],
     [
-      "11324:11:0",
+      "11326:11:0",
       "7141:11:0"
     ],
     [
-      "11331:4:0",
+      "11333:4:0",
       "7148:4:0"
     ],
     [
-      "11858:256:0",
+      "11860:257:0",
       "7721:286:0"
     ],
     [
-      "11895:42:0",
+      "11897:42:0",
       "7742:72:0"
     ],
     [
-      "11896:12:0",
+      "11898:12:0",
       "7752:12:0"
     ],
     [
-      "11896:7:0",
+      "11898:7:0",
       "7752:7:0"
     ],
     [
-      "11910:10:0",
+      "11912:10:0",
       "7774:10:0"
     ],
     [
-      "11910:7:0",
+      "11912:7:0",
       "7774:7:0"
     ],
     [
-      "11922:14:0",
+      "11924:14:0",
       "7794:14:0"
     ],
     [
-      "11922:7:0",
+      "11924:7:0",
       "7794:7:0"
     ],
     [
-      "11954:6:0",
+      "11957:6:0",
       "7847:6:0"
     ],
     [
-      "11955:4:0",
+      "11958:4:0",
       "7848:4:0"
     ],
     [
-      "11955:4:0",
+      "11958:4:0",
       "7848:4:0"
     ],
     [
-      "11961:153:0",
+      "11964:153:0",
       "7854:153:0"
     ],
     [
-      "11971:30:0",
+      "11974:30:0",
       "7864:30:0"
     ],
     [
-      "11971:15:0",
+      "11974:15:0",
       "7864:15:0"
     ],
     [
-      "11971:7:0",
+      "11974:7:0",
       "7864:7:0"
     ],
     [
-      "11989:12:0",
+      "11992:12:0",
       "7882:12:0"
     ],
     [
-      "11989:10:0",
+      "11992:10:0",
       "7882:10:0"
     ],
     [
-      "12011:38:0",
+      "12014:38:0",
       "7904:38:0"
     ],
     [
-      "12011:38:0",
+      "12014:38:0",
       "7904:38:0"
     ],
     [
-      "12011:15:0",
+      "12014:15:0",
       "7904:15:0"
     ],
     [
-      "12027:4:0",
+      "12030:4:0",
       "7920:4:0"
     ],
     [
-      "12033:7:0",
+      "12036:7:0",
       "7926:7:0"
     ],
     [
-      "12042:6:0",
+      "12045:6:0",
       "7935:6:0"
     ],
     [
-      "12059:27:0",
+      "12062:27:0",
       "7952:27:0"
     ],
     [
-      "12059:27:0",
+      "12062:27:0",
       "7952:27:0"
     ],
     [
-      "12059:9:0",
+      "12062:9:0",
       "7952:9:0"
     ],
     [
-      "12069:4:0",
+      "12072:4:0",
       "7962:4:0"
     ],
     [
-      "12075:2:0",
+      "12078:2:0",
       "7968:2:0"
     ],
     [
-      "12079:6:0",
+      "12082:6:0",
       "7972:6:0"
     ],
     [
-      "12096:11:0",
+      "12099:11:0",
       "7989:11:0"
     ],
     [
-      "12103:4:0",
+      "12106:4:0",
       "7996:4:0"
     ],
     [
-      "12629:245:0",
+      "12632:246:0",
       "8402:236:0"
     ],
     [
-      "12671:37:0",
+      "12674:37:0",
       "8428:37:0"
     ],
     [
-      "12672:15:0",
+      "12675:15:0",
       "8429:15:0"
     ],
     [
-      "12672:7:0",
+      "12675:7:0",
       "8429:7:0"
     ],
     [
-      "12689:18:0",
+      "12692:18:0",
       "8446:18:0"
     ],
     [
-      "12689:7:0",
+      "12692:7:0",
       "8446:7:0"
     ],
     [
-      "12725:6:0",
+      "12729:6:0",
       "8489:6:0"
     ],
     [
-      "12726:4:0",
+      "12730:4:0",
       "8490:4:0"
     ],
     [
-      "12726:4:0",
+      "12730:4:0",
       "8490:4:0"
     ],
     [
-      "12732:142:0",
+      "12736:142:0",
       "8496:142:0"
     ],
     [
-      "12742:28:0",
+      "12746:28:0",
       "8506:28:0"
     ],
     [
-      "12742:13:0",
+      "12746:13:0",
       "8506:13:0"
     ],
     [
-      "12742:7:0",
+      "12746:7:0",
       "8506:7:0"
     ],
     [
-      "12758:12:0",
+      "12762:12:0",
       "8522:12:0"
     ],
     [
-      "12758:10:0",
+      "12762:10:0",
       "8522:10:0"
     ],
     [
-      "12780:66:0",
+      "12784:66:0",
       "8544:66:0"
     ],
     [
-      "12780:66:0",
+      "12784:66:0",
       "8544:66:0"
     ],
     [
-      "12780:8:0",
+      "12784:8:0",
       "8544:8:0"
     ],
     [
-      "12789:5:0",
+      "12793:5:0",
       "8553:5:0"
     ],
     [
-      "12796:7:0",
+      "12800:7:0",
       "8560:7:0"
     ],
     [
-      "12805:40:0",
+      "12809:40:0",
       "8569:40:0"
     ],
     [
-      "12805:27:0",
+      "12809:27:0",
       "8569:27:0"
     ],
     [
-      "12805:18:0",
+      "12809:18:0",
       "8569:18:0"
     ],
     [
-      "12805:11:0",
+      "12809:11:0",
       "8569:11:0"
     ],
     [
-      "12817:5:0",
+      "12821:5:0",
       "8581:5:0"
     ],
     [
-      "12824:7:0",
+      "12828:7:0",
       "8588:7:0"
     ],
     [
-      "12835:10:0",
+      "12839:10:0",
       "8599:10:0"
     ],
     [
-      "12856:11:0",
+      "12860:11:0",
       "8620:11:0"
     ],
     [
-      "12863:4:0",
+      "12867:4:0",
       "8627:4:0"
     ],
     [
-      "13399:437:0",
+      "13403:438:0",
       "9125:429:0"
     ],
     [
-      "13441:42:0",
+      "13445:42:0",
       "9151:42:0"
     ],
     [
-      "13442:15:0",
+      "13446:15:0",
       "9152:15:0"
     ],
     [
-      "13442:7:0",
+      "13446:7:0",
       "9152:7:0"
     ],
     [
-      "13459:23:0",
+      "13463:23:0",
       "9169:23:0"
     ],
     [
-      "13459:7:0",
+      "13463:7:0",
       "9169:7:0"
     ],
     [
-      "13500:6:0",
+      "13505:6:0",
       "9217:6:0"
     ],
     [
-      "13501:4:0",
+      "13506:4:0",
       "9218:4:0"
     ],
     [
-      "13501:4:0",
+      "13506:4:0",
       "9218:4:0"
     ],
     [
-      "13507:329:0",
+      "13512:329:0",
       "9224:330:0"
     ],
     [
-      "13517:28:0",
+      "13522:28:0",
       "9234:28:0"
     ],
     [
-      "13517:13:0",
+      "13522:13:0",
       "9234:13:0"
     ],
     [
-      "13517:7:0",
+      "13522:7:0",
       "9234:7:0"
     ],
     [
-      "13533:12:0",
+      "13538:12:0",
       "9250:12:0"
     ],
     [
-      "13533:10:0",
+      "13538:10:0",
       "9250:10:0"
     ],
     [
-      "13555:54:0",
+      "13560:54:0",
       "9272:54:0"
     ],
     [
-      "13555:24:0",
+      "13560:24:0",
       "9272:24:0"
     ],
     [
-      "13555:7:0",
+      "13560:7:0",
       "9272:7:0"
     ],
     [
-      "13582:27:0",
+      "13587:27:0",
       "9299:27:0"
     ],
     [
-      "13582:18:0",
+      "13587:18:0",
       "9299:18:0"
     ],
     [
-      "13582:11:0",
+      "13587:11:0",
       "9299:11:0"
     ],
     [
-      "13594:5:0",
+      "13599:5:0",
       "9311:5:0"
     ],
     [
-      "13601:7:0",
+      "13606:7:0",
       "9318:7:0"
     ],
     [
-      "13619:85:0",
+      "13624:85:0",
       "9336:85:0"
     ],
     [
-      "13619:85:0",
+      "13624:85:0",
       "9336:85:0"
     ],
     [
-      "13619:7:0",
+      "13624:7:0",
       "9336:7:0"
     ],
     [
-      "13627:35:0",
+      "13632:35:0",
       "9344:35:0"
     ],
     [
-      "13627:16:0",
+      "13632:16:0",
       "9344:16:0"
     ],
     [
-      "13647:15:0",
+      "13652:15:0",
       "9364:15:0"
     ],
     [
-      "13664:39:0",
+      "13669:39:0",
       "9381:39:0"
     ],
     [
-      "13714:95:0",
+      "13719:95:0",
       "9431:95:0"
     ],
     [
-      "13738:60:0",
+      "13743:60:0",
       "9455:60:0"
     ],
     [
-      "13738:60:0",
+      "13743:60:0",
       "9455:60:0"
     ],
     [
-      "13738:8:0",
+      "13743:8:0",
       "9455:8:0"
     ],
     [
-      "13747:5:0",
+      "13752:5:0",
       "9464:5:0"
     ],
     [
-      "13754:7:0",
+      "13759:7:0",
       "9471:7:0"
     ],
     [
-      "13763:34:0",
+      "13768:34:0",
       "9480:34:0"
     ],
     [
-      "13763:16:0",
+      "13768:16:0",
       "9480:16:0"
     ],
     [
-      "13782:15:0",
+      "13787:15:0",
       "9499:15:0"
     ],
     [
-      "13818:11:0",
+      "13823:11:0",
       "9536:11:0"
     ],
     [
-      "13825:4:0",
+      "13830:4:0",
       "9543:4:0"
     ],
     [
-      "14271:617:0",
+      "14276:617:0",
       "10017:651:0"
     ],
     [
-      "14289:42:0",
+      "14294:42:0",
       "10035:72:0"
     ],
     [
-      "14290:12:0",
+      "14295:12:0",
       "10045:12:0"
     ],
     [
-      "14290:7:0",
+      "14295:7:0",
       "10045:7:0"
     ],
     [
-      "14304:10:0",
+      "14309:10:0",
       "10067:10:0"
     ],
     [
-      "14304:7:0",
+      "14309:7:0",
       "10067:7:0"
     ],
     [
-      "14316:14:0",
+      "14321:14:0",
       "10087:14:0"
     ],
     [
-      "14316:7:0",
+      "14321:7:0",
       "10087:7:0"
     ],
     [
-      "14349:539:0",
+      "14354:539:0",
       "10125:543:0"
     ],
     [
-      "14359:68:0",
+      "14364:68:0",
       "10135:68:0"
     ],
     [
-      "14359:68:0",
+      "14364:68:0",
       "10135:68:0"
     ],
     [
-      "14359:7:0",
+      "14364:7:0",
       "10135:7:0"
     ],
     [
-      "14367:18:0",
+      "14372:18:0",
       "10143:18:0"
     ],
     [
-      "14367:4:0",
+      "14372:4:0",
       "10143:4:0"
     ],
     [
-      "14375:10:0",
+      "14380:10:0",
       "10151:10:0"
     ],
     [
-      "14375:7:0",
+      "14380:7:0",
       "10151:7:0"
     ],
     [
-      "14375:7:0",
+      "14380:7:0",
       "10151:7:0"
     ],
     [
-      "14383:1:0",
+      "14388:1:0",
       "10159:1:0"
     ],
     [
-      "14387:39:0",
+      "14392:39:0",
       "10163:39:0"
     ],
     [
-      "14437:64:0",
+      "14442:64:0",
       "10213:64:0"
     ],
     [
-      "14437:64:0",
+      "14442:64:0",
       "10213:64:0"
     ],
     [
-      "14437:7:0",
+      "14442:7:0",
       "10213:7:0"
     ],
     [
-      "14445:16:0",
+      "14450:16:0",
       "10221:16:0"
     ],
     [
-      "14445:2:0",
+      "14450:2:0",
       "10221:2:0"
     ],
     [
-      "14451:10:0",
+      "14456:10:0",
       "10227:10:0"
     ],
     [
-      "14451:7:0",
+      "14456:7:0",
       "10227:7:0"
     ],
     [
-      "14451:7:0",
+      "14456:7:0",
       "10227:7:0"
     ],
     [
-      "14459:1:0",
+      "14464:1:0",
       "10235:1:0"
     ],
     [
-      "14463:37:0",
+      "14468:37:0",
       "10239:37:0"
     ],
     [
-      "14511:38:0",
+      "14516:38:0",
       "10288:38:0"
     ],
     [
-      "14511:38:0",
+      "14516:38:0",
       "10288:38:0"
     ],
     [
-      "14511:20:0",
+      "14516:20:0",
       "10288:20:0"
     ],
     [
-      "14532:4:0",
+      "14537:4:0",
       "10309:4:0"
     ],
     [
-      "14538:2:0",
+      "14543:2:0",
       "10315:2:0"
     ],
     [
-      "14542:6:0",
+      "14547:6:0",
       "10319:6:0"
     ],
     [
-      "14559:37:0",
+      "14564:37:0",
       "10337:37:0"
     ],
     [
-      "14559:19:0",
+      "14564:19:0",
       "10337:19:0"
     ],
     [
-      "14559:7:0",
+      "14564:7:0",
       "10337:7:0"
     ],
     [
-      "14581:15:0",
+      "14586:15:0",
       "10359:15:0"
     ],
     [
-      "14581:9:0",
+      "14586:9:0",
       "10359:9:0"
     ],
     [
-      "14591:4:0",
+      "14596:4:0",
       "10369:4:0"
     ],
     [
-      "14606:72:0",
+      "14611:72:0",
       "10384:72:0"
     ],
     [
-      "14606:72:0",
+      "14611:72:0",
       "10384:72:0"
     ],
     [
-      "14606:7:0",
+      "14611:7:0",
       "10384:7:0"
     ],
     [
-      "14614:21:0",
+      "14619:21:0",
       "10392:21:0"
     ],
     [
-      "14614:11:0",
+      "14619:11:0",
       "10392:11:0"
     ],
     [
-      "14629:6:0",
+      "14634:6:0",
       "10407:6:0"
     ],
     [
-      "14637:40:0",
+      "14642:40:0",
       "10415:40:0"
     ],
     [
-      "14688:73:0",
+      "14693:73:0",
       "10466:73:0"
     ],
     [
-      "14712:38:0",
+      "14717:38:0",
       "10490:38:0"
     ],
     [
-      "14712:38:0",
+      "14717:38:0",
       "10490:38:0"
     ],
     [
-      "14712:15:0",
+      "14717:15:0",
       "10490:15:0"
     ],
     [
-      "14712:9:0",
+      "14717:9:0",
       "10490:9:0"
     ],
     [
-      "14722:4:0",
+      "14727:4:0",
       "10500:4:0"
     ],
     [
-      "14730:20:0",
+      "14735:20:0",
       "10508:20:0"
     ],
     [
-      "14730:11:0",
+      "14735:11:0",
       "10508:11:0"
     ],
     [
-      "14744:6:0",
+      "14749:6:0",
       "10522:6:0"
     ],
     [
-      "14770:23:0",
+      "14775:23:0",
       "10548:23:0"
     ],
     [
-      "14770:23:0",
+      "14775:23:0",
       "10548:23:0"
     ],
     [
-      "14770:13:0",
+      "14775:13:0",
       "10548:13:0"
     ],
     [
-      "14770:9:0",
+      "14775:9:0",
       "10548:9:0"
     ],
     [
-      "14780:2:0",
+      "14785:2:0",
       "10558:2:0"
     ],
     [
-      "14787:6:0",
+      "14792:6:0",
       "10565:6:0"
     ],
     [
-      "14803:31:0",
+      "14808:31:0",
       "10582:31:0"
     ],
     [
-      "14808:26:0",
+      "14813:26:0",
       "10587:26:0"
     ],
     [
-      "14808:8:0",
+      "14813:8:0",
       "10587:8:0"
     ],
     [
-      "14817:4:0",
+      "14822:4:0",
       "10596:4:0"
     ],
     [
-      "14823:2:0",
+      "14828:2:0",
       "10602:2:0"
     ],
     [
-      "14827:6:0",
+      "14832:6:0",
       "10606:6:0"
     ],
     [
-      "14844:37:0",
+      "14849:37:0",
       "10624:37:0"
     ],
     [
-      "14844:37:0",
+      "14849:37:0",
       "10624:37:0"
     ],
     [
-      "14844:19:0",
+      "14849:19:0",
       "10624:19:0"
     ],
     [
-      "14864:4:0",
+      "14869:4:0",
       "10644:4:0"
     ],
     [
-      "14870:2:0",
+      "14875:2:0",
       "10650:2:0"
     ],
     [
-      "14874:6:0",
+      "14879:6:0",
       "10654:6:0"
     ],
     [
-      "15143:386:0",
+      "15148:386:0",
       "10944:389:0"
     ],
     [
-      "15157:33:0",
+      "15162:33:0",
       "10958:33:0"
     ],
     [
-      "15158:15:0",
+      "15163:15:0",
       "10959:15:0"
     ],
     [
-      "15158:7:0",
+      "15163:7:0",
       "10959:7:0"
     ],
     [
-      "15175:14:0",
+      "15180:14:0",
       "10976:14:0"
     ],
     [
-      "15175:7:0",
+      "15180:7:0",
       "10976:7:0"
     ],
     [
-      "15208:321:0",
+      "15213:321:0",
       "11009:324:0"
     ],
     [
-      "15218:65:0",
+      "15223:65:0",
       "11019:65:0"
     ],
     [
-      "15218:65:0",
+      "15223:65:0",
       "11019:65:0"
     ],
     [
-      "15218:7:0",
+      "15223:7:0",
       "11019:7:0"
     ],
     [
-      "15226:21:0",
+      "15231:21:0",
       "11027:21:0"
     ],
     [
-      "15226:7:0",
+      "15231:7:0",
       "11027:7:0"
     ],
     [
-      "15237:10:0",
+      "15242:10:0",
       "11038:10:0"
     ],
     [
-      "15237:7:0",
+      "15242:7:0",
       "11038:7:0"
     ],
     [
-      "15237:7:0",
+      "15242:7:0",
       "11038:7:0"
     ],
     [
-      "15245:1:0",
+      "15250:1:0",
       "11046:1:0"
     ],
     [
-      "15249:33:0",
+      "15254:33:0",
       "11050:33:0"
     ],
     [
-      "15293:49:0",
+      "15298:49:0",
       "11095:49:0"
     ],
     [
-      "15293:49:0",
+      "15298:49:0",
       "11095:49:0"
     ],
     [
-      "15293:20:0",
+      "15298:20:0",
       "11095:20:0"
     ],
     [
-      "15314:10:0",
+      "15319:10:0",
       "11116:10:0"
     ],
     [
-      "15314:7:0",
+      "15319:7:0",
       "11116:7:0"
     ],
     [
-      "15314:7:0",
+      "15319:7:0",
       "11116:7:0"
     ],
     [
-      "15322:1:0",
+      "15327:1:0",
       "11124:1:0"
     ],
     [
-      "15326:7:0",
+      "15331:7:0",
       "11128:7:0"
     ],
     [
-      "15335:6:0",
+      "15340:6:0",
       "11137:6:0"
     ],
     [
-      "15352:22:0",
+      "15357:22:0",
       "11155:22:0"
     ],
     [
-      "15352:22:0",
+      "15357:22:0",
       "11155:22:0"
     ],
     [
-      "15352:12:0",
+      "15357:12:0",
       "11155:12:0"
     ],
     [
-      "15368:6:0",
+      "15373:6:0",
       "11171:6:0"
     ],
     [
-      "15384:28:0",
+      "15389:28:0",
       "11187:28:0"
     ],
     [
-      "15384:28:0",
+      "15389:28:0",
       "11187:28:0"
     ],
     [
-      "15384:18:0",
+      "15389:18:0",
       "11187:18:0"
     ],
     [
-      "15384:9:0",
+      "15389:9:0",
       "11187:9:0"
     ],
     [
-      "15394:7:0",
+      "15399:7:0",
       "11197:7:0"
     ],
     [
-      "15406:6:0",
+      "15411:6:0",
       "11209:6:0"
     ],
     [
-      "15422:42:0",
+      "15427:42:0",
       "11225:42:0"
     ],
     [
-      "15427:37:0",
+      "15432:37:0",
       "11230:37:0"
     ],
     [
-      "15427:8:0",
+      "15432:8:0",
       "11230:8:0"
     ],
     [
-      "15436:10:0",
+      "15441:10:0",
       "11239:10:0"
     ],
     [
-      "15436:7:0",
+      "15441:7:0",
       "11239:7:0"
     ],
     [
-      "15436:7:0",
+      "15441:7:0",
       "11239:7:0"
     ],
     [
-      "15444:1:0",
+      "15449:1:0",
       "11247:1:0"
     ],
     [
-      "15448:7:0",
+      "15453:7:0",
       "11251:7:0"
     ],
     [
-      "15457:6:0",
+      "15462:6:0",
       "11260:6:0"
     ],
     [
-      "15474:48:0",
+      "15479:48:0",
       "11278:48:0"
     ],
     [
-      "15474:48:0",
+      "15479:48:0",
       "11278:48:0"
     ],
     [
-      "15474:19:0",
+      "15479:19:0",
       "11278:19:0"
     ],
     [
-      "15494:10:0",
+      "15499:10:0",
       "11298:10:0"
     ],
     [
-      "15494:7:0",
+      "15499:7:0",
       "11298:7:0"
     ],
     [
-      "15494:7:0",
+      "15499:7:0",
       "11298:7:0"
     ],
     [
-      "15502:1:0",
+      "15507:1:0",
       "11306:1:0"
     ],
     [
-      "15506:7:0",
+      "15511:7:0",
       "11310:7:0"
     ],
     [
-      "15515:6:0",
+      "15520:6:0",
       "11319:6:0"
     ],
     [
-      "15824:572:0",
+      "15829:572:0",
       "11653:576:0"
     ],
     [
-      "15838:33:0",
+      "15843:33:0",
       "11667:33:0"
     ],
     [
-      "15839:15:0",
+      "15844:15:0",
       "11668:15:0"
     ],
     [
-      "15839:7:0",
+      "15844:7:0",
       "11668:7:0"
     ],
     [
-      "15856:14:0",
+      "15861:14:0",
       "11685:14:0"
     ],
     [
-      "15856:7:0",
+      "15861:7:0",
       "11685:7:0"
     ],
     [
-      "15889:507:0",
+      "15894:507:0",
       "11718:511:0"
     ],
     [
-      "15899:67:0",
+      "15904:67:0",
       "11728:67:0"
     ],
     [
-      "15899:67:0",
+      "15904:67:0",
       "11728:67:0"
     ],
     [
-      "15899:7:0",
+      "15904:7:0",
       "11728:7:0"
     ],
     [
-      "15907:21:0",
+      "15912:21:0",
       "11736:21:0"
     ],
     [
-      "15907:7:0",
+      "15912:7:0",
       "11736:7:0"
     ],
     [
-      "15918:10:0",
+      "15923:10:0",
       "11747:10:0"
     ],
     [
-      "15918:7:0",
+      "15923:7:0",
       "11747:7:0"
     ],
     [
-      "15918:7:0",
+      "15923:7:0",
       "11747:7:0"
     ],
     [
-      "15926:1:0",
+      "15931:1:0",
       "11755:1:0"
     ],
     [
-      "15930:35:0",
+      "15935:35:0",
       "11759:35:0"
     ],
     [
-      "15976:49:0",
+      "15981:49:0",
       "11806:49:0"
     ],
     [
-      "15976:49:0",
+      "15981:49:0",
       "11806:49:0"
     ],
     [
-      "15976:20:0",
+      "15981:20:0",
       "11806:20:0"
     ],
     [
-      "15997:7:0",
+      "16002:7:0",
       "11827:7:0"
     ],
     [
-      "16006:10:0",
+      "16011:10:0",
       "11836:10:0"
     ],
     [
-      "16006:7:0",
+      "16011:7:0",
       "11836:7:0"
     ],
     [
-      "16006:7:0",
+      "16011:7:0",
       "11836:7:0"
     ],
     [
-      "16014:1:0",
+      "16019:1:0",
       "11844:1:0"
     ],
     [
-      "16018:6:0",
+      "16023:6:0",
       "11848:6:0"
     ],
     [
-      "16035:43:0",
+      "16040:43:0",
       "11866:43:0"
     ],
     [
-      "16035:22:0",
+      "16040:22:0",
       "11866:22:0"
     ],
     [
-      "16035:7:0",
+      "16040:7:0",
       "11866:7:0"
     ],
     [
-      "16060:18:0",
+      "16065:18:0",
       "11891:18:0"
     ],
     [
-      "16060:9:0",
+      "16065:9:0",
       "11891:9:0"
     ],
     [
-      "16070:7:0",
+      "16075:7:0",
       "11901:7:0"
     ],
     [
-      "16088:71:0",
+      "16093:71:0",
       "11919:71:0"
     ],
     [
-      "16088:71:0",
+      "16093:71:0",
       "11919:71:0"
     ],
     [
-      "16088:7:0",
+      "16093:7:0",
       "11919:7:0"
     ],
     [
-      "16096:24:0",
+      "16101:24:0",
       "11927:24:0"
     ],
     [
-      "16096:14:0",
+      "16101:14:0",
       "11927:14:0"
     ],
     [
-      "16114:6:0",
+      "16119:6:0",
       "11945:6:0"
     ],
     [
-      "16122:36:0",
+      "16127:36:0",
       "11953:36:0"
     ],
     [
-      "16169:79:0",
+      "16174:79:0",
       "12000:79:0"
     ],
     [
-      "16193:44:0",
+      "16198:44:0",
       "12024:44:0"
     ],
     [
-      "16193:44:0",
+      "16198:44:0",
       "12024:44:0"
     ],
     [
-      "16193:18:0",
+      "16198:18:0",
       "12024:18:0"
     ],
     [
-      "16193:9:0",
+      "16198:9:0",
       "12024:9:0"
     ],
     [
-      "16203:7:0",
+      "16208:7:0",
       "12034:7:0"
     ],
     [
-      "16214:23:0",
+      "16219:23:0",
       "12045:23:0"
     ],
     [
-      "16214:14:0",
+      "16219:14:0",
       "12045:14:0"
     ],
     [
-      "16231:6:0",
+      "16236:6:0",
       "12062:6:0"
     ],
     [
-      "16257:22:0",
+      "16262:22:0",
       "12088:22:0"
     ],
     [
-      "16257:22:0",
+      "16262:22:0",
       "12088:22:0"
     ],
     [
-      "16257:12:0",
+      "16262:12:0",
       "12088:12:0"
     ],
     [
-      "16273:6:0",
+      "16278:6:0",
       "12104:6:0"
     ],
     [
-      "16289:42:0",
+      "16294:42:0",
       "12121:42:0"
     ],
     [
-      "16294:37:0",
+      "16299:37:0",
       "12126:37:0"
     ],
     [
-      "16294:8:0",
+      "16299:8:0",
       "12126:8:0"
     ],
     [
-      "16303:7:0",
+      "16308:7:0",
       "12135:7:0"
     ],
     [
-      "16312:10:0",
+      "16317:10:0",
       "12144:10:0"
     ],
     [
-      "16312:7:0",
+      "16317:7:0",
       "12144:7:0"
     ],
     [
-      "16312:7:0",
+      "16317:7:0",
       "12144:7:0"
     ],
     [
-      "16320:1:0",
+      "16325:1:0",
       "12152:1:0"
     ],
     [
-      "16324:6:0",
+      "16329:6:0",
       "12156:6:0"
     ],
     [
-      "16341:48:0",
+      "16346:48:0",
       "12174:48:0"
     ],
     [
-      "16341:48:0",
+      "16346:48:0",
       "12174:48:0"
     ],
     [
-      "16341:19:0",
+      "16346:19:0",
       "12174:19:0"
     ],
     [
-      "16361:7:0",
+      "16366:7:0",
       "12194:7:0"
     ],
     [
-      "16370:10:0",
+      "16375:10:0",
       "12203:10:0"
     ],
     [
-      "16370:7:0",
+      "16375:7:0",
       "12203:7:0"
     ],
     [
-      "16370:7:0",
+      "16375:7:0",
       "12203:7:0"
     ],
     [
-      "16378:1:0",
+      "16383:1:0",
       "12211:1:0"
     ],
     [
-      "16382:6:0",
+      "16387:6:0",
       "12215:6:0"
     ],
     [
-      "16789:339:0",
+      "16794:339:0",
       "12652:370:0"
     ],
     [
-      "16806:48:0",
+      "16811:48:0",
       "12669:78:0"
     ],
     [
-      "16807:13:0",
+      "16812:13:0",
       "12679:13:0"
     ],
     [
-      "16807:7:0",
+      "16812:7:0",
       "12679:7:0"
     ],
     [
-      "16822:15:0",
+      "16827:15:0",
       "12702:15:0"
     ],
     [
-      "16822:7:0",
+      "16827:7:0",
       "12702:7:0"
     ],
     [
-      "16839:14:0",
+      "16844:14:0",
       "12727:14:0"
     ],
     [
-      "16839:7:0",
+      "16844:7:0",
       "12727:7:0"
     ],
     [
-      "16872:256:0",
+      "16877:256:0",
       "12765:257:0"
     ],
     [
-      "16882:68:0",
+      "16887:68:0",
       "12775:68:0"
     ],
     [
-      "16882:68:0",
+      "16887:68:0",
       "12775:68:0"
     ],
     [
-      "16882:7:0",
+      "16887:7:0",
       "12775:7:0"
     ],
     [
-      "16890:19:0",
+      "16895:19:0",
       "12783:19:0"
     ],
     [
-      "16890:5:0",
+      "16895:5:0",
       "12783:5:0"
     ],
     [
-      "16899:10:0",
+      "16904:10:0",
       "12792:10:0"
     ],
     [
-      "16899:7:0",
+      "16904:7:0",
       "12792:7:0"
     ],
     [
-      "16899:7:0",
+      "16904:7:0",
       "12792:7:0"
     ],
     [
-      "16907:1:0",
+      "16912:1:0",
       "12800:1:0"
     ],
     [
-      "16911:38:0",
+      "16916:38:0",
       "12804:38:0"
     ],
     [
-      "16960:68:0",
+      "16965:68:0",
       "12853:68:0"
     ],
     [
-      "16960:68:0",
+      "16965:68:0",
       "12853:68:0"
     ],
     [
-      "16960:7:0",
+      "16965:7:0",
       "12853:7:0"
     ],
     [
-      "16968:21:0",
+      "16973:21:0",
       "12861:21:0"
     ],
     [
-      "16968:7:0",
+      "16973:7:0",
       "12861:7:0"
     ],
     [
-      "16979:10:0",
+      "16984:10:0",
       "12872:10:0"
     ],
     [
-      "16979:7:0",
+      "16984:7:0",
       "12872:7:0"
     ],
     [
-      "16979:7:0",
+      "16984:7:0",
       "12872:7:0"
     ],
     [
-      "16987:1:0",
+      "16992:1:0",
       "12880:1:0"
     ],
     [
-      "16991:36:0",
+      "16996:36:0",
       "12884:36:0"
     ],
     [
-      "17038:36:0",
+      "17043:36:0",
       "12932:36:0"
     ],
     [
-      "17038:36:0",
+      "17043:36:0",
       "12932:36:0"
     ],
     [
-      "17038:27:0",
+      "17043:27:0",
       "12932:27:0"
     ],
     [
-      "17038:18:0",
+      "17043:18:0",
       "12932:18:0"
     ],
     [
-      "17038:11:0",
+      "17043:11:0",
       "12932:11:0"
     ],
     [
-      "17050:5:0",
+      "17055:5:0",
       "12944:5:0"
     ],
     [
-      "17057:7:0",
+      "17062:7:0",
       "12951:7:0"
     ],
     [
-      "17068:6:0",
+      "17073:6:0",
       "12962:6:0"
     ],
     [
-      "17084:37:0",
+      "17089:37:0",
       "12978:37:0"
     ],
     [
-      "17089:32:0",
+      "17094:32:0",
       "12983:32:0"
     ],
     [
-      "17089:8:0",
+      "17094:8:0",
       "12983:8:0"
     ],
     [
-      "17098:5:0",
+      "17103:5:0",
       "12992:5:0"
     ],
     [
-      "17105:7:0",
+      "17110:7:0",
       "12999:7:0"
     ],
     [
-      "17114:6:0",
+      "17119:6:0",
       "13008:6:0"
     ],
     [
-      "17383:411:0",
+      "17388:411:0",
       "13299:441:0"
     ],
     [
-      "17407:48:0",
+      "17412:48:0",
       "13323:78:0"
     ],
     [
-      "17408:13:0",
+      "17413:13:0",
       "13333:13:0"
     ],
     [
-      "17408:7:0",
+      "17413:7:0",
       "13333:7:0"
     ],
     [
-      "17423:15:0",
+      "17428:15:0",
       "13356:15:0"
     ],
     [
-      "17423:7:0",
+      "17428:7:0",
       "13356:7:0"
     ],
     [
-      "17440:14:0",
+      "17445:14:0",
       "13381:14:0"
     ],
     [
-      "17440:7:0",
+      "17445:7:0",
       "13381:7:0"
     ],
     [
-      "17473:321:0",
+      "17478:321:0",
       "13419:321:0"
     ],
     [
-      "17483:52:0",
+      "17488:52:0",
       "13429:52:0"
     ],
     [
-      "17483:24:0",
+      "17488:24:0",
       "13429:24:0"
     ],
     [
-      "17483:7:0",
+      "17488:7:0",
       "13429:7:0"
     ],
     [
-      "17510:25:0",
+      "17515:25:0",
       "13456:25:0"
     ],
     [
-      "17510:9:0",
+      "17515:9:0",
       "13456:9:0"
     ],
     [
-      "17520:5:0",
+      "17525:5:0",
       "13466:5:0"
     ],
     [
-      "17527:7:0",
+      "17532:7:0",
       "13473:7:0"
     ],
     [
-      "17545:243:0",
+      "17550:243:0",
       "13491:243:0"
     ],
     [
-      "17549:37:0",
+      "17554:37:0",
       "13495:37:0"
     ],
     [
-      "17549:16:0",
+      "17554:16:0",
       "13495:16:0"
     ],
     [
-      "17569:17:0",
+      "17574:17:0",
       "13515:17:0"
     ],
     [
-      "17569:13:0",
+      "17574:13:0",
       "13515:13:0"
     ],
     [
-      "17569:4:0",
+      "17574:4:0",
       "13515:4:0"
     ],
     [
-      "17574:7:0",
+      "17579:7:0",
       "13520:7:0"
     ],
     [
-      "17574:7:0",
+      "17579:7:0",
       "13520:7:0"
     ],
     [
-      "17588:200:0",
+      "17593:200:0",
       "13534:200:0"
     ],
     [
-      "17602:68:0",
+      "17607:68:0",
       "13548:68:0"
     ],
     [
-      "17602:68:0",
+      "17607:68:0",
       "13548:68:0"
     ],
     [
-      "17602:7:0",
+      "17607:7:0",
       "13548:7:0"
     ],
     [
-      "17610:26:0",
+      "17615:26:0",
       "13556:26:0"
     ],
     [
-      "17610:16:0",
+      "17615:16:0",
       "13556:16:0"
     ],
     [
-      "17630:6:0",
+      "17635:6:0",
       "13576:6:0"
     ],
     [
-      "17638:31:0",
+      "17643:31:0",
       "13584:31:0"
     ],
     [
-      "17684:94:0",
+      "17689:94:0",
       "13630:94:0"
     ],
     [
-      "17712:51:0",
+      "17717:51:0",
       "13658:51:0"
     ],
     [
-      "17712:51:0",
+      "17717:51:0",
       "13658:51:0"
     ],
     [
-      "17712:8:0",
+      "17717:8:0",
       "13658:8:0"
     ],
     [
-      "17721:5:0",
+      "17726:5:0",
       "13667:5:0"
     ],
     [
-      "17728:7:0",
+      "17733:7:0",
       "13674:7:0"
     ],
     [
-      "17737:25:0",
+      "17742:25:0",
       "13683:25:0"
     ],
     [
-      "17737:16:0",
+      "17742:16:0",
       "13683:16:0"
     ],
     [
-      "17756:6:0",
+      "17761:6:0",
       "13702:6:0"
     ],
     [
-      "18359:91:0",
+      "18364:91:0",
       "14324:121:0"
     ],
     [
-      "18388:42:0",
+      "18393:42:0",
       "14353:72:0"
     ],
     [
-      "18389:12:0",
+      "18394:12:0",
       "14363:12:0"
     ],
     [
-      "18389:7:0",
+      "18394:7:0",
       "14363:7:0"
     ],
     [
-      "18403:10:0",
+      "18408:10:0",
       "14385:10:0"
     ],
     [
-      "18403:7:0",
+      "18408:7:0",
       "14385:7:0"
     ],
     [
-      "18415:14:0",
+      "18420:14:0",
       "14405:14:0"
     ],
     [
-      "18415:7:0",
+      "18420:7:0",
       "14405:7:0"
     ],
     [
-      "18448:2:0",
+      "18453:2:0",
       "14443:2:0"
     ],
     [
-      "19019:90:0",
+      "19024:90:0",
       "15033:120:0"
     ],
     [
-      "19047:42:0",
+      "19052:42:0",
       "15061:72:0"
     ],
     [
-      "19048:12:0",
+      "19053:12:0",
       "15071:12:0"
     ],
     [
-      "19048:7:0",
+      "19053:7:0",
       "15071:7:0"
     ],
     [
-      "19062:10:0",
+      "19067:10:0",
       "15093:10:0"
     ],
     [
-      "19062:7:0",
+      "19067:7:0",
       "15093:7:0"
     ],
     [
-      "19074:14:0",
+      "19079:14:0",
       "15113:14:0"
     ],
     [
-      "19074:7:0",
+      "19079:7:0",
       "15113:7:0"
     ],
     [
-      "19107:2:0",
+      "19112:2:0",
       "15151:2:0"
     ],
     [
-      "19553:879:0",
+      "19558:879:0",
       "78:34:2"
     ],
     [
-      "19578:5:0",
+      "19583:5:0",
       "103:5:2"
     ],
     [
-      "19578:5:0",
+      "19583:5:0",
       "103:5:2"
     ],
     [
-      "19754:7:0",
+      "19759:7:0",
       "62:15:2"
     ]
   ],
   "otherInstrumentation": [
-    "19409:50:0",
-    "19469:52:0",
+    "19414:50:0",
+    "19474:52:0",
     "2830:22:0",
     "2949:33:0",
     "3037:8:0",
@@ -2566,30 +2566,30 @@
     "9994:43:0",
     "10101:72:0",
     "10183:71:0",
-    "10738:10:0",
-    "10921:48:0",
-    "10785:73:0",
-    "10868:43:0",
-    "10979:72:0",
-    "11061:71:0",
-    "11445:10:0",
-    "11628:54:0",
-    "11492:73:0",
-    "11575:43:0",
-    "11692:72:0",
-    "11774:71:0",
-    "12208:10:0",
-    "12391:62:0",
-    "12255:73:0",
-    "12338:43:0",
-    "12463:72:0",
-    "12545:71:0",
-    "12973:10:0",
-    "13156:67:0",
-    "13020:73:0",
-    "13103:43:0",
-    "13233:72:0",
-    "13315:71:0",
+    "10739:10:0",
+    "10922:48:0",
+    "10786:73:0",
+    "10869:43:0",
+    "10980:72:0",
+    "11062:71:0",
+    "11447:10:0",
+    "11630:54:0",
+    "11494:73:0",
+    "11577:43:0",
+    "11694:72:0",
+    "11776:71:0",
+    "12211:10:0",
+    "12394:62:0",
+    "12258:73:0",
+    "12341:43:0",
+    "12466:72:0",
+    "12548:71:0",
+    "12977:10:0",
+    "13160:67:0",
+    "13024:73:0",
+    "13107:43:0",
+    "13237:72:0",
+    "13319:71:0",
     "4378:52:0",
     "4837:22:0",
     "4956:33:0",
@@ -2604,17 +2604,17 @@
     "5783:8:0",
     "5803:113:0",
     "5978:110:0",
-    "20074:48:0",
-    "20132:50:0",
-    "20192:52:0",
-    "20281:43:0",
-    "20334:35:0",
-    "20379:44:0",
+    "20079:48:0",
+    "20137:50:0",
+    "20197:52:0",
+    "20286:43:0",
+    "20339:35:0",
+    "20384:44:0",
     "9886:15:0",
-    "10760:15:0",
-    "11467:15:0",
-    "12230:15:0",
-    "12995:15:0"
+    "10761:15:0",
+    "11469:15:0",
+    "12233:15:0",
+    "12999:15:0"
   ],
   "propertyMap": [
     {
@@ -2630,15 +2630,15 @@
       "debugEventEncoding": [],
       "message": "",
       "instrumentationRanges": [
-        "19781:67:0",
-        "19750:144:0"
+        "19786:67:0",
+        "19755:144:0"
       ],
       "checkRanges": [
-        "19754:7:0"
+        "19759:7:0"
       ],
       "assertionRanges": [
-        "19781:67:0",
-        "19866:13:0"
+        "19786:67:0",
+        "19871:13:0"
       ]
     }
   ],
@@ -2650,5 +2650,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/node_modules_erc20_2/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected b/test/multifile_samples/node_modules_erc20_2/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
index eb7b9003..cabf7b36 100644
--- a/test/multifile_samples/node_modules_erc20_2/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
+++ b/test/multifile_samples/node_modules_erc20_2/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
@@ -153,7 +153,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transfer(address to, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _transfer(owner, to, amount);
         return true;
@@ -173,7 +173,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address spender, uint256 amount) private returns (bool) {
+    function _original_ERC20_approve(address spender, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, amount);
         return true;
@@ -188,7 +188,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address from, address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address from, address to, uint256 amount) internal returns (bool) {
         address spender = _msgSender();
         _spendAllowance(from, spender, amount);
         _transfer(from, to, amount);
@@ -204,7 +204,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) private returns (bool) {
+    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, _allowances[owner][spender] + addedValue);
         return true;
@@ -219,7 +219,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) private returns (bool) {
+    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) internal returns (bool) {
         address owner = _msgSender();
         uint256 currentAllowance = _allowances[owner][spender];
         require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero");
diff --git a/test/multifile_samples/node_modules_erc20_3/flat.sol.expected b/test/multifile_samples/node_modules_erc20_3/flat.sol.expected
index 540350fb..8dde3587 100644
--- a/test/multifile_samples/node_modules_erc20_3/flat.sol.expected
+++ b/test/multifile_samples/node_modules_erc20_3/flat.sol.expected
@@ -259,7 +259,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transfer(address to, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _transfer(owner, to, amount);
         return true;
@@ -279,7 +279,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address spender, uint256 amount) private returns (bool) {
+    function _original_ERC20_approve(address spender, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, amount);
         return true;
@@ -294,7 +294,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address from, address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address from, address to, uint256 amount) internal returns (bool) {
         address spender = _msgSender();
         _spendAllowance(from, spender, amount);
         _transfer(from, to, amount);
@@ -310,7 +310,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) private returns (bool) {
+    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, _allowances[owner][spender] + addedValue);
         return true;
@@ -325,7 +325,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) private returns (bool) {
+    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) internal returns (bool) {
         address owner = _msgSender();
         uint256 currentAllowance = _allowances[owner][spender];
         require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero");
@@ -456,7 +456,7 @@ abstract contract Foo is ERC20 {
     function __scribble_Foo_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__685.AssertionFailed("019781:0067:000 0: ");
+                emit __ScribbleUtilsLib__685.AssertionFailed("019786:0067:000 0: ");
                 assert(false);
             }
         }
diff --git a/test/multifile_samples/node_modules_erc20_3/instrumentationMetadata.json.expected b/test/multifile_samples/node_modules_erc20_3/instrumentationMetadata.json.expected
index 9ce2f0da..4a3964bb 100644
--- a/test/multifile_samples/node_modules_erc20_3/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/node_modules_erc20_3/instrumentationMetadata.json.expected
@@ -345,7 +345,7 @@
       "826:3:1"
     ],
     [
-      "7284:12246:0",
+      "7284:12251:0",
       "3975:11180:0"
     ],
     [
@@ -673,7 +673,7 @@
       "6047:7:0"
     ],
     [
-      "10267:189:0",
+      "10267:190:0",
       "6258:189:0"
     ],
     [
@@ -697,1861 +697,1861 @@
       "6288:7:0"
     ],
     [
-      "10345:6:0",
+      "10346:6:0",
       "6336:6:0"
     ],
     [
-      "10346:4:0",
+      "10347:4:0",
       "6337:4:0"
     ],
     [
-      "10346:4:0",
+      "10347:4:0",
       "6337:4:0"
     ],
     [
-      "10352:104:0",
+      "10353:104:0",
       "6343:104:0"
     ],
     [
-      "10362:28:0",
+      "10363:28:0",
       "6353:28:0"
     ],
     [
-      "10362:13:0",
+      "10363:13:0",
       "6353:13:0"
     ],
     [
-      "10362:7:0",
+      "10363:7:0",
       "6353:7:0"
     ],
     [
-      "10378:12:0",
+      "10379:12:0",
       "6369:12:0"
     ],
     [
-      "10378:10:0",
+      "10379:10:0",
       "6369:10:0"
     ],
     [
-      "10400:28:0",
+      "10401:28:0",
       "6391:28:0"
     ],
     [
-      "10400:28:0",
+      "10401:28:0",
       "6391:28:0"
     ],
     [
-      "10400:9:0",
+      "10401:9:0",
       "6391:9:0"
     ],
     [
-      "10410:5:0",
+      "10411:5:0",
       "6401:5:0"
     ],
     [
-      "10417:2:0",
+      "10418:2:0",
       "6408:2:0"
     ],
     [
-      "10421:6:0",
+      "10422:6:0",
       "6412:6:0"
     ],
     [
-      "10438:11:0",
+      "10439:11:0",
       "6429:11:0"
     ],
     [
-      "10445:4:0",
+      "10446:4:0",
       "6436:4:0"
     ],
     [
-      "10500:149:0",
+      "10501:149:0",
       "6505:149:0"
     ],
     [
-      "10518:32:0",
+      "10519:32:0",
       "6523:32:0"
     ],
     [
-      "10519:13:0",
+      "10520:13:0",
       "6524:13:0"
     ],
     [
-      "10519:7:0",
+      "10520:7:0",
       "6524:7:0"
     ],
     [
-      "10534:15:0",
+      "10535:15:0",
       "6539:15:0"
     ],
     [
-      "10534:7:0",
+      "10535:7:0",
       "6539:7:0"
     ],
     [
-      "10559:8:0",
+      "10560:8:0",
       "6576:8:0"
     ],
     [
-      "10588:9:0",
+      "10589:9:0",
       "6593:9:0"
     ],
     [
-      "10589:7:0",
+      "10590:7:0",
       "6594:7:0"
     ],
     [
-      "10589:7:0",
+      "10590:7:0",
       "6594:7:0"
     ],
     [
-      "10598:51:0",
+      "10599:51:0",
       "6603:51:0"
     ],
     [
-      "10608:34:0",
+      "10609:34:0",
       "6613:34:0"
     ],
     [
-      "10615:27:0",
+      "10616:27:0",
       "6620:27:0"
     ],
     [
-      "10615:18:0",
+      "10616:18:0",
       "6620:18:0"
     ],
     [
-      "10615:11:0",
+      "10616:11:0",
       "6620:11:0"
     ],
     [
-      "10627:5:0",
+      "10628:5:0",
       "6632:5:0"
     ],
     [
-      "10634:7:0",
+      "10635:7:0",
       "6639:7:0"
     ],
     [
-      "11145:197:0",
+      "11146:198:0",
       "6962:197:0"
     ],
     [
-      "11177:33:0",
+      "11178:33:0",
       "6978:33:0"
     ],
     [
-      "11178:15:0",
+      "11179:15:0",
       "6979:15:0"
     ],
     [
-      "11178:7:0",
+      "11179:7:0",
       "6979:7:0"
     ],
     [
-      "11195:14:0",
+      "11196:14:0",
       "6996:14:0"
     ],
     [
-      "11195:7:0",
+      "11196:7:0",
       "6996:7:0"
     ],
     [
-      "11227:6:0",
+      "11229:6:0",
       "7044:6:0"
     ],
     [
-      "11228:4:0",
+      "11230:4:0",
       "7045:4:0"
     ],
     [
-      "11228:4:0",
+      "11230:4:0",
       "7045:4:0"
     ],
     [
-      "11234:108:0",
+      "11236:108:0",
       "7051:108:0"
     ],
     [
-      "11244:28:0",
+      "11246:28:0",
       "7061:28:0"
     ],
     [
-      "11244:13:0",
+      "11246:13:0",
       "7061:13:0"
     ],
     [
-      "11244:7:0",
+      "11246:7:0",
       "7061:7:0"
     ],
     [
-      "11260:12:0",
+      "11262:12:0",
       "7077:12:0"
     ],
     [
-      "11260:10:0",
+      "11262:10:0",
       "7077:10:0"
     ],
     [
-      "11282:32:0",
+      "11284:32:0",
       "7099:32:0"
     ],
     [
-      "11282:32:0",
+      "11284:32:0",
       "7099:32:0"
     ],
     [
-      "11282:8:0",
+      "11284:8:0",
       "7099:8:0"
     ],
     [
-      "11291:5:0",
+      "11293:5:0",
       "7108:5:0"
     ],
     [
-      "11298:7:0",
+      "11300:7:0",
       "7115:7:0"
     ],
     [
-      "11307:6:0",
+      "11309:6:0",
       "7124:6:0"
     ],
     [
-      "11324:11:0",
+      "11326:11:0",
       "7141:11:0"
     ],
     [
-      "11331:4:0",
+      "11333:4:0",
       "7148:4:0"
     ],
     [
-      "11858:256:0",
+      "11860:257:0",
       "7721:286:0"
     ],
     [
-      "11895:42:0",
+      "11897:42:0",
       "7742:72:0"
     ],
     [
-      "11896:12:0",
+      "11898:12:0",
       "7752:12:0"
     ],
     [
-      "11896:7:0",
+      "11898:7:0",
       "7752:7:0"
     ],
     [
-      "11910:10:0",
+      "11912:10:0",
       "7774:10:0"
     ],
     [
-      "11910:7:0",
+      "11912:7:0",
       "7774:7:0"
     ],
     [
-      "11922:14:0",
+      "11924:14:0",
       "7794:14:0"
     ],
     [
-      "11922:7:0",
+      "11924:7:0",
       "7794:7:0"
     ],
     [
-      "11954:6:0",
+      "11957:6:0",
       "7847:6:0"
     ],
     [
-      "11955:4:0",
+      "11958:4:0",
       "7848:4:0"
     ],
     [
-      "11955:4:0",
+      "11958:4:0",
       "7848:4:0"
     ],
     [
-      "11961:153:0",
+      "11964:153:0",
       "7854:153:0"
     ],
     [
-      "11971:30:0",
+      "11974:30:0",
       "7864:30:0"
     ],
     [
-      "11971:15:0",
+      "11974:15:0",
       "7864:15:0"
     ],
     [
-      "11971:7:0",
+      "11974:7:0",
       "7864:7:0"
     ],
     [
-      "11989:12:0",
+      "11992:12:0",
       "7882:12:0"
     ],
     [
-      "11989:10:0",
+      "11992:10:0",
       "7882:10:0"
     ],
     [
-      "12011:38:0",
+      "12014:38:0",
       "7904:38:0"
     ],
     [
-      "12011:38:0",
+      "12014:38:0",
       "7904:38:0"
     ],
     [
-      "12011:15:0",
+      "12014:15:0",
       "7904:15:0"
     ],
     [
-      "12027:4:0",
+      "12030:4:0",
       "7920:4:0"
     ],
     [
-      "12033:7:0",
+      "12036:7:0",
       "7926:7:0"
     ],
     [
-      "12042:6:0",
+      "12045:6:0",
       "7935:6:0"
     ],
     [
-      "12059:27:0",
+      "12062:27:0",
       "7952:27:0"
     ],
     [
-      "12059:27:0",
+      "12062:27:0",
       "7952:27:0"
     ],
     [
-      "12059:9:0",
+      "12062:9:0",
       "7952:9:0"
     ],
     [
-      "12069:4:0",
+      "12072:4:0",
       "7962:4:0"
     ],
     [
-      "12075:2:0",
+      "12078:2:0",
       "7968:2:0"
     ],
     [
-      "12079:6:0",
+      "12082:6:0",
       "7972:6:0"
     ],
     [
-      "12096:11:0",
+      "12099:11:0",
       "7989:11:0"
     ],
     [
-      "12103:4:0",
+      "12106:4:0",
       "7996:4:0"
     ],
     [
-      "12629:245:0",
+      "12632:246:0",
       "8402:236:0"
     ],
     [
-      "12671:37:0",
+      "12674:37:0",
       "8428:37:0"
     ],
     [
-      "12672:15:0",
+      "12675:15:0",
       "8429:15:0"
     ],
     [
-      "12672:7:0",
+      "12675:7:0",
       "8429:7:0"
     ],
     [
-      "12689:18:0",
+      "12692:18:0",
       "8446:18:0"
     ],
     [
-      "12689:7:0",
+      "12692:7:0",
       "8446:7:0"
     ],
     [
-      "12725:6:0",
+      "12729:6:0",
       "8489:6:0"
     ],
     [
-      "12726:4:0",
+      "12730:4:0",
       "8490:4:0"
     ],
     [
-      "12726:4:0",
+      "12730:4:0",
       "8490:4:0"
     ],
     [
-      "12732:142:0",
+      "12736:142:0",
       "8496:142:0"
     ],
     [
-      "12742:28:0",
+      "12746:28:0",
       "8506:28:0"
     ],
     [
-      "12742:13:0",
+      "12746:13:0",
       "8506:13:0"
     ],
     [
-      "12742:7:0",
+      "12746:7:0",
       "8506:7:0"
     ],
     [
-      "12758:12:0",
+      "12762:12:0",
       "8522:12:0"
     ],
     [
-      "12758:10:0",
+      "12762:10:0",
       "8522:10:0"
     ],
     [
-      "12780:66:0",
+      "12784:66:0",
       "8544:66:0"
     ],
     [
-      "12780:66:0",
+      "12784:66:0",
       "8544:66:0"
     ],
     [
-      "12780:8:0",
+      "12784:8:0",
       "8544:8:0"
     ],
     [
-      "12789:5:0",
+      "12793:5:0",
       "8553:5:0"
     ],
     [
-      "12796:7:0",
+      "12800:7:0",
       "8560:7:0"
     ],
     [
-      "12805:40:0",
+      "12809:40:0",
       "8569:40:0"
     ],
     [
-      "12805:27:0",
+      "12809:27:0",
       "8569:27:0"
     ],
     [
-      "12805:18:0",
+      "12809:18:0",
       "8569:18:0"
     ],
     [
-      "12805:11:0",
+      "12809:11:0",
       "8569:11:0"
     ],
     [
-      "12817:5:0",
+      "12821:5:0",
       "8581:5:0"
     ],
     [
-      "12824:7:0",
+      "12828:7:0",
       "8588:7:0"
     ],
     [
-      "12835:10:0",
+      "12839:10:0",
       "8599:10:0"
     ],
     [
-      "12856:11:0",
+      "12860:11:0",
       "8620:11:0"
     ],
     [
-      "12863:4:0",
+      "12867:4:0",
       "8627:4:0"
     ],
     [
-      "13399:437:0",
+      "13403:438:0",
       "9125:429:0"
     ],
     [
-      "13441:42:0",
+      "13445:42:0",
       "9151:42:0"
     ],
     [
-      "13442:15:0",
+      "13446:15:0",
       "9152:15:0"
     ],
     [
-      "13442:7:0",
+      "13446:7:0",
       "9152:7:0"
     ],
     [
-      "13459:23:0",
+      "13463:23:0",
       "9169:23:0"
     ],
     [
-      "13459:7:0",
+      "13463:7:0",
       "9169:7:0"
     ],
     [
-      "13500:6:0",
+      "13505:6:0",
       "9217:6:0"
     ],
     [
-      "13501:4:0",
+      "13506:4:0",
       "9218:4:0"
     ],
     [
-      "13501:4:0",
+      "13506:4:0",
       "9218:4:0"
     ],
     [
-      "13507:329:0",
+      "13512:329:0",
       "9224:330:0"
     ],
     [
-      "13517:28:0",
+      "13522:28:0",
       "9234:28:0"
     ],
     [
-      "13517:13:0",
+      "13522:13:0",
       "9234:13:0"
     ],
     [
-      "13517:7:0",
+      "13522:7:0",
       "9234:7:0"
     ],
     [
-      "13533:12:0",
+      "13538:12:0",
       "9250:12:0"
     ],
     [
-      "13533:10:0",
+      "13538:10:0",
       "9250:10:0"
     ],
     [
-      "13555:54:0",
+      "13560:54:0",
       "9272:54:0"
     ],
     [
-      "13555:24:0",
+      "13560:24:0",
       "9272:24:0"
     ],
     [
-      "13555:7:0",
+      "13560:7:0",
       "9272:7:0"
     ],
     [
-      "13582:27:0",
+      "13587:27:0",
       "9299:27:0"
     ],
     [
-      "13582:18:0",
+      "13587:18:0",
       "9299:18:0"
     ],
     [
-      "13582:11:0",
+      "13587:11:0",
       "9299:11:0"
     ],
     [
-      "13594:5:0",
+      "13599:5:0",
       "9311:5:0"
     ],
     [
-      "13601:7:0",
+      "13606:7:0",
       "9318:7:0"
     ],
     [
-      "13619:85:0",
+      "13624:85:0",
       "9336:85:0"
     ],
     [
-      "13619:85:0",
+      "13624:85:0",
       "9336:85:0"
     ],
     [
-      "13619:7:0",
+      "13624:7:0",
       "9336:7:0"
     ],
     [
-      "13627:35:0",
+      "13632:35:0",
       "9344:35:0"
     ],
     [
-      "13627:16:0",
+      "13632:16:0",
       "9344:16:0"
     ],
     [
-      "13647:15:0",
+      "13652:15:0",
       "9364:15:0"
     ],
     [
-      "13664:39:0",
+      "13669:39:0",
       "9381:39:0"
     ],
     [
-      "13714:95:0",
+      "13719:95:0",
       "9431:95:0"
     ],
     [
-      "13738:60:0",
+      "13743:60:0",
       "9455:60:0"
     ],
     [
-      "13738:60:0",
+      "13743:60:0",
       "9455:60:0"
     ],
     [
-      "13738:8:0",
+      "13743:8:0",
       "9455:8:0"
     ],
     [
-      "13747:5:0",
+      "13752:5:0",
       "9464:5:0"
     ],
     [
-      "13754:7:0",
+      "13759:7:0",
       "9471:7:0"
     ],
     [
-      "13763:34:0",
+      "13768:34:0",
       "9480:34:0"
     ],
     [
-      "13763:16:0",
+      "13768:16:0",
       "9480:16:0"
     ],
     [
-      "13782:15:0",
+      "13787:15:0",
       "9499:15:0"
     ],
     [
-      "13818:11:0",
+      "13823:11:0",
       "9536:11:0"
     ],
     [
-      "13825:4:0",
+      "13830:4:0",
       "9543:4:0"
     ],
     [
-      "14271:617:0",
+      "14276:617:0",
       "10017:651:0"
     ],
     [
-      "14289:42:0",
+      "14294:42:0",
       "10035:72:0"
     ],
     [
-      "14290:12:0",
+      "14295:12:0",
       "10045:12:0"
     ],
     [
-      "14290:7:0",
+      "14295:7:0",
       "10045:7:0"
     ],
     [
-      "14304:10:0",
+      "14309:10:0",
       "10067:10:0"
     ],
     [
-      "14304:7:0",
+      "14309:7:0",
       "10067:7:0"
     ],
     [
-      "14316:14:0",
+      "14321:14:0",
       "10087:14:0"
     ],
     [
-      "14316:7:0",
+      "14321:7:0",
       "10087:7:0"
     ],
     [
-      "14349:539:0",
+      "14354:539:0",
       "10125:543:0"
     ],
     [
-      "14359:68:0",
+      "14364:68:0",
       "10135:68:0"
     ],
     [
-      "14359:68:0",
+      "14364:68:0",
       "10135:68:0"
     ],
     [
-      "14359:7:0",
+      "14364:7:0",
       "10135:7:0"
     ],
     [
-      "14367:18:0",
+      "14372:18:0",
       "10143:18:0"
     ],
     [
-      "14367:4:0",
+      "14372:4:0",
       "10143:4:0"
     ],
     [
-      "14375:10:0",
+      "14380:10:0",
       "10151:10:0"
     ],
     [
-      "14375:7:0",
+      "14380:7:0",
       "10151:7:0"
     ],
     [
-      "14375:7:0",
+      "14380:7:0",
       "10151:7:0"
     ],
     [
-      "14383:1:0",
+      "14388:1:0",
       "10159:1:0"
     ],
     [
-      "14387:39:0",
+      "14392:39:0",
       "10163:39:0"
     ],
     [
-      "14437:64:0",
+      "14442:64:0",
       "10213:64:0"
     ],
     [
-      "14437:64:0",
+      "14442:64:0",
       "10213:64:0"
     ],
     [
-      "14437:7:0",
+      "14442:7:0",
       "10213:7:0"
     ],
     [
-      "14445:16:0",
+      "14450:16:0",
       "10221:16:0"
     ],
     [
-      "14445:2:0",
+      "14450:2:0",
       "10221:2:0"
     ],
     [
-      "14451:10:0",
+      "14456:10:0",
       "10227:10:0"
     ],
     [
-      "14451:7:0",
+      "14456:7:0",
       "10227:7:0"
     ],
     [
-      "14451:7:0",
+      "14456:7:0",
       "10227:7:0"
     ],
     [
-      "14459:1:0",
+      "14464:1:0",
       "10235:1:0"
     ],
     [
-      "14463:37:0",
+      "14468:37:0",
       "10239:37:0"
     ],
     [
-      "14511:38:0",
+      "14516:38:0",
       "10288:38:0"
     ],
     [
-      "14511:38:0",
+      "14516:38:0",
       "10288:38:0"
     ],
     [
-      "14511:20:0",
+      "14516:20:0",
       "10288:20:0"
     ],
     [
-      "14532:4:0",
+      "14537:4:0",
       "10309:4:0"
     ],
     [
-      "14538:2:0",
+      "14543:2:0",
       "10315:2:0"
     ],
     [
-      "14542:6:0",
+      "14547:6:0",
       "10319:6:0"
     ],
     [
-      "14559:37:0",
+      "14564:37:0",
       "10337:37:0"
     ],
     [
-      "14559:19:0",
+      "14564:19:0",
       "10337:19:0"
     ],
     [
-      "14559:7:0",
+      "14564:7:0",
       "10337:7:0"
     ],
     [
-      "14581:15:0",
+      "14586:15:0",
       "10359:15:0"
     ],
     [
-      "14581:9:0",
+      "14586:9:0",
       "10359:9:0"
     ],
     [
-      "14591:4:0",
+      "14596:4:0",
       "10369:4:0"
     ],
     [
-      "14606:72:0",
+      "14611:72:0",
       "10384:72:0"
     ],
     [
-      "14606:72:0",
+      "14611:72:0",
       "10384:72:0"
     ],
     [
-      "14606:7:0",
+      "14611:7:0",
       "10384:7:0"
     ],
     [
-      "14614:21:0",
+      "14619:21:0",
       "10392:21:0"
     ],
     [
-      "14614:11:0",
+      "14619:11:0",
       "10392:11:0"
     ],
     [
-      "14629:6:0",
+      "14634:6:0",
       "10407:6:0"
     ],
     [
-      "14637:40:0",
+      "14642:40:0",
       "10415:40:0"
     ],
     [
-      "14688:73:0",
+      "14693:73:0",
       "10466:73:0"
     ],
     [
-      "14712:38:0",
+      "14717:38:0",
       "10490:38:0"
     ],
     [
-      "14712:38:0",
+      "14717:38:0",
       "10490:38:0"
     ],
     [
-      "14712:15:0",
+      "14717:15:0",
       "10490:15:0"
     ],
     [
-      "14712:9:0",
+      "14717:9:0",
       "10490:9:0"
     ],
     [
-      "14722:4:0",
+      "14727:4:0",
       "10500:4:0"
     ],
     [
-      "14730:20:0",
+      "14735:20:0",
       "10508:20:0"
     ],
     [
-      "14730:11:0",
+      "14735:11:0",
       "10508:11:0"
     ],
     [
-      "14744:6:0",
+      "14749:6:0",
       "10522:6:0"
     ],
     [
-      "14770:23:0",
+      "14775:23:0",
       "10548:23:0"
     ],
     [
-      "14770:23:0",
+      "14775:23:0",
       "10548:23:0"
     ],
     [
-      "14770:13:0",
+      "14775:13:0",
       "10548:13:0"
     ],
     [
-      "14770:9:0",
+      "14775:9:0",
       "10548:9:0"
     ],
     [
-      "14780:2:0",
+      "14785:2:0",
       "10558:2:0"
     ],
     [
-      "14787:6:0",
+      "14792:6:0",
       "10565:6:0"
     ],
     [
-      "14803:31:0",
+      "14808:31:0",
       "10582:31:0"
     ],
     [
-      "14808:26:0",
+      "14813:26:0",
       "10587:26:0"
     ],
     [
-      "14808:8:0",
+      "14813:8:0",
       "10587:8:0"
     ],
     [
-      "14817:4:0",
+      "14822:4:0",
       "10596:4:0"
     ],
     [
-      "14823:2:0",
+      "14828:2:0",
       "10602:2:0"
     ],
     [
-      "14827:6:0",
+      "14832:6:0",
       "10606:6:0"
     ],
     [
-      "14844:37:0",
+      "14849:37:0",
       "10624:37:0"
     ],
     [
-      "14844:37:0",
+      "14849:37:0",
       "10624:37:0"
     ],
     [
-      "14844:19:0",
+      "14849:19:0",
       "10624:19:0"
     ],
     [
-      "14864:4:0",
+      "14869:4:0",
       "10644:4:0"
     ],
     [
-      "14870:2:0",
+      "14875:2:0",
       "10650:2:0"
     ],
     [
-      "14874:6:0",
+      "14879:6:0",
       "10654:6:0"
     ],
     [
-      "15143:386:0",
+      "15148:386:0",
       "10944:389:0"
     ],
     [
-      "15157:33:0",
+      "15162:33:0",
       "10958:33:0"
     ],
     [
-      "15158:15:0",
+      "15163:15:0",
       "10959:15:0"
     ],
     [
-      "15158:7:0",
+      "15163:7:0",
       "10959:7:0"
     ],
     [
-      "15175:14:0",
+      "15180:14:0",
       "10976:14:0"
     ],
     [
-      "15175:7:0",
+      "15180:7:0",
       "10976:7:0"
     ],
     [
-      "15208:321:0",
+      "15213:321:0",
       "11009:324:0"
     ],
     [
-      "15218:65:0",
+      "15223:65:0",
       "11019:65:0"
     ],
     [
-      "15218:65:0",
+      "15223:65:0",
       "11019:65:0"
     ],
     [
-      "15218:7:0",
+      "15223:7:0",
       "11019:7:0"
     ],
     [
-      "15226:21:0",
+      "15231:21:0",
       "11027:21:0"
     ],
     [
-      "15226:7:0",
+      "15231:7:0",
       "11027:7:0"
     ],
     [
-      "15237:10:0",
+      "15242:10:0",
       "11038:10:0"
     ],
     [
-      "15237:7:0",
+      "15242:7:0",
       "11038:7:0"
     ],
     [
-      "15237:7:0",
+      "15242:7:0",
       "11038:7:0"
     ],
     [
-      "15245:1:0",
+      "15250:1:0",
       "11046:1:0"
     ],
     [
-      "15249:33:0",
+      "15254:33:0",
       "11050:33:0"
     ],
     [
-      "15293:49:0",
+      "15298:49:0",
       "11095:49:0"
     ],
     [
-      "15293:49:0",
+      "15298:49:0",
       "11095:49:0"
     ],
     [
-      "15293:20:0",
+      "15298:20:0",
       "11095:20:0"
     ],
     [
-      "15314:10:0",
+      "15319:10:0",
       "11116:10:0"
     ],
     [
-      "15314:7:0",
+      "15319:7:0",
       "11116:7:0"
     ],
     [
-      "15314:7:0",
+      "15319:7:0",
       "11116:7:0"
     ],
     [
-      "15322:1:0",
+      "15327:1:0",
       "11124:1:0"
     ],
     [
-      "15326:7:0",
+      "15331:7:0",
       "11128:7:0"
     ],
     [
-      "15335:6:0",
+      "15340:6:0",
       "11137:6:0"
     ],
     [
-      "15352:22:0",
+      "15357:22:0",
       "11155:22:0"
     ],
     [
-      "15352:22:0",
+      "15357:22:0",
       "11155:22:0"
     ],
     [
-      "15352:12:0",
+      "15357:12:0",
       "11155:12:0"
     ],
     [
-      "15368:6:0",
+      "15373:6:0",
       "11171:6:0"
     ],
     [
-      "15384:28:0",
+      "15389:28:0",
       "11187:28:0"
     ],
     [
-      "15384:28:0",
+      "15389:28:0",
       "11187:28:0"
     ],
     [
-      "15384:18:0",
+      "15389:18:0",
       "11187:18:0"
     ],
     [
-      "15384:9:0",
+      "15389:9:0",
       "11187:9:0"
     ],
     [
-      "15394:7:0",
+      "15399:7:0",
       "11197:7:0"
     ],
     [
-      "15406:6:0",
+      "15411:6:0",
       "11209:6:0"
     ],
     [
-      "15422:42:0",
+      "15427:42:0",
       "11225:42:0"
     ],
     [
-      "15427:37:0",
+      "15432:37:0",
       "11230:37:0"
     ],
     [
-      "15427:8:0",
+      "15432:8:0",
       "11230:8:0"
     ],
     [
-      "15436:10:0",
+      "15441:10:0",
       "11239:10:0"
     ],
     [
-      "15436:7:0",
+      "15441:7:0",
       "11239:7:0"
     ],
     [
-      "15436:7:0",
+      "15441:7:0",
       "11239:7:0"
     ],
     [
-      "15444:1:0",
+      "15449:1:0",
       "11247:1:0"
     ],
     [
-      "15448:7:0",
+      "15453:7:0",
       "11251:7:0"
     ],
     [
-      "15457:6:0",
+      "15462:6:0",
       "11260:6:0"
     ],
     [
-      "15474:48:0",
+      "15479:48:0",
       "11278:48:0"
     ],
     [
-      "15474:48:0",
+      "15479:48:0",
       "11278:48:0"
     ],
     [
-      "15474:19:0",
+      "15479:19:0",
       "11278:19:0"
     ],
     [
-      "15494:10:0",
+      "15499:10:0",
       "11298:10:0"
     ],
     [
-      "15494:7:0",
+      "15499:7:0",
       "11298:7:0"
     ],
     [
-      "15494:7:0",
+      "15499:7:0",
       "11298:7:0"
     ],
     [
-      "15502:1:0",
+      "15507:1:0",
       "11306:1:0"
     ],
     [
-      "15506:7:0",
+      "15511:7:0",
       "11310:7:0"
     ],
     [
-      "15515:6:0",
+      "15520:6:0",
       "11319:6:0"
     ],
     [
-      "15824:572:0",
+      "15829:572:0",
       "11653:576:0"
     ],
     [
-      "15838:33:0",
+      "15843:33:0",
       "11667:33:0"
     ],
     [
-      "15839:15:0",
+      "15844:15:0",
       "11668:15:0"
     ],
     [
-      "15839:7:0",
+      "15844:7:0",
       "11668:7:0"
     ],
     [
-      "15856:14:0",
+      "15861:14:0",
       "11685:14:0"
     ],
     [
-      "15856:7:0",
+      "15861:7:0",
       "11685:7:0"
     ],
     [
-      "15889:507:0",
+      "15894:507:0",
       "11718:511:0"
     ],
     [
-      "15899:67:0",
+      "15904:67:0",
       "11728:67:0"
     ],
     [
-      "15899:67:0",
+      "15904:67:0",
       "11728:67:0"
     ],
     [
-      "15899:7:0",
+      "15904:7:0",
       "11728:7:0"
     ],
     [
-      "15907:21:0",
+      "15912:21:0",
       "11736:21:0"
     ],
     [
-      "15907:7:0",
+      "15912:7:0",
       "11736:7:0"
     ],
     [
-      "15918:10:0",
+      "15923:10:0",
       "11747:10:0"
     ],
     [
-      "15918:7:0",
+      "15923:7:0",
       "11747:7:0"
     ],
     [
-      "15918:7:0",
+      "15923:7:0",
       "11747:7:0"
     ],
     [
-      "15926:1:0",
+      "15931:1:0",
       "11755:1:0"
     ],
     [
-      "15930:35:0",
+      "15935:35:0",
       "11759:35:0"
     ],
     [
-      "15976:49:0",
+      "15981:49:0",
       "11806:49:0"
     ],
     [
-      "15976:49:0",
+      "15981:49:0",
       "11806:49:0"
     ],
     [
-      "15976:20:0",
+      "15981:20:0",
       "11806:20:0"
     ],
     [
-      "15997:7:0",
+      "16002:7:0",
       "11827:7:0"
     ],
     [
-      "16006:10:0",
+      "16011:10:0",
       "11836:10:0"
     ],
     [
-      "16006:7:0",
+      "16011:7:0",
       "11836:7:0"
     ],
     [
-      "16006:7:0",
+      "16011:7:0",
       "11836:7:0"
     ],
     [
-      "16014:1:0",
+      "16019:1:0",
       "11844:1:0"
     ],
     [
-      "16018:6:0",
+      "16023:6:0",
       "11848:6:0"
     ],
     [
-      "16035:43:0",
+      "16040:43:0",
       "11866:43:0"
     ],
     [
-      "16035:22:0",
+      "16040:22:0",
       "11866:22:0"
     ],
     [
-      "16035:7:0",
+      "16040:7:0",
       "11866:7:0"
     ],
     [
-      "16060:18:0",
+      "16065:18:0",
       "11891:18:0"
     ],
     [
-      "16060:9:0",
+      "16065:9:0",
       "11891:9:0"
     ],
     [
-      "16070:7:0",
+      "16075:7:0",
       "11901:7:0"
     ],
     [
-      "16088:71:0",
+      "16093:71:0",
       "11919:71:0"
     ],
     [
-      "16088:71:0",
+      "16093:71:0",
       "11919:71:0"
     ],
     [
-      "16088:7:0",
+      "16093:7:0",
       "11919:7:0"
     ],
     [
-      "16096:24:0",
+      "16101:24:0",
       "11927:24:0"
     ],
     [
-      "16096:14:0",
+      "16101:14:0",
       "11927:14:0"
     ],
     [
-      "16114:6:0",
+      "16119:6:0",
       "11945:6:0"
     ],
     [
-      "16122:36:0",
+      "16127:36:0",
       "11953:36:0"
     ],
     [
-      "16169:79:0",
+      "16174:79:0",
       "12000:79:0"
     ],
     [
-      "16193:44:0",
+      "16198:44:0",
       "12024:44:0"
     ],
     [
-      "16193:44:0",
+      "16198:44:0",
       "12024:44:0"
     ],
     [
-      "16193:18:0",
+      "16198:18:0",
       "12024:18:0"
     ],
     [
-      "16193:9:0",
+      "16198:9:0",
       "12024:9:0"
     ],
     [
-      "16203:7:0",
+      "16208:7:0",
       "12034:7:0"
     ],
     [
-      "16214:23:0",
+      "16219:23:0",
       "12045:23:0"
     ],
     [
-      "16214:14:0",
+      "16219:14:0",
       "12045:14:0"
     ],
     [
-      "16231:6:0",
+      "16236:6:0",
       "12062:6:0"
     ],
     [
-      "16257:22:0",
+      "16262:22:0",
       "12088:22:0"
     ],
     [
-      "16257:22:0",
+      "16262:22:0",
       "12088:22:0"
     ],
     [
-      "16257:12:0",
+      "16262:12:0",
       "12088:12:0"
     ],
     [
-      "16273:6:0",
+      "16278:6:0",
       "12104:6:0"
     ],
     [
-      "16289:42:0",
+      "16294:42:0",
       "12121:42:0"
     ],
     [
-      "16294:37:0",
+      "16299:37:0",
       "12126:37:0"
     ],
     [
-      "16294:8:0",
+      "16299:8:0",
       "12126:8:0"
     ],
     [
-      "16303:7:0",
+      "16308:7:0",
       "12135:7:0"
     ],
     [
-      "16312:10:0",
+      "16317:10:0",
       "12144:10:0"
     ],
     [
-      "16312:7:0",
+      "16317:7:0",
       "12144:7:0"
     ],
     [
-      "16312:7:0",
+      "16317:7:0",
       "12144:7:0"
     ],
     [
-      "16320:1:0",
+      "16325:1:0",
       "12152:1:0"
     ],
     [
-      "16324:6:0",
+      "16329:6:0",
       "12156:6:0"
     ],
     [
-      "16341:48:0",
+      "16346:48:0",
       "12174:48:0"
     ],
     [
-      "16341:48:0",
+      "16346:48:0",
       "12174:48:0"
     ],
     [
-      "16341:19:0",
+      "16346:19:0",
       "12174:19:0"
     ],
     [
-      "16361:7:0",
+      "16366:7:0",
       "12194:7:0"
     ],
     [
-      "16370:10:0",
+      "16375:10:0",
       "12203:10:0"
     ],
     [
-      "16370:7:0",
+      "16375:7:0",
       "12203:7:0"
     ],
     [
-      "16370:7:0",
+      "16375:7:0",
       "12203:7:0"
     ],
     [
-      "16378:1:0",
+      "16383:1:0",
       "12211:1:0"
     ],
     [
-      "16382:6:0",
+      "16387:6:0",
       "12215:6:0"
     ],
     [
-      "16789:339:0",
+      "16794:339:0",
       "12652:370:0"
     ],
     [
-      "16806:48:0",
+      "16811:48:0",
       "12669:78:0"
     ],
     [
-      "16807:13:0",
+      "16812:13:0",
       "12679:13:0"
     ],
     [
-      "16807:7:0",
+      "16812:7:0",
       "12679:7:0"
     ],
     [
-      "16822:15:0",
+      "16827:15:0",
       "12702:15:0"
     ],
     [
-      "16822:7:0",
+      "16827:7:0",
       "12702:7:0"
     ],
     [
-      "16839:14:0",
+      "16844:14:0",
       "12727:14:0"
     ],
     [
-      "16839:7:0",
+      "16844:7:0",
       "12727:7:0"
     ],
     [
-      "16872:256:0",
+      "16877:256:0",
       "12765:257:0"
     ],
     [
-      "16882:68:0",
+      "16887:68:0",
       "12775:68:0"
     ],
     [
-      "16882:68:0",
+      "16887:68:0",
       "12775:68:0"
     ],
     [
-      "16882:7:0",
+      "16887:7:0",
       "12775:7:0"
     ],
     [
-      "16890:19:0",
+      "16895:19:0",
       "12783:19:0"
     ],
     [
-      "16890:5:0",
+      "16895:5:0",
       "12783:5:0"
     ],
     [
-      "16899:10:0",
+      "16904:10:0",
       "12792:10:0"
     ],
     [
-      "16899:7:0",
+      "16904:7:0",
       "12792:7:0"
     ],
     [
-      "16899:7:0",
+      "16904:7:0",
       "12792:7:0"
     ],
     [
-      "16907:1:0",
+      "16912:1:0",
       "12800:1:0"
     ],
     [
-      "16911:38:0",
+      "16916:38:0",
       "12804:38:0"
     ],
     [
-      "16960:68:0",
+      "16965:68:0",
       "12853:68:0"
     ],
     [
-      "16960:68:0",
+      "16965:68:0",
       "12853:68:0"
     ],
     [
-      "16960:7:0",
+      "16965:7:0",
       "12853:7:0"
     ],
     [
-      "16968:21:0",
+      "16973:21:0",
       "12861:21:0"
     ],
     [
-      "16968:7:0",
+      "16973:7:0",
       "12861:7:0"
     ],
     [
-      "16979:10:0",
+      "16984:10:0",
       "12872:10:0"
     ],
     [
-      "16979:7:0",
+      "16984:7:0",
       "12872:7:0"
     ],
     [
-      "16979:7:0",
+      "16984:7:0",
       "12872:7:0"
     ],
     [
-      "16987:1:0",
+      "16992:1:0",
       "12880:1:0"
     ],
     [
-      "16991:36:0",
+      "16996:36:0",
       "12884:36:0"
     ],
     [
-      "17038:36:0",
+      "17043:36:0",
       "12932:36:0"
     ],
     [
-      "17038:36:0",
+      "17043:36:0",
       "12932:36:0"
     ],
     [
-      "17038:27:0",
+      "17043:27:0",
       "12932:27:0"
     ],
     [
-      "17038:18:0",
+      "17043:18:0",
       "12932:18:0"
     ],
     [
-      "17038:11:0",
+      "17043:11:0",
       "12932:11:0"
     ],
     [
-      "17050:5:0",
+      "17055:5:0",
       "12944:5:0"
     ],
     [
-      "17057:7:0",
+      "17062:7:0",
       "12951:7:0"
     ],
     [
-      "17068:6:0",
+      "17073:6:0",
       "12962:6:0"
     ],
     [
-      "17084:37:0",
+      "17089:37:0",
       "12978:37:0"
     ],
     [
-      "17089:32:0",
+      "17094:32:0",
       "12983:32:0"
     ],
     [
-      "17089:8:0",
+      "17094:8:0",
       "12983:8:0"
     ],
     [
-      "17098:5:0",
+      "17103:5:0",
       "12992:5:0"
     ],
     [
-      "17105:7:0",
+      "17110:7:0",
       "12999:7:0"
     ],
     [
-      "17114:6:0",
+      "17119:6:0",
       "13008:6:0"
     ],
     [
-      "17383:411:0",
+      "17388:411:0",
       "13299:441:0"
     ],
     [
-      "17407:48:0",
+      "17412:48:0",
       "13323:78:0"
     ],
     [
-      "17408:13:0",
+      "17413:13:0",
       "13333:13:0"
     ],
     [
-      "17408:7:0",
+      "17413:7:0",
       "13333:7:0"
     ],
     [
-      "17423:15:0",
+      "17428:15:0",
       "13356:15:0"
     ],
     [
-      "17423:7:0",
+      "17428:7:0",
       "13356:7:0"
     ],
     [
-      "17440:14:0",
+      "17445:14:0",
       "13381:14:0"
     ],
     [
-      "17440:7:0",
+      "17445:7:0",
       "13381:7:0"
     ],
     [
-      "17473:321:0",
+      "17478:321:0",
       "13419:321:0"
     ],
     [
-      "17483:52:0",
+      "17488:52:0",
       "13429:52:0"
     ],
     [
-      "17483:24:0",
+      "17488:24:0",
       "13429:24:0"
     ],
     [
-      "17483:7:0",
+      "17488:7:0",
       "13429:7:0"
     ],
     [
-      "17510:25:0",
+      "17515:25:0",
       "13456:25:0"
     ],
     [
-      "17510:9:0",
+      "17515:9:0",
       "13456:9:0"
     ],
     [
-      "17520:5:0",
+      "17525:5:0",
       "13466:5:0"
     ],
     [
-      "17527:7:0",
+      "17532:7:0",
       "13473:7:0"
     ],
     [
-      "17545:243:0",
+      "17550:243:0",
       "13491:243:0"
     ],
     [
-      "17549:37:0",
+      "17554:37:0",
       "13495:37:0"
     ],
     [
-      "17549:16:0",
+      "17554:16:0",
       "13495:16:0"
     ],
     [
-      "17569:17:0",
+      "17574:17:0",
       "13515:17:0"
     ],
     [
-      "17569:13:0",
+      "17574:13:0",
       "13515:13:0"
     ],
     [
-      "17569:4:0",
+      "17574:4:0",
       "13515:4:0"
     ],
     [
-      "17574:7:0",
+      "17579:7:0",
       "13520:7:0"
     ],
     [
-      "17574:7:0",
+      "17579:7:0",
       "13520:7:0"
     ],
     [
-      "17588:200:0",
+      "17593:200:0",
       "13534:200:0"
     ],
     [
-      "17602:68:0",
+      "17607:68:0",
       "13548:68:0"
     ],
     [
-      "17602:68:0",
+      "17607:68:0",
       "13548:68:0"
     ],
     [
-      "17602:7:0",
+      "17607:7:0",
       "13548:7:0"
     ],
     [
-      "17610:26:0",
+      "17615:26:0",
       "13556:26:0"
     ],
     [
-      "17610:16:0",
+      "17615:16:0",
       "13556:16:0"
     ],
     [
-      "17630:6:0",
+      "17635:6:0",
       "13576:6:0"
     ],
     [
-      "17638:31:0",
+      "17643:31:0",
       "13584:31:0"
     ],
     [
-      "17684:94:0",
+      "17689:94:0",
       "13630:94:0"
     ],
     [
-      "17712:51:0",
+      "17717:51:0",
       "13658:51:0"
     ],
     [
-      "17712:51:0",
+      "17717:51:0",
       "13658:51:0"
     ],
     [
-      "17712:8:0",
+      "17717:8:0",
       "13658:8:0"
     ],
     [
-      "17721:5:0",
+      "17726:5:0",
       "13667:5:0"
     ],
     [
-      "17728:7:0",
+      "17733:7:0",
       "13674:7:0"
     ],
     [
-      "17737:25:0",
+      "17742:25:0",
       "13683:25:0"
     ],
     [
-      "17737:16:0",
+      "17742:16:0",
       "13683:16:0"
     ],
     [
-      "17756:6:0",
+      "17761:6:0",
       "13702:6:0"
     ],
     [
-      "18359:91:0",
+      "18364:91:0",
       "14324:121:0"
     ],
     [
-      "18388:42:0",
+      "18393:42:0",
       "14353:72:0"
     ],
     [
-      "18389:12:0",
+      "18394:12:0",
       "14363:12:0"
     ],
     [
-      "18389:7:0",
+      "18394:7:0",
       "14363:7:0"
     ],
     [
-      "18403:10:0",
+      "18408:10:0",
       "14385:10:0"
     ],
     [
-      "18403:7:0",
+      "18408:7:0",
       "14385:7:0"
     ],
     [
-      "18415:14:0",
+      "18420:14:0",
       "14405:14:0"
     ],
     [
-      "18415:7:0",
+      "18420:7:0",
       "14405:7:0"
     ],
     [
-      "18448:2:0",
+      "18453:2:0",
       "14443:2:0"
     ],
     [
-      "19019:90:0",
+      "19024:90:0",
       "15033:120:0"
     ],
     [
-      "19047:42:0",
+      "19052:42:0",
       "15061:72:0"
     ],
     [
-      "19048:12:0",
+      "19053:12:0",
       "15071:12:0"
     ],
     [
-      "19048:7:0",
+      "19053:7:0",
       "15071:7:0"
     ],
     [
-      "19062:10:0",
+      "19067:10:0",
       "15093:10:0"
     ],
     [
-      "19062:7:0",
+      "19067:7:0",
       "15093:7:0"
     ],
     [
-      "19074:14:0",
+      "19079:14:0",
       "15113:14:0"
     ],
     [
-      "19074:7:0",
+      "19079:7:0",
       "15113:7:0"
     ],
     [
-      "19107:2:0",
+      "19112:2:0",
       "15151:2:0"
     ],
     [
-      "19553:879:0",
+      "19558:879:0",
       "78:34:2"
     ],
     [
-      "19578:5:0",
+      "19583:5:0",
       "103:5:2"
     ],
     [
-      "19578:5:0",
+      "19583:5:0",
       "103:5:2"
     ],
     [
-      "19754:7:0",
+      "19759:7:0",
       "62:15:2"
     ]
   ],
   "otherInstrumentation": [
-    "19409:50:0",
-    "19469:52:0",
+    "19414:50:0",
+    "19474:52:0",
     "2830:22:0",
     "2949:33:0",
     "3037:8:0",
@@ -2566,30 +2566,30 @@
     "9994:43:0",
     "10101:72:0",
     "10183:71:0",
-    "10738:10:0",
-    "10921:48:0",
-    "10785:73:0",
-    "10868:43:0",
-    "10979:72:0",
-    "11061:71:0",
-    "11445:10:0",
-    "11628:54:0",
-    "11492:73:0",
-    "11575:43:0",
-    "11692:72:0",
-    "11774:71:0",
-    "12208:10:0",
-    "12391:62:0",
-    "12255:73:0",
-    "12338:43:0",
-    "12463:72:0",
-    "12545:71:0",
-    "12973:10:0",
-    "13156:67:0",
-    "13020:73:0",
-    "13103:43:0",
-    "13233:72:0",
-    "13315:71:0",
+    "10739:10:0",
+    "10922:48:0",
+    "10786:73:0",
+    "10869:43:0",
+    "10980:72:0",
+    "11062:71:0",
+    "11447:10:0",
+    "11630:54:0",
+    "11494:73:0",
+    "11577:43:0",
+    "11694:72:0",
+    "11776:71:0",
+    "12211:10:0",
+    "12394:62:0",
+    "12258:73:0",
+    "12341:43:0",
+    "12466:72:0",
+    "12548:71:0",
+    "12977:10:0",
+    "13160:67:0",
+    "13024:73:0",
+    "13107:43:0",
+    "13237:72:0",
+    "13319:71:0",
     "4378:52:0",
     "4837:22:0",
     "4956:33:0",
@@ -2604,17 +2604,17 @@
     "5783:8:0",
     "5803:113:0",
     "5978:110:0",
-    "20074:48:0",
-    "20132:50:0",
-    "20192:52:0",
-    "20281:43:0",
-    "20334:35:0",
-    "20379:44:0",
+    "20079:48:0",
+    "20137:50:0",
+    "20197:52:0",
+    "20286:43:0",
+    "20339:35:0",
+    "20384:44:0",
     "9886:15:0",
-    "10760:15:0",
-    "11467:15:0",
-    "12230:15:0",
-    "12995:15:0"
+    "10761:15:0",
+    "11469:15:0",
+    "12233:15:0",
+    "12999:15:0"
   ],
   "propertyMap": [
     {
@@ -2630,15 +2630,15 @@
       "debugEventEncoding": [],
       "message": "",
       "instrumentationRanges": [
-        "19781:67:0",
-        "19750:144:0"
+        "19786:67:0",
+        "19755:144:0"
       ],
       "checkRanges": [
-        "19754:7:0"
+        "19759:7:0"
       ],
       "assertionRanges": [
-        "19781:67:0",
-        "19866:13:0"
+        "19786:67:0",
+        "19871:13:0"
       ]
     }
   ],
@@ -2650,5 +2650,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/node_modules_erc20_3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected b/test/multifile_samples/node_modules_erc20_3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
index eb7b9003..cabf7b36 100644
--- a/test/multifile_samples/node_modules_erc20_3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
+++ b/test/multifile_samples/node_modules_erc20_3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol.instrumented.expected
@@ -153,7 +153,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transfer(address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transfer(address to, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _transfer(owner, to, amount);
         return true;
@@ -173,7 +173,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_approve(address spender, uint256 amount) private returns (bool) {
+    function _original_ERC20_approve(address spender, uint256 amount) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, amount);
         return true;
@@ -188,7 +188,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_transferFrom(address from, address to, uint256 amount) private returns (bool) {
+    function _original_ERC20_transferFrom(address from, address to, uint256 amount) internal returns (bool) {
         address spender = _msgSender();
         _spendAllowance(from, spender, amount);
         _transfer(from, to, amount);
@@ -204,7 +204,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) private returns (bool) {
+    function _original_ERC20_increaseAllowance(address spender, uint256 addedValue) internal returns (bool) {
         address owner = _msgSender();
         _approve(owner, spender, _allowances[owner][spender] + addedValue);
         return true;
@@ -219,7 +219,7 @@ contract ERC20 is Context, IERC20 {
         __ScribbleUtilsLib__657.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) private returns (bool) {
+    function _original_ERC20_decreaseAllowance(address spender, uint256 subtractedValue) internal returns (bool) {
         address owner = _msgSender();
         uint256 currentAllowance = _allowances[owner][spender];
         require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero");
diff --git a/test/multifile_samples/proj1/child1.sol.instrumented.expected b/test/multifile_samples/proj1/child1.sol.instrumented.expected
index 9956d033..43e70cc2 100644
--- a/test/multifile_samples/proj1/child1.sol.instrumented.expected
+++ b/test/multifile_samples/proj1/child1.sol.instrumented.expected
@@ -24,7 +24,7 @@ contract Child1 is Base {
         __ScribbleUtilsLib__25.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Child1_add(uint y) private {
+    function _original_Child1_add(uint y) internal {
         x += y;
     }
 
diff --git a/test/multifile_samples/proj1/child2.sol.instrumented.expected b/test/multifile_samples/proj1/child2.sol.instrumented.expected
index f067cf1a..9cc28a4e 100644
--- a/test/multifile_samples/proj1/child2.sol.instrumented.expected
+++ b/test/multifile_samples/proj1/child2.sol.instrumented.expected
@@ -24,7 +24,7 @@ contract Child2 is Base {
         __ScribbleUtilsLib__41.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Child2_double() private {
+    function _original_Child2_double() internal {
         x *= 2;
     }
 
diff --git a/test/multifile_samples/proj1/flat.sol.expected b/test/multifile_samples/proj1/flat.sol.expected
index e64c8d19..fb4d9419 100644
--- a/test/multifile_samples/proj1/flat.sol.expected
+++ b/test/multifile_samples/proj1/flat.sol.expected
@@ -124,7 +124,7 @@ contract Child1 is Base {
         __ScribbleUtilsLib__25.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Child1_add(uint y) private {
+    function _original_Child1_add(uint y) internal {
         x += y;
     }
 
@@ -157,14 +157,14 @@ contract Child2 is Base {
         _v.old_1 = x;
         _original_Child2_double();
         if (!(x == (2 * _v.old_1))) {
-            emit __ScribbleUtilsLib__41.AssertionFailed("004899:0068:000 2: P2");
+            emit __ScribbleUtilsLib__41.AssertionFailed("004900:0068:000 2: P2");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__41.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Child2_double() private {
+    function _original_Child2_double() internal {
         x *= 2;
     }
 
diff --git a/test/multifile_samples/proj1/instrumentationMetadata.json.expected b/test/multifile_samples/proj1/instrumentationMetadata.json.expected
index 012b91a0..96466ccf 100644
--- a/test/multifile_samples/proj1/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/proj1/instrumentationMetadata.json.expected
@@ -17,7 +17,7 @@
       "87:1:0"
     ],
     [
-      "3191:1451:0",
+      "3191:1452:0",
       "59:133:1"
     ],
     [
@@ -29,7 +29,7 @@
       "78:4:1"
     ],
     [
-      "3969:69:0",
+      "3969:70:0",
       "139:51:1"
     ],
     [
@@ -45,63 +45,63 @@
       "152:4:1"
     ],
     [
-      "4015:23:0",
+      "4016:23:0",
       "167:23:1"
     ],
     [
-      "4025:6:0",
+      "4026:6:0",
       "177:6:1"
     ],
     [
-      "4025:6:0",
+      "4026:6:0",
       "177:6:1"
     ],
     [
-      "4025:1:0",
+      "4026:1:0",
       "177:1:1"
     ],
     [
-      "4030:1:0",
+      "4031:1:0",
       "182:1:1"
     ],
     [
-      "4644:1444:0",
+      "4645:1445:0",
       "59:134:2"
     ],
     [
-      "4663:4:0",
+      "4664:4:0",
       "78:4:2"
     ],
     [
-      "4663:4:0",
+      "4664:4:0",
       "78:4:2"
     ],
     [
-      "5418:66:0",
+      "5419:67:0",
       "138:48:2"
     ],
     [
-      "5450:2:0",
+      "5451:2:0",
       "153:2:2"
     ],
     [
-      "5461:23:0",
+      "5463:23:0",
       "163:23:2"
     ],
     [
-      "5471:6:0",
+      "5473:6:0",
       "173:6:2"
     ],
     [
-      "5471:6:0",
+      "5473:6:0",
       "173:6:2"
     ],
     [
-      "5471:1:0",
+      "5473:1:0",
       "173:1:2"
     ],
     [
-      "5476:1:0",
+      "5478:1:0",
       "178:1:2"
     ],
     [
@@ -113,7 +113,7 @@
       "94:40:1"
     ],
     [
-      "5021:22:0",
+      "5022:22:0",
       "94:39:2"
     ]
   ],
@@ -127,38 +127,38 @@
     "829:41:0",
     "880:35:0",
     "925:42:0",
-    "4339:51:0",
-    "4400:49:0",
+    "4340:51:0",
+    "4401:49:0",
     "1931:22:0",
     "2050:33:0",
     "2138:8:0",
     "2158:113:0",
     "2333:110:0",
-    "4493:42:0",
-    "4545:35:0",
-    "4590:43:0",
+    "4494:42:0",
+    "4546:35:0",
+    "4591:43:0",
     "3532:23:0",
     "3376:72:0",
     "3458:42:0",
     "3804:72:0",
     "3886:70:0",
-    "5785:51:0",
-    "5846:49:0",
+    "5787:51:0",
+    "5848:49:0",
     "2669:22:0",
     "2788:33:0",
     "2876:8:0",
     "2896:113:0",
     "3071:110:0",
-    "5939:42:0",
-    "5991:35:0",
-    "6036:43:0",
-    "4982:25:0",
-    "4826:72:0",
-    "4908:42:0",
-    "5253:72:0",
-    "5335:70:0",
+    "5941:42:0",
+    "5993:35:0",
+    "6038:43:0",
+    "4983:25:0",
+    "4827:72:0",
+    "4909:42:0",
+    "5254:72:0",
+    "5336:70:0",
     "3351:15:0",
-    "4801:15:0"
+    "4802:15:0"
   ],
   "propertyMap": [
     {
@@ -260,18 +260,18 @@
       ],
       "message": "P2",
       "instrumentationRanges": [
-        "4960:12:0",
-        "5059:65:0",
-        "5138:68:0",
-        "5017:227:0"
+        "4961:12:0",
+        "5060:65:0",
+        "5139:68:0",
+        "5018:227:0"
       ],
       "checkRanges": [
-        "5021:22:0"
+        "5022:22:0"
       ],
       "assertionRanges": [
-        "5059:65:0",
-        "5138:68:0",
-        "5220:13:0"
+        "5060:65:0",
+        "5139:68:0",
+        "5221:13:0"
       ]
     }
   ],
@@ -283,5 +283,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/reexported_imports/instrumentationMetadata.json.expected b/test/multifile_samples/reexported_imports/instrumentationMetadata.json.expected
index 3fefa876..ea024fb3 100644
--- a/test/multifile_samples/reexported_imports/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/reexported_imports/instrumentationMetadata.json.expected
@@ -52,5 +52,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/reexported_imports_05/instrumentationMetadata.json.expected b/test/multifile_samples/reexported_imports_05/instrumentationMetadata.json.expected
index 8ce229e0..8f913f87 100644
--- a/test/multifile_samples/reexported_imports_05/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/reexported_imports_05/instrumentationMetadata.json.expected
@@ -316,5 +316,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/multifile_samples/using_for_free_funcs/flat.sol.expected b/test/multifile_samples/using_for_free_funcs/flat.sol.expected
index 664c3d84..5d46708f 100644
--- a/test/multifile_samples/using_for_free_funcs/flat.sol.expected
+++ b/test/multifile_samples/using_for_free_funcs/flat.sol.expected
@@ -37,7 +37,7 @@ contract Test {
         }
     }
 
-    function _original_Test_main() private returns (X) {
+    function _original_Test_main() internal returns (X) {
         X a = X.wrap(1);
         X b = X.wrap(2);
         return a.add_1(b);
diff --git a/test/multifile_samples/using_for_free_funcs/instrumentationMetadata.json.expected b/test/multifile_samples/using_for_free_funcs/instrumentationMetadata.json.expected
index f6e4d5cd..fcf3dfbe 100644
--- a/test/multifile_samples/using_for_free_funcs/instrumentationMetadata.json.expected
+++ b/test/multifile_samples/using_for_free_funcs/instrumentationMetadata.json.expected
@@ -337,11 +337,11 @@
       "239:1:1"
     ],
     [
-      "542:436:0",
+      "542:437:0",
       "215:167:0"
     ],
     [
-      "841:135:0",
+      "841:136:0",
       "262:118:0"
     ],
     [
@@ -349,107 +349,107 @@
       "275:2:0"
     ],
     [
-      "888:3:0",
+      "889:3:0",
       "293:3:0"
     ],
     [
-      "889:1:0",
+      "890:1:0",
       "294:1:0"
     ],
     [
-      "889:1:0",
+      "890:1:0",
       "294:1:0"
     ],
     [
-      "889:1:0",
+      "890:1:0",
       "294:1:0"
     ],
     [
-      "892:84:0",
+      "893:84:0",
       "297:83:0"
     ],
     [
-      "902:15:0",
+      "903:15:0",
       "307:15:0"
     ],
     [
-      "902:3:0",
+      "903:3:0",
       "307:3:0"
     ],
     [
-      "902:1:0",
+      "903:1:0",
       "307:1:0"
     ],
     [
-      "902:1:0",
+      "903:1:0",
       "307:1:0"
     ],
     [
-      "908:9:0",
+      "909:9:0",
       "313:9:0"
     ],
     [
-      "908:6:0",
+      "909:6:0",
       "313:6:0"
     ],
     [
-      "908:1:0",
+      "909:1:0",
       "313:1:0"
     ],
     [
-      "915:1:0",
+      "916:1:0",
       "320:1:0"
     ],
     [
-      "927:15:0",
+      "928:15:0",
       "332:15:0"
     ],
     [
-      "927:3:0",
+      "928:3:0",
       "332:3:0"
     ],
     [
-      "927:1:0",
+      "928:1:0",
       "332:1:0"
     ],
     [
-      "927:1:0",
+      "928:1:0",
       "332:1:0"
     ],
     [
-      "933:9:0",
+      "934:9:0",
       "338:9:0"
     ],
     [
-      "933:6:0",
+      "934:6:0",
       "338:6:0"
     ],
     [
-      "933:1:0",
+      "934:1:0",
       "338:1:0"
     ],
     [
-      "940:1:0",
+      "941:1:0",
       "345:1:0"
     ],
     [
-      "952:17:0",
+      "953:17:0",
       "358:15:0"
     ],
     [
-      "959:10:0",
+      "960:10:0",
       "365:8:0"
     ],
     [
-      "959:7:0",
+      "960:7:0",
       "365:5:0"
     ],
     [
-      "959:1:0",
+      "960:1:0",
       "365:1:0"
     ],
     [
-      "967:1:0",
+      "968:1:0",
       "371:1:0"
     ],
     [
@@ -460,11 +460,11 @@
   "otherInstrumentation": [
     "594:7:0",
     "613:29:0",
-    "1196:22:0",
-    "1315:33:0",
-    "1403:8:0",
-    "1423:113:0",
-    "1598:110:0"
+    "1197:22:0",
+    "1316:33:0",
+    "1404:8:0",
+    "1424:113:0",
+    "1599:110:0"
   ],
   "propertyMap": [
     {
@@ -499,5 +499,5 @@
   "instrSourceList": [
     "--"
   ],
-  "scribbleVersion": "0.6.17"
+  "scribbleVersion": "0.7.0"
 }
\ No newline at end of file
diff --git a/test/samples/arr_sum.instrumented.sol b/test/samples/arr_sum.instrumented.sol
index d6a3d6d1..e7f20bbb 100644
--- a/test/samples/arr_sum.instrumented.sol
+++ b/test/samples/arr_sum.instrumented.sol
@@ -16,7 +16,7 @@ contract ArrSum {
         }
     }
 
-    function _original_ArrSum_pushA(uint k) private {
+    function _original_ArrSum_pushA(uint k) internal {
         a.push(k);
     }
 
@@ -24,13 +24,13 @@ contract ArrSum {
         _original_ArrSum_setA(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_uint256_arr_storage(a) > 10) && (__ScribbleUtilsLib__180.sum_arr_uint256_arr_storage(a) < 20))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("000950:0067:000 1: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("000951:0067:000 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSum_setA(uint k, uint v) private {
+    function _original_ArrSum_setA(uint k, uint v) internal {
         a[k] = v;
     }
 
@@ -38,13 +38,13 @@ contract ArrSum {
         _original_ArrSum_pushB(k);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("001420:0067:000 2: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("001422:0067:000 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSum_pushB(int8 k) private {
+    function _original_ArrSum_pushB(int8 k) internal {
         b.push(k);
     }
 
@@ -52,13 +52,13 @@ contract ArrSum {
         _original_ArrSum_setB(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("001893:0067:000 3: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("001896:0067:000 3: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSum_setB(uint k, int8 v) private {
+    function _original_ArrSum_setB(uint k, int8 v) internal {
         b[k] = v;
     }
 
@@ -66,37 +66,37 @@ contract ArrSum {
         _original_ArrSum_memArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int16_arr_memory(c) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int16_arr_memory(c) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("002375:0067:000 4: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("002379:0067:000 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSum_memArr(int16[] memory c) private {}
+    function _original_ArrSum_memArr(int16[] memory c) internal {}
 
     function calldataArr(int16[] calldata c) external {
         _original_ArrSum_calldataArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int16_arr_calldata(c) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int16_arr_calldata(c) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("002856:0067:000 5: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("002861:0067:000 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSum_calldataArr(int16[] calldata c) private {}
+    function _original_ArrSum_calldataArr(int16[] calldata c) internal {}
 
     function overflowCheck(uint[] calldata c) external {
         _original_ArrSum_overflowCheck(c);
         unchecked {
             if (!(__ScribbleUtilsLib__180.sum_arr_uint256_arr_calldata(c) < 10)) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("003280:0067:000 6: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("003286:0067:000 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSum_overflowCheck(uint[] calldata c) private {}
+    function _original_ArrSum_overflowCheck(uint[] calldata c) internal {}
 }
 
 contract ArrSumCustomTag {
@@ -107,13 +107,13 @@ contract ArrSumCustomTag {
         _original_ArrSumCustomTag_pushA(k);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_uint256_arr_storage(a) > 10) && (__ScribbleUtilsLib__180.sum_arr_uint256_arr_storage(a) < 20))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("003834:0067:000 7: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("003841:0067:000 7: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSumCustomTag_pushA(uint k) private {
+    function _original_ArrSumCustomTag_pushA(uint k) internal {
         a.push(k);
     }
 
@@ -121,13 +121,13 @@ contract ArrSumCustomTag {
         _original_ArrSumCustomTag_setA(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_uint256_arr_storage(a) > 10) && (__ScribbleUtilsLib__180.sum_arr_uint256_arr_storage(a) < 20))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("004328:0067:000 8: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("004336:0067:000 8: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSumCustomTag_setA(uint k, uint v) private {
+    function _original_ArrSumCustomTag_setA(uint k, uint v) internal {
         a[k] = v;
     }
 
@@ -135,13 +135,13 @@ contract ArrSumCustomTag {
         _original_ArrSumCustomTag_pushB(k);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("004816:0067:000 9: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("004825:0067:000 9: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSumCustomTag_pushB(int8 k) private {
+    function _original_ArrSumCustomTag_pushB(int8 k) internal {
         b.push(k);
     }
 
@@ -149,13 +149,13 @@ contract ArrSumCustomTag {
         _original_ArrSumCustomTag_setB(k, v);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int8_arr_storage(b) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("005307:0068:000 10: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("005317:0068:000 10: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSumCustomTag_setB(uint k, int8 v) private {
+    function _original_ArrSumCustomTag_setB(uint k, int8 v) internal {
         b[k] = v;
     }
 
@@ -163,37 +163,37 @@ contract ArrSumCustomTag {
         _original_ArrSumCustomTag_memArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int16_arr_memory(c) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int16_arr_memory(c) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("005808:0068:000 11: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("005819:0068:000 11: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSumCustomTag_memArr(int16[] memory c) private {}
+    function _original_ArrSumCustomTag_memArr(int16[] memory c) internal {}
 
     function calldataArr(int16[] calldata c) external {
         _original_ArrSumCustomTag_calldataArr(c);
         unchecked {
             if (!((__ScribbleUtilsLib__180.sum_arr_int16_arr_calldata(c) > (-10)) && (__ScribbleUtilsLib__180.sum_arr_int16_arr_calldata(c) < 10))) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("006308:0068:000 12: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("006320:0068:000 12: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSumCustomTag_calldataArr(int16[] calldata c) private {}
+    function _original_ArrSumCustomTag_calldataArr(int16[] calldata c) internal {}
 
     function overflowCheck(uint[] calldata c) external {
         _original_ArrSumCustomTag_overflowCheck(c);
         unchecked {
             if (!(__ScribbleUtilsLib__180.sum_arr_uint256_arr_calldata(c) < 10)) {
-                emit __ScribbleUtilsLib__180.AssertionFailed("006751:0068:000 13: ");
+                emit __ScribbleUtilsLib__180.AssertionFailed("006764:0068:000 13: ");
                 assert(false);
             }
         }
     }
 
-    function _original_ArrSumCustomTag_overflowCheck(uint[] calldata c) private {}
+    function _original_ArrSumCustomTag_overflowCheck(uint[] calldata c) internal {}
 }
 
 library __ScribbleUtilsLib__180 {
diff --git a/test/samples/assert.instrumented.sol b/test/samples/assert.instrumented.sol
index 8647633d..6ed8c18a 100644
--- a/test/samples/assert.instrumented.sol
+++ b/test/samples/assert.instrumented.sol
@@ -128,7 +128,7 @@ contract AssertMixed {
         __ScribbleUtilsLib__235.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_AssertMixed_main(uint[] memory n) private {
+    function _original_AssertMixed_main(uint[] memory n) internal {
         vars6 memory _v;
         unchecked {
             _v.forall_1 = true;
@@ -137,14 +137,14 @@ contract AssertMixed {
                 if (!_v.forall_1) break;
             }
             if (!(_v.forall_1)) {
-                emit __ScribbleUtilsLib__235.AssertionFailed("003641:0067:000 7: ");
+                emit __ScribbleUtilsLib__235.AssertionFailed("003642:0067:000 7: ");
                 assert(false);
             }
         }
         for (uint i = 0; i < n.length; i++) {
             unchecked {
                 if (!(n[i] > 2)) {
-                    emit __ScribbleUtilsLib__235.AssertionFailed("003890:0067:000 8: ");
+                    emit __ScribbleUtilsLib__235.AssertionFailed("003891:0067:000 8: ");
                     assert(false);
                 }
             }
@@ -156,7 +156,7 @@ contract AssertMixed {
     function __scribble_AssertMixed_check_state_invariants_internal() internal {
         unchecked {
             if (!(sum < 200)) {
-                emit __ScribbleUtilsLib__235.AssertionFailed("004306:0067:000 0: ");
+                emit __ScribbleUtilsLib__235.AssertionFailed("004307:0067:000 0: ");
                 assert(false);
             }
         }
@@ -182,7 +182,7 @@ contract AssertMixed {
         RET0 = sum;
         unchecked {
             if (!((sum - _v.old_0) > 3)) {
-                emit __ScribbleUtilsLib__235.AssertionFailed("005134:0067:000 1: ");
+                emit __ScribbleUtilsLib__235.AssertionFailed("005135:0067:000 1: ");
                 assert(false);
             }
         }
@@ -193,35 +193,35 @@ contract SimpleAsserts {
     function main(uint a1, uint a2, uint a3, bool b1, uint a4, uint a5, uint a6, uint a7, uint a8) public {
         unchecked {
             if (!(a1 == 1)) {
-                emit __ScribbleUtilsLib__235.AssertionFailed("005466:0067:000 9: ");
+                emit __ScribbleUtilsLib__235.AssertionFailed("005467:0067:000 9: ");
                 assert(false);
             }
         }
         uint x = 2;
         unchecked {
             if (!(a2 == x)) {
-                emit __ScribbleUtilsLib__235.AssertionFailed("005676:0068:000 10: ");
+                emit __ScribbleUtilsLib__235.AssertionFailed("005677:0068:000 10: ");
                 assert(false);
             }
         }
         x++;
         unchecked {
             if (!(a3 == x)) {
-                emit __ScribbleUtilsLib__235.AssertionFailed("005880:0068:000 11: ");
+                emit __ScribbleUtilsLib__235.AssertionFailed("005881:0068:000 11: ");
                 assert(false);
             }
         }
         if (b1) {
             unchecked {
                 if (!(a4 == (x + 1))) {
-                    emit __ScribbleUtilsLib__235.AssertionFailed("006107:0068:000 12: ");
+                    emit __ScribbleUtilsLib__235.AssertionFailed("006108:0068:000 12: ");
                     assert(false);
                 }
             }
             {
                 unchecked {
                     if (!(a5 == (x + 2))) {
-                        emit __ScribbleUtilsLib__235.AssertionFailed("006354:0068:000 13: ");
+                        emit __ScribbleUtilsLib__235.AssertionFailed("006355:0068:000 13: ");
                         assert(false);
                     }
                 }
@@ -231,7 +231,7 @@ contract SimpleAsserts {
             x++;
             unchecked {
                 if (!(a6 == (x + 2))) {
-                    emit __ScribbleUtilsLib__235.AssertionFailed("006656:0068:000 14: ");
+                    emit __ScribbleUtilsLib__235.AssertionFailed("006657:0068:000 14: ");
                     assert(false);
                 }
             }
@@ -240,7 +240,7 @@ contract SimpleAsserts {
         while (a6 > 0) {
             unchecked {
                 if (!(a7 >= (a6 + 1))) {
-                    emit __ScribbleUtilsLib__235.AssertionFailed("006932:0068:000 15: ");
+                    emit __ScribbleUtilsLib__235.AssertionFailed("006933:0068:000 15: ");
                     assert(false);
                 }
             }
@@ -248,7 +248,7 @@ contract SimpleAsserts {
         }
         unchecked {
             if (!(a8 == (x + 4))) {
-                emit __ScribbleUtilsLib__235.AssertionFailed("007169:0068:000 16: ");
+                emit __ScribbleUtilsLib__235.AssertionFailed("007170:0068:000 16: ");
                 assert(false);
             }
         }
diff --git a/test/samples/calldata_parameters.pre_0.6.9.instrumented.sol b/test/samples/calldata_parameters.pre_0.6.9.instrumented.sol
index 72010203..77f382e4 100644
--- a/test/samples/calldata_parameters.pre_0.6.9.instrumented.sol
+++ b/test/samples/calldata_parameters.pre_0.6.9.instrumented.sol
@@ -11,14 +11,14 @@ contract Test {
         __ScribbleUtilsLib__15.setInContract(false);
     }
 
-    function _original_Test_foo(bytes memory x) private returns (uint) {
+    function _original_Test_foo(bytes memory x) internal returns (uint) {
         return x.length;
     }
 
     /// Check only the current contract's state invariants
     function __scribble_Test_check_state_invariants_internal() internal {
         if (!(true)) {
-            emit __ScribbleUtilsLib__15.AssertionFailed("000731:0068:000 0: P1");
+            emit __ScribbleUtilsLib__15.AssertionFailed("000732:0068:000 0: P1");
             assert(false);
         }
     }
diff --git a/test/samples/calldata_paramteres.instrumented.sol b/test/samples/calldata_paramteres.instrumented.sol
index 87d0cd6c..876fcd09 100644
--- a/test/samples/calldata_paramteres.instrumented.sol
+++ b/test/samples/calldata_paramteres.instrumented.sol
@@ -15,7 +15,7 @@ contract Test {
         __ScribbleUtilsLib__55.setInContract(false);
     }
 
-    function _original_Test_foo(bytes calldata x) private returns (bytes calldata y) {
+    function _original_Test_foo(bytes calldata x) internal returns (bytes calldata y) {
         y = x;
     }
 
@@ -28,7 +28,7 @@ contract Test {
         __ScribbleUtilsLib__55.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Test_moo() private {
+    function _original_Test_moo() internal {
         bytes memory m = "abc";
         bytes memory n = _callsite_26(this, m);
         assert(n[0] == "a");
@@ -39,7 +39,7 @@ contract Test {
     /// Check only the current contract's state invariants
     function __scribble_Test_check_state_invariants_internal() internal {
         if (!(true)) {
-            emit __ScribbleUtilsLib__55.AssertionFailed("001411:0068:000 0: P1");
+            emit __ScribbleUtilsLib__55.AssertionFailed("001413:0068:000 0: P1");
             assert(false);
         }
     }
diff --git a/test/samples/contract_decorated_ext_call.instrumented.sol b/test/samples/contract_decorated_ext_call.instrumented.sol
index 0a1b4180..d53b8b05 100644
--- a/test/samples/contract_decorated_ext_call.instrumented.sol
+++ b/test/samples/contract_decorated_ext_call.instrumented.sol
@@ -27,7 +27,7 @@ contract Foo {
         __ScribbleUtilsLib__102.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_inc() private {
+    function _original_Foo_inc() internal {
         x++;
     }
 
@@ -51,7 +51,7 @@ contract Foo {
         __ScribbleUtilsLib__102.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_fail() private {
+    function _original_Foo_fail() internal {
         fail_int();
     }
 
@@ -64,7 +64,7 @@ contract Foo {
         __ScribbleUtilsLib__102.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_withdraw(uint _amount) private {
+    function _original_Foo_withdraw(uint _amount) internal {
         (bool success, bytes memory retval) = _callsite_93(msg.sender, _amount, "");
         require(success);
     }
@@ -72,7 +72,7 @@ contract Foo {
     /// Check only the current contract's state invariants
     function __scribble_Foo_check_state_invariants_internal() internal {
         if (!(x > 0)) {
-            emit __ScribbleUtilsLib__102.AssertionFailed("002351:0067:000 0: ");
+            emit __ScribbleUtilsLib__102.AssertionFailed("002354:0067:000 0: ");
             assert(false);
         }
     }
diff --git a/test/samples/contract_decorated_ext_callv05.instrumented.sol b/test/samples/contract_decorated_ext_callv05.instrumented.sol
index 9e8525ba..ee9351d0 100644
--- a/test/samples/contract_decorated_ext_callv05.instrumented.sol
+++ b/test/samples/contract_decorated_ext_callv05.instrumented.sol
@@ -27,7 +27,7 @@ contract Foo {
         __ScribbleUtilsLib__89.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_inc() private {
+    function _original_Foo_inc() internal {
         x++;
     }
 
@@ -49,7 +49,7 @@ contract Foo {
         __ScribbleUtilsLib__89.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_fail() private {
+    function _original_Foo_fail() internal {
         fail_int();
     }
 
@@ -62,7 +62,7 @@ contract Foo {
         __ScribbleUtilsLib__89.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_withdraw(uint _amount) private {
+    function _original_Foo_withdraw(uint _amount) internal {
         (bool success, bytes memory retval) = _callsite_80(msg.sender, _amount, "");
         require(success);
     }
@@ -70,7 +70,7 @@ contract Foo {
     /// Check only the current contract's state invariants
     function __scribble_Foo_check_state_invariants_internal() internal {
         if (!(x > 0)) {
-            __ScribbleUtilsLib__89.assertionFailed("002289:0061:000 0: ");
+            __ScribbleUtilsLib__89.assertionFailed("002292:0061:000 0: ");
             assert(false);
         }
     }
diff --git a/test/samples/contract_multi_arg_debug.instrumented.sol b/test/samples/contract_multi_arg_debug.instrumented.sol
index 809c2e72..f02c9a17 100644
--- a/test/samples/contract_multi_arg_debug.instrumented.sol
+++ b/test/samples/contract_multi_arg_debug.instrumented.sol
@@ -68,7 +68,7 @@ contract Base is Foo {
         __ScribbleUtilsLib__46.setInContract(false);
     }
 
-    function _original_Base_inc3(uint x) private returns (uint y) {
+    function _original_Base_inc3(uint x) internal returns (uint y) {
         a += x + 1;
         return x + 1;
     }
diff --git a/test/samples/contract_pos.instrumented.sol b/test/samples/contract_pos.instrumented.sol
index ff98f949..c8e0187f 100644
--- a/test/samples/contract_pos.instrumented.sol
+++ b/test/samples/contract_pos.instrumented.sol
@@ -23,7 +23,7 @@ contract Foo {
         __ScribbleUtilsLib__32.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_inc() private {
+    function _original_Foo_inc() internal {
         x++;
     }
 
@@ -40,7 +40,7 @@ contract Foo {
         __ScribbleUtilsLib__32.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_fail() private {
+    function _original_Foo_fail() internal {
         add(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff);
     }
 
@@ -48,7 +48,7 @@ contract Foo {
     function __scribble_Foo_check_state_invariants_internal() internal {
         if (!(x > 0)) {
             emit __ScribbleUtilsLib__32.AssertionFailedData(0, abi.encode(x));
-            emit __ScribbleUtilsLib__32.AssertionFailed("001627:0066:000 0: ");
+            emit __ScribbleUtilsLib__32.AssertionFailed("001629:0066:000 0: ");
         }
     }
 
diff --git a/test/samples/contract_pos_edge_cases.instrumented.sol b/test/samples/contract_pos_edge_cases.instrumented.sol
index e832c1c5..cd4673be 100644
--- a/test/samples/contract_pos_edge_cases.instrumented.sol
+++ b/test/samples/contract_pos_edge_cases.instrumented.sol
@@ -19,14 +19,14 @@ contract PosConstructorFail {
         __ScribbleUtilsLib__108.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_PosConstructorFail_inc() private {
+    function _original_PosConstructorFail_inc() internal {
         x++;
     }
 
     /// Check only the current contract's state invariants
     function __scribble_PosConstructorFail_check_state_invariants_internal() internal {
         if (!(x > 0)) {
-            emit __ScribbleUtilsLib__108.AssertionFailed("000965:0067:000 0: ");
+            emit __ScribbleUtilsLib__108.AssertionFailed("000966:0067:000 0: ");
             assert(false);
         }
     }
@@ -64,7 +64,7 @@ contract PosExtCallFail {
         __ScribbleUtilsLib__108.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_PosExtCallFail_inc() private {
+    function _original_PosExtCallFail_inc() internal {
         x++;
     }
 
@@ -82,14 +82,14 @@ contract PosExtCallFail {
         __ScribbleUtilsLib__108.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_PosExtCallFail_fail() private {
+    function _original_PosExtCallFail_fail() internal {
         fail_int();
     }
 
     /// Check only the current contract's state invariants
     function __scribble_PosExtCallFail_check_state_invariants_internal() internal {
         if (!(x > 0)) {
-            emit __ScribbleUtilsLib__108.AssertionFailed("002930:0067:000 1: ");
+            emit __ScribbleUtilsLib__108.AssertionFailed("002933:0067:000 1: ");
             assert(false);
         }
     }
@@ -170,7 +170,7 @@ contract PosLibInterface is IPosLibInterface {
         __ScribbleUtilsLib__108.setInContract(false);
     }
 
-    function _original_PosLibInterface_boo() private {}
+    function _original_PosLibInterface_boo() internal {}
 
     function inc() public {
         vars7 memory _v;
@@ -181,7 +181,7 @@ contract PosLibInterface is IPosLibInterface {
         __ScribbleUtilsLib__108.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_PosLibInterface_inc() private {
+    function _original_PosLibInterface_inc() internal {
         x++;
     }
 
@@ -198,14 +198,14 @@ contract PosLibInterface is IPosLibInterface {
         __ScribbleUtilsLib__108.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_PosLibInterface_fail() private {
+    function _original_PosLibInterface_fail() internal {
         add(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff);
     }
 
     /// Check only the current contract's state invariants
     function __scribble_PosLibInterface_check_state_invariants_internal() internal {
         if (!(x > 0)) {
-            emit __ScribbleUtilsLib__108.AssertionFailed("006432:0067:000 2: ");
+            emit __ScribbleUtilsLib__108.AssertionFailed("006438:0067:000 2: ");
             assert(false);
         }
     }
diff --git a/test/samples/crashingAnnotation.instrumented.sol b/test/samples/crashingAnnotation.instrumented.sol
index c84e1d15..3d43eaca 100644
--- a/test/samples/crashingAnnotation.instrumented.sol
+++ b/test/samples/crashingAnnotation.instrumented.sol
@@ -23,7 +23,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_div(uint a, uint b) private pure returns (uint c) {
+    function _original_Foo_div(uint a, uint b) internal pure returns (uint c) {
         return a / b;
     }
 }
diff --git a/test/samples/custom_maps_0.4.26.instrumented.sol b/test/samples/custom_maps_0.4.26.instrumented.sol
index 957fe8b0..c8a30147 100644
--- a/test/samples/custom_maps_0.4.26.instrumented.sol
+++ b/test/samples/custom_maps_0.4.26.instrumented.sol
@@ -26,7 +26,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_foo() private {}
+    function _original_Foo_foo() internal {}
 }
 
 library address_to_uint256_11 {
diff --git a/test/samples/dbg_event_tests.instrumented.sol b/test/samples/dbg_event_tests.instrumented.sol
index 6f15ad59..9c470d61 100644
--- a/test/samples/dbg_event_tests.instrumented.sol
+++ b/test/samples/dbg_event_tests.instrumented.sol
@@ -48,7 +48,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_changesArg1(uint x) private {
+    function _original_Foo_changesArg1(uint x) internal {
         x = 1;
     }
 
@@ -57,12 +57,12 @@ contract Foo {
         unchecked {
             if (!(x == 0)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(5, abi.encode(x));
-                emit __ScribbleUtilsLib__158.AssertionFailed("001451:0067:000 5: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("001452:0067:000 5: ");
             }
         }
     }
 
-    function _original_Foo_changesArg2(uint x) private {
+    function _original_Foo_changesArg2(uint x) internal {
         x = 1;
     }
 
@@ -76,12 +76,12 @@ contract Foo {
         unchecked {
             if (!(_v.old_1 == 0)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(6, abi.encode(_v.dbg_1));
-                emit __ScribbleUtilsLib__158.AssertionFailed("001976:0067:000 6: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("001978:0067:000 6: ");
             }
         }
     }
 
-    function _original_Foo_changesArr1() private {
+    function _original_Foo_changesArr1() internal {
         x[0] = 3;
     }
 
@@ -90,12 +90,12 @@ contract Foo {
         unchecked {
             if (!(x[0] == 0)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(7, abi.encode(x));
-                emit __ScribbleUtilsLib__158.AssertionFailed("002377:0067:000 7: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("002380:0067:000 7: ");
             }
         }
     }
 
-    function _original_Foo_changesArr2() private {
+    function _original_Foo_changesArr2() internal {
         x[0] = 4;
     }
 
@@ -104,12 +104,12 @@ contract Foo {
         unchecked {
             if (!(RET == 1)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(8, abi.encode(RET));
-                emit __ScribbleUtilsLib__158.AssertionFailed("002794:0067:000 8: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("002798:0067:000 8: ");
             }
         }
     }
 
-    function _original_Foo_newRet() private returns (uint RET) {
+    function _original_Foo_newRet() internal returns (uint RET) {
         return 2;
     }
 
@@ -125,12 +125,12 @@ contract Foo {
             _v.let_2 = _v.let_1;
             if (!(_v.let_2)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(9, abi.encode(x, _v.x1, _v.x2, _v.x3));
-                emit __ScribbleUtilsLib__158.AssertionFailed("003457:0067:000 9: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("003462:0067:000 9: ");
             }
         }
     }
 
-    function _original_Foo_shadowing(uint x) private {}
+    function _original_Foo_shadowing(uint x) internal {}
 
     function updArr() public {
         Foo_arr_idx_uint256_uint256_assign(1, 2);
@@ -158,7 +158,7 @@ contract Foo {
         unchecked {
             if (!(arr[t] == 3)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(0, abi.encode(arr, t));
-                emit __ScribbleUtilsLib__158.AssertionFailed("004433:0067:000 0: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("004439:0067:000 0: ");
             }
         }
     }
@@ -169,7 +169,7 @@ contract Foo {
         unchecked {
             if (!(arr[t] == 3)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(0, abi.encode(arr, t));
-                emit __ScribbleUtilsLib__158.AssertionFailed("004854:0067:000 0: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("004860:0067:000 0: ");
             }
         }
     }
@@ -185,7 +185,7 @@ contract Foo {
         unchecked {
             if (!(_v.old_2 == 3)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(1, abi.encode(_v.dbg_2));
-                emit __ScribbleUtilsLib__158.AssertionFailed("005398:0067:000 1: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("005404:0067:000 1: ");
             }
         }
     }
@@ -196,7 +196,7 @@ contract Foo {
         unchecked {
             if (!(m[ARG4].length > 1)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(2, abi.encode(ARG4));
-                emit __ScribbleUtilsLib__158.AssertionFailed("005871:0067:000 2: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("005877:0067:000 2: ");
             }
         }
     }
@@ -207,7 +207,7 @@ contract Foo {
         unchecked {
             if (!(m[ARG6].length > 1)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(2, abi.encode(ARG6));
-                emit __ScribbleUtilsLib__158.AssertionFailed("006340:0067:000 2: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("006346:0067:000 2: ");
             }
         }
     }
@@ -218,7 +218,7 @@ contract Foo {
         unchecked {
             if (!(m[ARG8][ARG9] > 0)) {
                 emit __ScribbleUtilsLib__158.AssertionFailedData(3, abi.encode(ARG8, ARG9));
-                emit __ScribbleUtilsLib__158.AssertionFailed("006821:0067:000 3: ");
+                emit __ScribbleUtilsLib__158.AssertionFailed("006827:0067:000 3: ");
             }
         }
     }
diff --git a/test/samples/erc20_macro.instrumented.sol b/test/samples/erc20_macro.instrumented.sol
index 22f1f970..31dec18f 100644
--- a/test/samples/erc20_macro.instrumented.sol
+++ b/test/samples/erc20_macro.instrumented.sol
@@ -193,7 +193,7 @@ contract ERC20Example is IERC20 {
         __ScribbleUtilsLib__377.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20Example_totalSupply() private view returns (uint) {
+    function _original_ERC20Example_totalSupply() internal view returns (uint) {
         return _totalSupply;
     }
 
@@ -203,14 +203,14 @@ contract ERC20Example is IERC20 {
         __ScribbleUtilsLib__377.setInContract(true);
         RET_0 = _original_ERC20Example_balanceOf(account);
         if (!(RET_0 == address_to_uint256_377.get(balances, account))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("006452:0119:000 4: Returns the balance of owner in the balances mapping");
+            emit __ScribbleUtilsLib__377.AssertionFailed("006453:0119:000 4: Returns the balance of owner in the balances mapping");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__377.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20Example_balanceOf(address account) private view returns (uint) {
+    function _original_ERC20Example_balanceOf(address account) internal view returns (uint) {
         return address_to_uint256_377.get(balances, account);
     }
 
@@ -226,30 +226,30 @@ contract ERC20Example is IERC20 {
         _v.old_6 = balances.sum;
         RET_0 = _original_ERC20Example_transfer(receiver, amount);
         if (!(_v.old_1)) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("007685:0113:000 6: The sender has sufficient balance at the start");
+            emit __ScribbleUtilsLib__377.AssertionFailed("007687:0113:000 6: The sender has sufficient balance at the start");
             assert(false);
         }
         if (!((!(msg.sender != receiver)) || ((_v.old_2 - amount) == address_to_uint256_377.get(balances, msg.sender)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("007972:0100:000 7: The sender has value less balance");
+            emit __ScribbleUtilsLib__377.AssertionFailed("007974:0100:000 7: The sender has value less balance");
             assert(false);
         }
         if (!((!(msg.sender != receiver)) || ((_v.old_3 + amount) == address_to_uint256_377.get(balances, receiver)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("008244:0095:000 8: The receiver receives _value");
+            emit __ScribbleUtilsLib__377.AssertionFailed("008246:0095:000 8: The receiver receives _value");
             assert(false);
         }
         if (!((_v.old_4 + _v.old_5) == (address_to_uint256_377.get(balances, receiver) + address_to_uint256_377.get(balances, msg.sender)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("008533:0111:000 9: Transfer does not modify the sum of balances");
+            emit __ScribbleUtilsLib__377.AssertionFailed("008535:0111:000 9: Transfer does not modify the sum of balances");
             assert(false);
         }
         if (!((balances.sum == _v.old_6) || (msg.sig == bytes4(0x00)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("008769:0096:000 2: The token has a fixed supply.");
+            emit __ScribbleUtilsLib__377.AssertionFailed("008771:0096:000 2: The token has a fixed supply.");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__377.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20Example_transfer(address receiver, uint amount) private returns (bool) {
+    function _original_ERC20Example_transfer(address receiver, uint amount) internal returns (bool) {
         require(amount <= address_to_uint256_377.get(balances, msg.sender));
         address_to_uint256_377.set(balances, msg.sender, address_to_uint256_377.get(balances, msg.sender).sub(amount));
         address_to_uint256_377.set(balances, receiver, address_to_uint256_377.get(balances, receiver).add(amount));
@@ -264,18 +264,18 @@ contract ERC20Example is IERC20 {
         _v.old_7 = balances.sum;
         RET_0 = _original_ERC20Example_approve(delegate, amount);
         if (!(allowances[msg.sender][delegate] == amount)) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("009993:0133:000 10: spender will have an allowance of value for this sender's balance");
+            emit __ScribbleUtilsLib__377.AssertionFailed("009996:0133:000 10: spender will have an allowance of value for this sender's balance");
             assert(false);
         }
         if (!((balances.sum == _v.old_7) || (msg.sig == bytes4(0x00)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("010251:0096:000 2: The token has a fixed supply.");
+            emit __ScribbleUtilsLib__377.AssertionFailed("010254:0096:000 2: The token has a fixed supply.");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__377.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20Example_approve(address delegate, uint amount) private returns (bool) {
+    function _original_ERC20Example_approve(address delegate, uint amount) internal returns (bool) {
         allowances[msg.sender][delegate] = amount;
         emit Approval(msg.sender, delegate, amount);
         return true;
@@ -287,14 +287,14 @@ contract ERC20Example is IERC20 {
         __ScribbleUtilsLib__377.setInContract(true);
         RET_0 = _original_ERC20Example_allowance(owner, delegate);
         if (!(RET_0 == allowances[owner][delegate])) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("011178:0108:000 5: Returns spenders allowance for this owner");
+            emit __ScribbleUtilsLib__377.AssertionFailed("011182:0108:000 5: Returns spenders allowance for this owner");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__377.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20Example_allowance(address owner, address delegate) private view returns (uint) {
+    function _original_ERC20Example_allowance(address owner, address delegate) internal view returns (uint) {
         return allowances[owner][delegate];
     }
 
@@ -312,38 +312,38 @@ contract ERC20Example is IERC20 {
         _v.old_15 = balances.sum;
         RET_0 = _original_ERC20Example_transferFrom(owner, buyer, amount);
         if (!(_v.old_8)) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("012507:0114:000 11: The sender has sufficient balance at the start");
+            emit __ScribbleUtilsLib__377.AssertionFailed("012512:0114:000 11: The sender has sufficient balance at the start");
             assert(false);
         }
         if (!((!(owner != buyer)) || ((_v.old_9 - amount) == address_to_uint256_377.get(balances, owner)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("012782:0101:000 12: The sender has value less balance");
+            emit __ScribbleUtilsLib__377.AssertionFailed("012787:0101:000 12: The sender has value less balance");
             assert(false);
         }
         if (!((_v.old_10 - amount) == allowances[owner][msg.sender])) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("013006:0102:000 13: The actor has value less allowance");
+            emit __ScribbleUtilsLib__377.AssertionFailed("013011:0102:000 13: The actor has value less allowance");
             assert(false);
         }
         if (!(_v.old_11 >= amount)) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("013197:0098:000 14: The actor has enough allowance");
+            emit __ScribbleUtilsLib__377.AssertionFailed("013202:0098:000 14: The actor has enough allowance");
             assert(false);
         }
         if (!((!(owner != buyer)) || ((_v.old_12 + amount) == address_to_uint256_377.get(balances, buyer)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("013457:0095:000 15: The receiver receives value");
+            emit __ScribbleUtilsLib__377.AssertionFailed("013462:0095:000 15: The receiver receives value");
             assert(false);
         }
         if (!((_v.old_13 + _v.old_14) == (address_to_uint256_377.get(balances, buyer) + address_to_uint256_377.get(balances, owner)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("013740:0112:000 16: Transfer does not modify the sum of balances");
+            emit __ScribbleUtilsLib__377.AssertionFailed("013745:0112:000 16: Transfer does not modify the sum of balances");
             assert(false);
         }
         if (!((balances.sum == _v.old_15) || (msg.sig == bytes4(0x00)))) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("013978:0096:000 2: The token has a fixed supply.");
+            emit __ScribbleUtilsLib__377.AssertionFailed("013983:0096:000 2: The token has a fixed supply.");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__377.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ERC20Example_transferFrom(address owner, address buyer, uint amount) private returns (bool) {
+    function _original_ERC20Example_transferFrom(address owner, address buyer, uint amount) internal returns (bool) {
         require(amount <= address_to_uint256_377.get(balances, owner));
         require(amount <= allowances[owner][msg.sender]);
         address_to_uint256_377.set(balances, owner, address_to_uint256_377.get(balances, owner).sub(amount));
@@ -356,7 +356,7 @@ contract ERC20Example is IERC20 {
     /// Check only the current contract's state invariants
     function __scribble_ERC20Example_check_state_invariants_internal() internal {
         if (!(balances.sum == _totalSupply)) {
-            emit __ScribbleUtilsLib__377.AssertionFailed("015106:0122:000 1: The sum of balances is always equal to the total supply");
+            emit __ScribbleUtilsLib__377.AssertionFailed("015112:0122:000 1: The sum of balances is always equal to the total supply");
             assert(false);
         }
     }
diff --git a/test/samples/erc721_macro.instrumented.sol b/test/samples/erc721_macro.instrumented.sol
index 5f1bf7a4..0a066bdf 100644
--- a/test/samples/erc721_macro.instrumented.sol
+++ b/test/samples/erc721_macro.instrumented.sol
@@ -73,7 +73,7 @@ contract ERC721 {
         }
     }
 
-    function _original_ERC721_balanceOf(address owner) private view returns (uint256) {
+    function _original_ERC721_balanceOf(address owner) internal view returns (uint256) {
         require(owner != address(0), "ERC721: balance query for the zero address");
         return _balances[owner];
     }
@@ -82,17 +82,17 @@ contract ERC721 {
         RET_0 = _original_ERC721_ownerOf(tokenId);
         unchecked {
             if (!(RET_0 != address(0))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("003121:0104:000 2: NFTs cannot be owned by the 0 address");
+                emit __ScribbleUtilsLib__826.AssertionFailed("003122:0104:000 2: NFTs cannot be owned by the 0 address");
                 assert(false);
             }
             if (!(_original_ERC721_balanceOf(RET_0) > 0)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("003348:0108:000 3: ownerOf() should not contradict balanceOf");
+                emit __ScribbleUtilsLib__826.AssertionFailed("003349:0108:000 3: ownerOf() should not contradict balanceOf");
                 assert(false);
             }
         }
     }
 
-    function _original_ERC721_ownerOf(uint256 tokenId) private view returns (address) {
+    function _original_ERC721_ownerOf(uint256 tokenId) internal view returns (address) {
         address owner = _owners[tokenId];
         require(owner != address(0), "ERC721: owner query for nonexistent token");
         return owner;
@@ -130,21 +130,21 @@ contract ERC721 {
         _original_ERC721_approve(to, tokenId);
         unchecked {
             if (!((msg.sender == _original_ERC721_ownerOf(tokenId)) || isApprovedForAll(_original_ERC721_ownerOf(tokenId), msg.sender))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("005060:0113:000 16: Sender must be properly authorized to approve");
+                emit __ScribbleUtilsLib__826.AssertionFailed("005062:0113:000 16: Sender must be properly authorized to approve");
                 assert(false);
             }
             if (!(getApproved(tokenId) == to)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("005285:0091:000 17: Approve works correctly");
+                emit __ScribbleUtilsLib__826.AssertionFailed("005287:0091:000 17: Approve works correctly");
                 assert(false);
             }
             if (!(_original_ERC721_ownerOf(tokenId) == _v.old_0)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("005507:0100:000 18: Approve doesn't change ownership");
+                emit __ScribbleUtilsLib__826.AssertionFailed("005509:0100:000 18: Approve doesn't change ownership");
                 assert(false);
             }
         }
     }
 
-    function _original_ERC721_approve(address to, uint256 tokenId) private {
+    function _original_ERC721_approve(address to, uint256 tokenId) internal {
         address owner = ERC721.ownerOf(tokenId);
         require(to != owner, "ERC721: approval to current owner");
         require((msg.sender == owner) || isApprovedForAll(owner, msg.sender), "ERC721: approve caller is not owner nor approved for all");
@@ -161,13 +161,13 @@ contract ERC721 {
         _original_ERC721_setApprovalForAll(operator, approved);
         unchecked {
             if (!(approved == isApprovedForAll(msg.sender, operator))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("006549:0102:000 19: setApprovalForAll worked correctly");
+                emit __ScribbleUtilsLib__826.AssertionFailed("006552:0102:000 19: setApprovalForAll worked correctly");
                 assert(false);
             }
         }
     }
 
-    function _original_ERC721_setApprovalForAll(address operator, bool approved) private {
+    function _original_ERC721_setApprovalForAll(address operator, bool approved) internal {
         _setApprovalForAll(msg.sender, operator, approved);
     }
 
@@ -187,25 +187,25 @@ contract ERC721 {
         _original_ERC721_transferFrom(from, to, tokenId);
         unchecked {
             if (!(to != address(0))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("007601:0096:000 12: Cannot transfer to 0 address");
+                emit __ScribbleUtilsLib__826.AssertionFailed("007605:0096:000 12: Cannot transfer to 0 address");
                 assert(false);
             }
             if (!(_v.old_1 == from)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("007799:0098:000 13: from must be the current owner");
+                emit __ScribbleUtilsLib__826.AssertionFailed("007803:0098:000 13: from must be the current owner");
                 assert(false);
             }
             if (!(((msg.sender == _v.old_2) || _v.old_3) || (_v.old_4 == msg.sender))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("008049:0114:000 14: Sender must be properly authorized to transfer");
+                emit __ScribbleUtilsLib__826.AssertionFailed("008053:0114:000 14: Sender must be properly authorized to transfer");
                 assert(false);
             }
             if (!(_original_ERC721_ownerOf(tokenId) == to)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("008288:0083:000 15: Transfer worked");
+                emit __ScribbleUtilsLib__826.AssertionFailed("008292:0083:000 15: Transfer worked");
                 assert(false);
             }
         }
     }
 
-    function _original_ERC721_transferFrom(address from, address to, uint256 tokenId) private {
+    function _original_ERC721_transferFrom(address from, address to, uint256 tokenId) internal {
         require(_isApprovedOrOwner(msg.sender, tokenId), "ERC721: transfer caller is not owner nor approved");
         _transfer(from, to, tokenId);
     }
@@ -221,25 +221,25 @@ contract ERC721 {
         _original_ERC721_safeTransferFrom(from, to, tokenId);
         unchecked {
             if (!(to != address(0))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("009218:0095:000 8: Cannot transfer to 0 address");
+                emit __ScribbleUtilsLib__826.AssertionFailed("009223:0095:000 8: Cannot transfer to 0 address");
                 assert(false);
             }
             if (!(_v.old_5 == from)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("009415:0097:000 9: from must be the current owner");
+                emit __ScribbleUtilsLib__826.AssertionFailed("009420:0097:000 9: from must be the current owner");
                 assert(false);
             }
             if (!(((msg.sender == _v.old_6) || _v.old_7) || (_v.old_8 == msg.sender))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("009664:0114:000 10: Sender must be properly authorized to transfer");
+                emit __ScribbleUtilsLib__826.AssertionFailed("009669:0114:000 10: Sender must be properly authorized to transfer");
                 assert(false);
             }
             if (!(_original_ERC721_ownerOf(tokenId) == to)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("009903:0083:000 11: Transfer worked");
+                emit __ScribbleUtilsLib__826.AssertionFailed("009908:0083:000 11: Transfer worked");
                 assert(false);
             }
         }
     }
 
-    function _original_ERC721_safeTransferFrom(address from, address to, uint256 tokenId) private {
+    function _original_ERC721_safeTransferFrom(address from, address to, uint256 tokenId) internal {
         safeTransferFrom(from, to, tokenId, "");
     }
 
@@ -254,25 +254,25 @@ contract ERC721 {
         _original_ERC721_safeTransferFrom1(from, to, tokenId, _data);
         unchecked {
             if (!(to != address(0))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("010768:0095:000 4: Cannot transfer to 0 address");
+                emit __ScribbleUtilsLib__826.AssertionFailed("010774:0095:000 4: Cannot transfer to 0 address");
                 assert(false);
             }
             if (!(_v.old_9 == from)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("010965:0097:000 5: from must be the current owner");
+                emit __ScribbleUtilsLib__826.AssertionFailed("010971:0097:000 5: from must be the current owner");
                 assert(false);
             }
             if (!(((msg.sender == _v.old_10) || _v.old_11) || (_v.old_12 == msg.sender))) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("011217:0113:000 6: Sender must be properly authorized to transfer");
+                emit __ScribbleUtilsLib__826.AssertionFailed("011223:0113:000 6: Sender must be properly authorized to transfer");
                 assert(false);
             }
             if (!(_original_ERC721_ownerOf(tokenId) == to)) {
-                emit __ScribbleUtilsLib__826.AssertionFailed("011455:0082:000 7: Transfer worked");
+                emit __ScribbleUtilsLib__826.AssertionFailed("011461:0082:000 7: Transfer worked");
                 assert(false);
             }
         }
     }
 
-    function _original_ERC721_safeTransferFrom1(address from, address to, uint256 tokenId, bytes memory _data) private {
+    function _original_ERC721_safeTransferFrom1(address from, address to, uint256 tokenId, bytes memory _data) internal {
         require(_isApprovedOrOwner(msg.sender, tokenId), "ERC721: transfer caller is not owner nor approved");
         _safeTransfer(from, to, tokenId, _data);
     }
diff --git a/test/samples/example_valentin.instrumented.sol b/test/samples/example_valentin.instrumented.sol
index 1bb72c26..56cea407 100644
--- a/test/samples/example_valentin.instrumented.sol
+++ b/test/samples/example_valentin.instrumented.sol
@@ -42,7 +42,7 @@ contract FooToken {
         }
     }
 
-    function _original_FooToken_transfer(address _to, uint256 _value) private returns (bool) {
+    function _original_FooToken_transfer(address _to, uint256 _value) internal returns (bool) {
         address from = msg.sender;
         require(_value <= _balances[from]);
         uint256 newBalanceFrom = _balances[from] - _value;
diff --git a/test/samples/forall_maps.instrumented.sol b/test/samples/forall_maps.instrumented.sol
index a6eddb8a..de85fc9a 100644
--- a/test/samples/forall_maps.instrumented.sol
+++ b/test/samples/forall_maps.instrumented.sol
@@ -118,7 +118,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_setA(uint key, uint val) private {
+    function _original_Foo_setA(uint key, uint val) internal {
         uint256_to_uint256_326.set(a, key, val);
     }
 
@@ -133,13 +133,13 @@ contract Foo {
                 if (!_v.forall_1) break;
             }
             if (!(_v.forall_1)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("003017:0067:000 1: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("003018:0067:000 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_decA(uint key) private {
+    function _original_Foo_decA(uint key) internal {
         uint256_to_uint256_326.dec(a, key);
     }
 
@@ -154,13 +154,13 @@ contract Foo {
                 if (!_v.forall_2) break;
             }
             if (!(_v.forall_2)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("003696:0067:000 2: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("003698:0067:000 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setC(string memory s, int16 v) private {
+    function _original_Foo_setC(string memory s, int16 v) internal {
         string_to_int16_326.set(c0, s, v);
     }
 
@@ -181,13 +181,13 @@ contract Foo {
                 if (!_v.forall_3) break;
             }
             if (!(_v.forall_3)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("004798:0067:000 3: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("004801:0067:000 3: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setD(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setD(string memory s, uint8 k, int8 v) internal {
         uint8_to_int8_326.set(string_to_uint8_to_int8_326_S_506_326.get_lhs(d, s), k, v);
     }
 
@@ -202,13 +202,13 @@ contract Foo {
                 if (!_v.forall_5) break;
             }
             if (!(_v.forall_5)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("005554:0067:000 4: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("005558:0067:000 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setE(uint k, uint[] memory v) private {
+    function _original_Foo_setE(uint k, uint[] memory v) internal {
         uint256_to_uint256_arr_326.set(e, k, v);
     }
 
@@ -226,13 +226,13 @@ contract Foo {
                 if (!_v.forall_6) break;
             }
             if (!(_v.forall_6)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("006237:0067:000 5: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("006242:0067:000 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setF(uint i, uint j, uint v) private {
+    function _original_Foo_setF(uint i, uint j, uint v) internal {
         f[i][j] = v;
     }
 
@@ -251,13 +251,13 @@ contract Foo {
                 if (!_v.forall_7) break;
             }
             if (!(_v.forall_7)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("006969:0067:000 6: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("006975:0067:000 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setG(uint i, uint j, uint v) private {
+    function _original_Foo_setG(uint i, uint j, uint v) internal {
         uint256_to_uint256_326.set(g[i], j, v);
     }
 
@@ -272,13 +272,13 @@ contract Foo {
                 if (!_v.forall_8) break;
             }
             if (!(_v.forall_8)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("007690:0067:000 7: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("007697:0067:000 7: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setH(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setH(string memory s, uint8 k, int8 v) internal {
         string_to_mapping_uint8_to_int8_326.get_lhs(h, s)[k] = v;
     }
 
@@ -293,13 +293,13 @@ contract Foo {
                 if (!_v.forall_9) break;
             }
             if (!(_v.forall_9)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("008427:0067:000 8: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("008435:0067:000 8: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setI(string memory s, uint8 k, int8 v) private {
+    function _original_Foo_setI(string memory s, uint8 k, int8 v) internal {
         uint8_to_int8_326.set(i[s], k, v);
     }
 
@@ -318,13 +318,13 @@ contract Foo {
                 if (!_v.forall_10) break;
             }
             if (!(_v.forall_10)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("009239:0067:000 9: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("009248:0067:000 9: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setJ(uint saI, string memory x, uint v) private {
+    function _original_Foo_setJ(uint saI, string memory x, uint v) internal {
         string_to_uint256_326.set(j.sas[saI].m, x, v);
     }
 
@@ -344,13 +344,13 @@ contract Foo {
                 if (!_v.forall_11) break;
             }
             if (!(_v.forall_11)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("010239:0068:000 10: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("010249:0068:000 10: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setJ2(uint saI, string memory x, uint v) private {
+    function _original_Foo_setJ2(uint saI, string memory x, uint v) internal {
         string_to_uint256_326.set(j.sas[saI].m, x, v);
     }
 
@@ -372,13 +372,13 @@ contract Foo {
         _original_Foo_setK1(i, v);
         unchecked {
             if (!(_v.old_0)) {
-                emit __ScribbleUtilsLib__326.AssertionFailed("011114:0068:000 11: ");
+                emit __ScribbleUtilsLib__326.AssertionFailed("011125:0068:000 11: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setK1(uint i, uint v) private {
+    function _original_Foo_setK1(uint i, uint v) internal {
         uint256_to_uint256_326.set(k, i, v);
     }
 
diff --git a/test/samples/forall_simple.instrumented.sol b/test/samples/forall_simple.instrumented.sol
index 5477cde8..4cd8f385 100644
--- a/test/samples/forall_simple.instrumented.sol
+++ b/test/samples/forall_simple.instrumented.sol
@@ -90,7 +90,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(false);
     }
 
-    function _original_ForallSimple_push(uint x) private {
+    function _original_ForallSimple_push(uint x) internal {
         a.push(x);
     }
 
@@ -110,7 +110,7 @@ contract ForallSimple {
                 if (!_v.forall_1) break;
             }
             if (!(_v.forall_1)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("002683:0067:000 1: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("002684:0067:000 1: ");
                 assert(false);
             }
         }
@@ -118,7 +118,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test1(uint[] memory a, uint x) private {}
+    function _original_ForallSimple_test1(uint[] memory a, uint x) internal {}
 
     function test2(uint[] memory a, uint x) public {
         vars3 memory _v;
@@ -135,7 +135,7 @@ contract ForallSimple {
                 if (!_v.forall_2) break;
             }
             if (!(_v.forall_2)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("003635:0067:000 2: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("003637:0067:000 2: ");
                 assert(false);
             }
         }
@@ -143,7 +143,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test2(uint[] memory a, uint x) private {
+    function _original_ForallSimple_test2(uint[] memory a, uint x) internal {
         t = x;
     }
 
@@ -166,7 +166,7 @@ contract ForallSimple {
         _original_ForallSimple_test3(a, x);
         unchecked {
             if (!(_v.old_1)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("004742:0067:000 3: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("004745:0067:000 3: ");
                 assert(false);
             }
         }
@@ -174,7 +174,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test3(uint[] memory a, uint x) private {
+    function _original_ForallSimple_test3(uint[] memory a, uint x) internal {
         t1 = x;
     }
 
@@ -198,7 +198,7 @@ contract ForallSimple {
                 if (!_v.forall_4) break;
             }
             if (!(_v.forall_4)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("005939:0067:000 4: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("005943:0067:000 4: ");
                 assert(false);
             }
         }
@@ -206,7 +206,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test4(uint[][] memory a, uint x) private {
+    function _original_ForallSimple_test4(uint[][] memory a, uint x) internal {
         t2 = x;
     }
 
@@ -222,7 +222,7 @@ contract ForallSimple {
                 if (!_v.forall_6) break;
             }
             if (!(_v.forall_6)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("006832:0067:000 5: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("006837:0067:000 5: ");
                 assert(false);
             }
         }
@@ -230,7 +230,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test5() private {}
+    function _original_ForallSimple_test5() internal {}
 
     function test6() public {
         vars7 memory _v;
@@ -244,7 +244,7 @@ contract ForallSimple {
                 if (!_v.forall_7) break;
             }
             if (!(_v.forall_7)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("007661:0067:000 6: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("007667:0067:000 6: ");
                 assert(false);
             }
         }
@@ -252,7 +252,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test6() private {}
+    function _original_ForallSimple_test6() internal {}
 
     function test7() public {
         vars8 memory _v;
@@ -266,7 +266,7 @@ contract ForallSimple {
                 if (!_v.forall_8) break;
             }
             if (!(_v.forall_8)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("008490:0067:000 7: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("008497:0067:000 7: ");
                 assert(false);
             }
         }
@@ -274,7 +274,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test7() private {}
+    function _original_ForallSimple_test7() internal {}
 
     function test11() public {
         vars9 memory _v;
@@ -288,7 +288,7 @@ contract ForallSimple {
                 if (!_v.forall_9) break;
             }
             if (!(_v.forall_9)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("009317:0067:000 8: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("009325:0067:000 8: ");
                 assert(false);
             }
         }
@@ -296,7 +296,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test11() private {}
+    function _original_ForallSimple_test11() internal {}
 
     function test12() public {
         vars10 memory _v;
@@ -312,7 +312,7 @@ contract ForallSimple {
             }
             _v.let_4 = _v.forall_10;
             if (!(_v.let_4)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("010266:0067:000 9: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("010275:0067:000 9: ");
                 assert(false);
             }
         }
@@ -320,7 +320,7 @@ contract ForallSimple {
         __ScribbleUtilsLib__106.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_ForallSimple_test12() private {}
+    function _original_ForallSimple_test12() internal {}
 
     /// Check only the current contract's state invariants
     function __scribble_ForallSimple_check_state_invariants_internal() internal {
@@ -332,7 +332,7 @@ contract ForallSimple {
                 if (!_v.forall_0) break;
             }
             if (!(_v.forall_0)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("011042:0067:000 0: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("011052:0067:000 0: ");
                 assert(false);
             }
         }
diff --git a/test/samples/hardhat_test.instrumented.sol b/test/samples/hardhat_test.instrumented.sol
index 9cfe6b0f..7b96de1a 100644
--- a/test/samples/hardhat_test.instrumented.sol
+++ b/test/samples/hardhat_test.instrumented.sol
@@ -536,7 +536,7 @@ contract HardHatTest {
         }
     }
 
-    function _original_HardHatTest_main(string memory str, bytes memory bts) private {}
+    function _original_HardHatTest_main(string memory str, bytes memory bts) internal {}
 }
 
 library __ScribbleUtilsLib__19 {
diff --git a/test/samples/hints.instrumented.sol b/test/samples/hints.instrumented.sol
index 02997797..e722cf81 100644
--- a/test/samples/hints.instrumented.sol
+++ b/test/samples/hints.instrumented.sol
@@ -38,7 +38,7 @@ contract Foo {
         _original_Foo_bar(x);
     }
 
-    function _original_Foo_bar(uint x) private {
+    function _original_Foo_bar(uint x) internal {
         vars3 memory _v;
         unchecked {
             require(x > 10);
@@ -56,7 +56,7 @@ contract Foo {
         _original_Foo_boo();
     }
 
-    function _original_Foo_boo() private {}
+    function _original_Foo_boo() internal {}
 
     function baz() internal {}
 
@@ -71,7 +71,7 @@ contract Foo {
         RET_0 = _original_Foo_test(x, y);
     }
 
-    function _original_Foo_test(uint x, uint y) private returns (uint) {
+    function _original_Foo_test(uint x, uint y) internal returns (uint) {
         vars4 memory _v;
         uint a = 1;
         uint b = 2;
diff --git a/test/samples/if_succeeds_on_contract.instrumented.sol b/test/samples/if_succeeds_on_contract.instrumented.sol
index 29086a43..b6d19d9f 100644
--- a/test/samples/if_succeeds_on_contract.instrumented.sol
+++ b/test/samples/if_succeeds_on_contract.instrumented.sol
@@ -24,7 +24,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_inc(uint x) private returns (uint y) {
+    function _original_Foo_inc(uint x) internal returns (uint y) {
         return x + 1;
     }
 
diff --git a/test/samples/if_succeeds_on_contract_inheritance.instrumented.sol b/test/samples/if_succeeds_on_contract_inheritance.instrumented.sol
index aeae07ba..96af4c80 100644
--- a/test/samples/if_succeeds_on_contract_inheritance.instrumented.sol
+++ b/test/samples/if_succeeds_on_contract_inheritance.instrumented.sol
@@ -15,19 +15,19 @@ contract Foo {
         }
     }
 
-    function _original_Foo_inc(uint x) private returns (uint y) {
+    function _original_Foo_inc(uint x) internal returns (uint y) {
         return x + 1;
     }
 
     function inc2(uint x) virtual public returns (uint y) {
         y = _original_Foo_inc2(x);
         if (!(b == (a + 1))) {
-            emit __ScribbleUtilsLib__56.AssertionFailed("000717:0066:000 0: ");
+            emit __ScribbleUtilsLib__56.AssertionFailed("000718:0066:000 0: ");
             assert(false);
         }
     }
 
-    function _original_Foo_inc2(uint x) private returns (uint y) {}
+    function _original_Foo_inc2(uint x) internal returns (uint y) {}
 }
 
 library __ScribbleUtilsLib__56 {
@@ -60,12 +60,12 @@ contract Bar is Foo {
     function inc2(uint x) override public returns (uint y) {
         y = _original_Bar_inc2(x);
         if (!(b == (a + 1))) {
-            emit __ScribbleUtilsLib__56.AssertionFailed("001799:0066:000 0: ");
+            emit __ScribbleUtilsLib__56.AssertionFailed("001801:0066:000 0: ");
             assert(false);
         }
     }
 
-    function _original_Bar_inc2(uint x) private returns (uint y) {
+    function _original_Bar_inc2(uint x) internal returns (uint y) {
         return x + 3;
     }
 
diff --git a/test/samples/if_updated_unsafe.instrumented.sol b/test/samples/if_updated_unsafe.instrumented.sol
index c130f45a..8a56a5ce 100644
--- a/test/samples/if_updated_unsafe.instrumented.sol
+++ b/test/samples/if_updated_unsafe.instrumented.sol
@@ -16,7 +16,7 @@ contract TestUnchecked {
         }
     }
 
-    function _original_TestUnchecked_foo() private {
+    function _original_TestUnchecked_foo() internal {
         TestUnchecked_x_uint8_assign(254);
         TestUnchecked_x_uint8_plus_assign(1);
         unchecked {
@@ -34,11 +34,11 @@ contract TestUnchecked {
     function TestUnchecked_x_inline_initializer() internal {
         unchecked {
             if (!(id(x) > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("001090:0068:000 1: A1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("001091:0068:000 1: A1");
                 assert(false);
             }
             if (!(x > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("001249:0068:000 2: U1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("001250:0068:000 2: U1");
                 assert(false);
             }
         }
@@ -53,11 +53,11 @@ contract TestUnchecked {
         RET0 = x;
         unchecked {
             if (!(id(x) > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("001644:0068:000 1: A1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("001645:0068:000 1: A1");
                 assert(false);
             }
             if (!(x > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("001803:0068:000 2: U1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("001804:0068:000 2: U1");
                 assert(false);
             }
         }
@@ -68,11 +68,11 @@ contract TestUnchecked {
         RET1 = x;
         unchecked {
             if (!(id(x) > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("002131:0068:000 1: A1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("002132:0068:000 1: A1");
                 assert(false);
             }
             if (!(x > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("002290:0068:000 2: U1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("002291:0068:000 2: U1");
                 assert(false);
             }
         }
@@ -85,11 +85,11 @@ contract TestUnchecked {
         RET2 = x;
         unchecked {
             if (!(id(x) > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("002662:0068:000 1: A1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("002663:0068:000 1: A1");
                 assert(false);
             }
             if (!(x > 0)) {
-                emit __ScribbleUtilsLib__25.AssertionFailed("002821:0068:000 2: U1");
+                emit __ScribbleUtilsLib__25.AssertionFailed("002822:0068:000 2: U1");
                 assert(false);
             }
         }
diff --git a/test/samples/increment.instrumented.sol b/test/samples/increment.instrumented.sol
index fbce359b..805eb95f 100644
--- a/test/samples/increment.instrumented.sol
+++ b/test/samples/increment.instrumented.sol
@@ -11,7 +11,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/increment_inherited.instrumented.sol b/test/samples/increment_inherited.instrumented.sol
index cc70ae61..608cd22e 100644
--- a/test/samples/increment_inherited.instrumented.sol
+++ b/test/samples/increment_inherited.instrumented.sol
@@ -42,7 +42,7 @@ contract Foo is Base {
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/increment_inherited2.instrumented.sol b/test/samples/increment_inherited2.instrumented.sol
index 84ce548c..3ed0f2b6 100644
--- a/test/samples/increment_inherited2.instrumented.sol
+++ b/test/samples/increment_inherited2.instrumented.sol
@@ -46,7 +46,7 @@ contract Foo is Base {
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/increment_inherited3.instrumented.sol b/test/samples/increment_inherited3.instrumented.sol
index 97e0c730..bd4eb1cd 100644
--- a/test/samples/increment_inherited3.instrumented.sol
+++ b/test/samples/increment_inherited3.instrumented.sol
@@ -11,7 +11,7 @@ contract Base {
         }
     }
 
-    function _original_Base_foo(uint256 x) private returns (uint256 y) {
+    function _original_Base_foo(uint256 x) internal returns (uint256 y) {
         return x + 2;
     }
 }
@@ -46,16 +46,16 @@ contract Foo is Base {
     function foo(uint256 x) public returns (uint256 y) {
         y = _original_Foo_foo(x);
         if (!(y > x)) {
-            __ScribbleUtilsLib__30.assertionFailed("001392:0063:000 0: P0");
+            __ScribbleUtilsLib__30.assertionFailed("001393:0063:000 0: P0");
             assert(false);
         }
         if (!(y == (x + 1))) {
-            __ScribbleUtilsLib__30.assertionFailed("001537:0063:000 1: P0");
+            __ScribbleUtilsLib__30.assertionFailed("001538:0063:000 1: P0");
             assert(false);
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/increment_inherited3_v06.instrumented.sol b/test/samples/increment_inherited3_v06.instrumented.sol
index 00867c7b..b39ea10e 100644
--- a/test/samples/increment_inherited3_v06.instrumented.sol
+++ b/test/samples/increment_inherited3_v06.instrumented.sol
@@ -11,7 +11,7 @@ contract Base {
         }
     }
 
-    function _original_Base_foo(uint256 x) private returns (uint256 y) {
+    function _original_Base_foo(uint256 x) internal returns (uint256 y) {
         return x + 2;
     }
 }
@@ -46,16 +46,16 @@ contract Foo is Base {
     function foo(uint256 x) override public returns (uint256 y) {
         y = _original_Foo_foo(x);
         if (!(y > x)) {
-            emit __ScribbleUtilsLib__33.AssertionFailed("001414:0068:000 0: P0");
+            emit __ScribbleUtilsLib__33.AssertionFailed("001415:0068:000 0: P0");
             assert(false);
         }
         if (!(y == (x + 1))) {
-            emit __ScribbleUtilsLib__33.AssertionFailed("001564:0068:000 1: P0");
+            emit __ScribbleUtilsLib__33.AssertionFailed("001565:0068:000 1: P0");
             assert(false);
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/increment_inherited4.instrumented.sol b/test/samples/increment_inherited4.instrumented.sol
index e954ffd1..2cb18a79 100644
--- a/test/samples/increment_inherited4.instrumented.sol
+++ b/test/samples/increment_inherited4.instrumented.sol
@@ -51,7 +51,7 @@ contract Foo is Base {
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/increment_inherited_collision.instrumented.sol b/test/samples/increment_inherited_collision.instrumented.sol
index e66c0886..1fb2464b 100644
--- a/test/samples/increment_inherited_collision.instrumented.sol
+++ b/test/samples/increment_inherited_collision.instrumented.sol
@@ -34,7 +34,7 @@ abstract contract __scribble_ReentrancyUtils {
         __ScribbleUtilsLib__86.setInContract(!_v1.__scribble_check_invs_at_end);
     }
 
-    function _original___scribble_ReentrancyUtils___scribble_check_state_invariants(uint x) private returns (uint) {
+    function _original___scribble_ReentrancyUtils___scribble_check_state_invariants(uint x) internal returns (uint) {
         return x;
     }
 
@@ -47,7 +47,7 @@ abstract contract __scribble_ReentrancyUtils {
         __ScribbleUtilsLib__86.setInContract(!_v1.__scribble_check_invs_at_end);
     }
 
-    function _original___scribble_ReentrancyUtils___scribble_check_state_invariants1() private {
+    function _original___scribble_ReentrancyUtils___scribble_check_state_invariants1() internal {
         assert(false);
     }
 
@@ -132,14 +132,14 @@ contract Foo is __scribble_ReentrancyUtils {
         _v1.let_1 = _v1.let_0;
         _v1.let_2 = _v1.let_1;
         if (!(_v1.let_2)) {
-            emit __ScribbleUtilsLib__86.AssertionFailed("004483:0068:000 0: P0");
+            emit __ScribbleUtilsLib__86.AssertionFailed("004485:0068:000 0: P0");
             assert(false);
         }
         if (_v1.__scribble_check_invs_at_end) __scribble_check_state_invariants1();
         __ScribbleUtilsLib__86.setInContract(!_v1.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_foo1(uint256 _v) private returns (uint256 y) {
+    function _original_Foo_foo1(uint256 _v) internal returns (uint256 y) {
         t++;
         return _v + 1;
     }
@@ -151,7 +151,7 @@ contract Foo is __scribble_ReentrancyUtils {
     /// Check only the current contract's state invariants
     function __scribble_Foo_check_state_invariants_internal1() internal {
         if (!(t >= 1)) {
-            emit __ScribbleUtilsLib__86.AssertionFailed("005152:0066:000 1: ");
+            emit __ScribbleUtilsLib__86.AssertionFailed("005155:0066:000 1: ");
             assert(false);
         }
     }
diff --git a/test/samples/increment_inheritedv6.instrumented.sol b/test/samples/increment_inheritedv6.instrumented.sol
index 866f6f77..b0e2a454 100644
--- a/test/samples/increment_inheritedv6.instrumented.sol
+++ b/test/samples/increment_inheritedv6.instrumented.sol
@@ -42,7 +42,7 @@ contract Foo is Base {
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/increment_multiline.instrumented.sol b/test/samples/increment_multiline.instrumented.sol
index ceb87831..67771452 100644
--- a/test/samples/increment_multiline.instrumented.sol
+++ b/test/samples/increment_multiline.instrumented.sol
@@ -11,19 +11,19 @@ contract Foo {
         }
     }
 
-    function _original_Foo_foo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 
     function boo(uint256 x) public returns (uint256 y) {
         y = _original_Foo_boo(x);
         if (!(y == (x + 1))) {
-            emit __ScribbleUtilsLib__29.AssertionFailed("000645:0068:000 1: P0");
+            emit __ScribbleUtilsLib__29.AssertionFailed("000646:0068:000 1: P0");
             assert(false);
         }
     }
 
-    function _original_Foo_boo(uint256 x) private returns (uint256 y) {
+    function _original_Foo_boo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
diff --git a/test/samples/let_annotation.instrumented.sol b/test/samples/let_annotation.instrumented.sol
index 34b56398..636d189c 100644
--- a/test/samples/let_annotation.instrumented.sol
+++ b/test/samples/let_annotation.instrumented.sol
@@ -84,7 +84,7 @@ contract LetAnnotation {
         }
     }
 
-    function _original_LetAnnotation_foo3() private {}
+    function _original_LetAnnotation_foo3() internal {}
 }
 
 contract Foo {
@@ -105,13 +105,13 @@ contract Foo {
             (_v.dummy_, _v.x) = snd(v);
             _v.let_1 = _v.x == 2;
             if (!(_v.let_1)) {
-                emit __ScribbleUtilsLib__127.AssertionFailed("002635:0069:000 1: P0");
+                emit __ScribbleUtilsLib__127.AssertionFailed("002636:0069:000 1: P0");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_foo(uint v) private {}
+    function _original_Foo_foo(uint v) internal {}
 }
 
 library __ScribbleUtilsLib__127 {
diff --git a/test/samples/library_annotation.instrumented.sol b/test/samples/library_annotation.instrumented.sol
index 4c74ddbe..112def56 100644
--- a/test/samples/library_annotation.instrumented.sol
+++ b/test/samples/library_annotation.instrumented.sol
@@ -13,7 +13,7 @@ library Foo {
         }
     }
 
-    function _original_Foo_foo() private returns (uint) {
+    function _original_Foo_foo() internal returns (uint) {
         return 1;
     }
 }
diff --git a/test/samples/macro_erc20_nested_vars.instrumented.sol b/test/samples/macro_erc20_nested_vars.instrumented.sol
index 567a25b4..a2fe585d 100644
--- a/test/samples/macro_erc20_nested_vars.instrumented.sol
+++ b/test/samples/macro_erc20_nested_vars.instrumented.sol
@@ -39,7 +39,7 @@ contract VulnerableToken {
         __ScribbleUtilsLib__222.setInContract(false);
     }
 
-    function _original_VulnerableToken_transfer(address _to, uint256 _value) private returns (bool) {
+    function _original_VulnerableToken_transfer(address _to, uint256 _value) internal returns (bool) {
         address from = msg.sender;
         require(_value <= address_to_uint256_222.get(_balances, from));
         address_to_uint256_222.set(_balances, from, address_to_uint256_222.get(_balances, from) - _value);
@@ -55,7 +55,7 @@ contract VulnerableToken {
         __ScribbleUtilsLib__222.setInContract(false);
     }
 
-    function _original_VulnerableToken_approve(address _spender, uint256 _value) private returns (bool) {
+    function _original_VulnerableToken_approve(address _spender, uint256 _value) internal returns (bool) {
         address owner = msg.sender;
         _allowances[owner][_spender] = _value;
         emit Approval(owner, _spender, _value);
@@ -69,7 +69,7 @@ contract VulnerableToken {
         __ScribbleUtilsLib__222.setInContract(false);
     }
 
-    function _original_VulnerableToken_transferFrom(address _from, address _to, uint256 _value) private returns (bool) {
+    function _original_VulnerableToken_transferFrom(address _from, address _to, uint256 _value) internal returns (bool) {
         uint256 allowed = _allowances[_from][msg.sender];
         require(_value <= allowed);
         require(_value <= address_to_uint256_222.get(_balances, _from));
@@ -84,7 +84,7 @@ contract VulnerableToken {
     function __scribble_VulnerableToken_check_state_invariants_internal() internal {
         unchecked {
             if (!(_balances.sum == _totalSupply)) {
-                emit __ScribbleUtilsLib__222.AssertionFailed("003781:0098:000 1: Sum of balances is total supply");
+                emit __ScribbleUtilsLib__222.AssertionFailed("003784:0098:000 1: Sum of balances is total supply");
                 assert(false);
             }
         }
diff --git a/test/samples/maps_sum.instrumented.sol b/test/samples/maps_sum.instrumented.sol
index 9e001013..9f4d96b6 100644
--- a/test/samples/maps_sum.instrumented.sol
+++ b/test/samples/maps_sum.instrumented.sol
@@ -44,7 +44,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_setA(uint k, uint v) private {
+    function _original_Foo_setA(uint k, uint v) internal {
         uint256_to_uint256_227.set(a, k, v);
     }
 
@@ -52,13 +52,13 @@ contract Foo {
         _original_Foo_incA(k);
         unchecked {
             if (!((a.sum > 10) && (a.sum < 20))) {
-                emit __ScribbleUtilsLib__227.AssertionFailed("001345:0067:000 1: ");
+                emit __ScribbleUtilsLib__227.AssertionFailed("001346:0067:000 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_incA(uint k) private {
+    function _original_Foo_incA(uint k) internal {
         uint256_to_uint256_227.inc(a, k);
     }
 
@@ -66,13 +66,13 @@ contract Foo {
         _original_Foo_decA(k);
         unchecked {
             if (!((a.sum > 10) && (a.sum < 20))) {
-                emit __ScribbleUtilsLib__227.AssertionFailed("001728:0067:000 2: ");
+                emit __ScribbleUtilsLib__227.AssertionFailed("001730:0067:000 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_decA(uint k) private {
+    function _original_Foo_decA(uint k) internal {
         uint256_to_uint256_227.dec(a, k);
     }
 
@@ -80,13 +80,13 @@ contract Foo {
         _original_Foo_setB(k, v);
         unchecked {
             if (!(b.sum > 128)) {
-                emit __ScribbleUtilsLib__227.AssertionFailed("002105:0067:000 3: ");
+                emit __ScribbleUtilsLib__227.AssertionFailed("002108:0067:000 3: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setB(uint k, int8 v) private {
+    function _original_Foo_setB(uint k, int8 v) internal {
         uint256_to_int8_227.set(b, k, v);
     }
 
@@ -94,13 +94,13 @@ contract Foo {
         _original_Foo_decB(k);
         unchecked {
             if (!(b.sum > 128)) {
-                emit __ScribbleUtilsLib__227.AssertionFailed("002479:0067:000 4: ");
+                emit __ScribbleUtilsLib__227.AssertionFailed("002483:0067:000 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_decB(uint k) private {
+    function _original_Foo_decB(uint k) internal {
         uint256_to_int8_227.dec_pre(b, k);
     }
 
@@ -149,13 +149,13 @@ contract Foo {
                 if (!_v.forall_0) break;
             }
             if (!(_v.forall_0)) {
-                emit __ScribbleUtilsLib__227.AssertionFailed("004032:0067:000 5: ");
+                emit __ScribbleUtilsLib__227.AssertionFailed("004037:0067:000 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_setC(string memory k1, uint k2, int16 v) private {
+    function _original_Foo_setC(string memory k1, uint k2, int16 v) internal {
         uint256_to_int16_227.set(string_to_uint256_to_int16_227_S_229_227.get_lhs(c, k1), k2, v);
     }
 
@@ -170,13 +170,13 @@ contract Foo {
                 if (!_v.forall_1) break;
             }
             if (!(_v.forall_1)) {
-                emit __ScribbleUtilsLib__227.AssertionFailed("004813:0067:000 6: ");
+                emit __ScribbleUtilsLib__227.AssertionFailed("004819:0067:000 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_decC(string memory k1, uint k2) private {
+    function _original_Foo_decC(string memory k1, uint k2) internal {
         unchecked {
             uint256_to_int16_227.dec_unch(string_to_uint256_to_int16_227_S_229_227.get_lhs(c, k1), k2);
         }
@@ -193,13 +193,13 @@ contract Foo {
                 if (!_v.forall_2) break;
             }
             if (!(_v.forall_2)) {
-                emit __ScribbleUtilsLib__227.AssertionFailed("005621:0067:000 7: ");
+                emit __ScribbleUtilsLib__227.AssertionFailed("005628:0067:000 7: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_incC(string memory k1, uint k2) private {
+    function _original_Foo_incC(string memory k1, uint k2) internal {
         unchecked {
             uint256_to_int16_227.inc_unch(string_to_uint256_to_int16_227_S_229_227.get_lhs(c, k1), k2);
         }
diff --git a/test/samples/misc.instrumented.sol b/test/samples/misc.instrumented.sol
index 591a3a41..f7fe8ed1 100644
--- a/test/samples/misc.instrumented.sol
+++ b/test/samples/misc.instrumented.sol
@@ -11,7 +11,7 @@ contract AddrChecker {
         }
     }
 
-    function _original_AddrChecker_checkAddr(address addr) private {
+    function _original_AddrChecker_checkAddr(address addr) internal {
         require(addr != address(0xAaaaAaAAaaaAAaAAaAaaaaAAAAAaAaaaAaAaaAA0));
     }
 }
@@ -22,12 +22,12 @@ contract MapIdx {
     function main(string memory arg) public {
         _original_MapIdx_main(arg);
         if (!(a[arg] == 0)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("000808:0068:000 1: F");
+            emit __ScribbleUtilsLib__318.AssertionFailed("000809:0068:000 1: F");
             assert(false);
         }
     }
 
-    function _original_MapIdx_main(string memory arg) private {}
+    function _original_MapIdx_main(string memory arg) internal {}
 }
 
 contract MemoryCast {
@@ -36,12 +36,12 @@ contract MemoryCast {
     function entry() external {
         _original_MemoryCast_entry();
         if (!(_isEvenLen(_nums))) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("001161:0069:000 2: P1");
+            emit __ScribbleUtilsLib__318.AssertionFailed("001163:0069:000 2: P1");
             assert(false);
         }
     }
 
-    function _original_MemoryCast_entry() private {
+    function _original_MemoryCast_entry() internal {
         require(_isEvenLen(_nums));
         _nums.push();
     }
@@ -73,12 +73,12 @@ contract OldInOld {
         _v.let_1 = _v.let_0;
         _v.let_2 = _v.let_1;
         if (!(_v.let_2)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("002028:0067:000 3: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("002031:0067:000 3: ");
             assert(false);
         }
     }
 
-    function _original_OldInOld_moo() private {
+    function _original_OldInOld_moo() internal {
         t = t * 2;
     }
 }
@@ -97,12 +97,12 @@ contract OldInOld2 {
         RET_0 = _original_OldInOld2_balanceOf();
         _v.let_3 = _v.old_0 == 42;
         if (!(_v.let_3)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("002612:0067:000 4: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("002616:0067:000 4: ");
             assert(false);
         }
     }
 
-    function _original_OldInOld2_balanceOf() private view returns (uint) {}
+    function _original_OldInOld2_balanceOf() internal view returns (uint) {}
 }
 
 contract OldTuple {
@@ -125,12 +125,12 @@ contract OldTuple {
         _original_OldTuple_main(k);
         _v.let_4 = (x == (_v.oldX + k)) && (y == (_v.oldY + k));
         if (!(_v.let_4)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("003279:0067:000 5: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("003284:0067:000 5: ");
             assert(false);
         }
     }
 
-    function _original_OldTuple_main(uint k) private {
+    function _original_OldTuple_main(uint k) internal {
         x += k;
         y += k;
     }
@@ -151,12 +151,12 @@ contract Result {
     function a() public returns (uint RET_0) {
         RET_0 = _original_Result_a();
         if (!(RET_0 == 1)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("003784:0067:000 6: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("003790:0067:000 6: ");
             assert(false);
         }
     }
 
-    function _original_Result_a() private returns (uint) {
+    function _original_Result_a() internal returns (uint) {
         return 1;
     }
 
@@ -166,16 +166,16 @@ contract Result {
         _v.t2 = x;
         _v.let_5 = _v.t2 == x;
         if (!(x == x)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("004170:0067:000 7: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("004177:0067:000 7: ");
             assert(false);
         }
         if (!(_v.let_5)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("004315:0067:000 8: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("004322:0067:000 8: ");
             assert(false);
         }
     }
 
-    function _original_Result_b() private returns (uint x) {
+    function _original_Result_b() internal returns (uint x) {
         x = 2;
     }
 
@@ -185,12 +185,12 @@ contract Result {
         (_v.a1, _v.b1) = (RET_0, t);
         _v.let_6 = ((_v.a1 == 1) && (_v.b1 == 2)) && (t == _v.b1);
         if (!(_v.let_6)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("004777:0067:000 9: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("004785:0067:000 9: ");
             assert(false);
         }
     }
 
-    function _original_Result_d() private returns (uint, uint t) {
+    function _original_Result_d() internal returns (uint, uint t) {
         return (1, 2);
     }
 }
@@ -209,24 +209,24 @@ contract UsingForRefType {
     function main(string memory mS) public {
         _original_UsingForRefType_main(mS);
         if (!(sS.len() == mS.len())) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("005328:0069:000 10: F");
+            emit __ScribbleUtilsLib__318.AssertionFailed("005337:0069:000 10: F");
             assert(false);
         }
     }
 
-    function _original_UsingForRefType_main(string memory mS) private {}
+    function _original_UsingForRefType_main(string memory mS) internal {}
 }
 
 contract ExternalCall {
     function process(bytes calldata _bytes) external returns (bool result) {
         result = _original_ExternalCall_process(_bytes);
         if (!(this.checkBytes(_bytes) == result)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("005741:0078:000 11: wrong byte");
+            emit __ScribbleUtilsLib__318.AssertionFailed("005751:0078:000 11: wrong byte");
             assert(false);
         }
     }
 
-    function _original_ExternalCall_process(bytes calldata _bytes) private returns (bool result) {
+    function _original_ExternalCall_process(bytes calldata _bytes) internal returns (bool result) {
         return this.checkBytes(_bytes);
     }
 
@@ -245,24 +245,24 @@ contract CallinInstrumentedFun {
     function getX() public returns (uint res) {
         res = _original_CallinInstrumentedFun_getX();
         if (!(res > 0)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("006422:0068:000 12: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("006433:0068:000 12: ");
             assert(false);
         }
     }
 
-    function _original_CallinInstrumentedFun_getX() private view returns (uint res) {
+    function _original_CallinInstrumentedFun_getX() internal view returns (uint res) {
         return x;
     }
 
     function inc(uint x) public returns (uint res) {
         res = _original_CallinInstrumentedFun_inc(x);
         if (!(res == (x + _original_CallinInstrumentedFun_getX()))) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("006836:0068:000 13: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("006848:0068:000 13: ");
             assert(false);
         }
     }
 
-    function _original_CallinInstrumentedFun_inc(uint x) private returns (uint res) {
+    function _original_CallinInstrumentedFun_inc(uint x) internal returns (uint res) {
         return x + getX();
     }
 }
@@ -271,12 +271,12 @@ contract IndexAccessOnResult {
     function foo() public returns (uint[] memory RET_0) {
         RET_0 = _original_IndexAccessOnResult_foo();
         if (!(RET_0[0] > 1)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("007257:0068:000 14: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("007270:0068:000 14: ");
             assert(false);
         }
     }
 
-    function _original_IndexAccessOnResult_foo() private pure returns (uint[] memory) {
+    function _original_IndexAccessOnResult_foo() internal pure returns (uint[] memory) {
         uint[] memory x = new uint[](1);
         x[1] = 2;
         return x;
@@ -287,16 +287,16 @@ contract SemicolonInString {
     function foo(uint256 x) public returns (uint256 y) {
         y = _original_SemicolonInString_foo(x);
         if (!(keccak256("ab;") != bytes32(0x00))) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("007743:0070:000 15: P0");
+            emit __ScribbleUtilsLib__318.AssertionFailed("007757:0070:000 15: P0");
             assert(false);
         }
         if (!(y == (x + 1))) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("007895:0070:000 16: P1");
+            emit __ScribbleUtilsLib__318.AssertionFailed("007909:0070:000 16: P1");
             assert(false);
         }
     }
 
-    function _original_SemicolonInString_foo(uint256 x) private returns (uint256 y) {
+    function _original_SemicolonInString_foo(uint256 x) internal returns (uint256 y) {
         return x + 1;
     }
 }
@@ -322,7 +322,7 @@ contract Caller {
         __ScribbleUtilsLib__318.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Caller_main(Target t) private {
+    function _original_Caller_main(Target t) internal {
         t.foo(1);
         _callsite_313(t, 2, 3);
     }
@@ -330,7 +330,7 @@ contract Caller {
     /// Check only the current contract's state invariants
     function __scribble_Caller_check_state_invariants_internal() internal {
         if (!(true)) {
-            emit __ScribbleUtilsLib__318.AssertionFailed("009035:0068:000 17: ");
+            emit __ScribbleUtilsLib__318.AssertionFailed("009051:0068:000 17: ");
             assert(false);
         }
     }
diff --git a/test/samples/misc_08.instrumented.sol b/test/samples/misc_08.instrumented.sol
index 2d33efd7..73b2376e 100644
--- a/test/samples/misc_08.instrumented.sol
+++ b/test/samples/misc_08.instrumented.sol
@@ -31,7 +31,7 @@ contract Errors {
         }
     }
 
-    function _original_Errors_foo() private {}
+    function _original_Errors_foo() internal {}
 }
 
 contract RevertStmt {
@@ -41,13 +41,13 @@ contract RevertStmt {
         _original_RevertStmt_foo();
         unchecked {
             if (!(false)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("000821:0067:000 1: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("000822:0067:000 1: ");
                 assert(false);
             }
         }
     }
 
-    function _original_RevertStmt_foo() private {
+    function _original_RevertStmt_foo() internal {
         revert E();
     }
 }
@@ -59,13 +59,13 @@ contract UserDefinedValueTypes {
         RET_0 = _original_UserDefinedValueTypes_orderPrice(p, q);
         unchecked {
             if (!((Price.unwrap(p) * Quantity.unwrap(q)) == Price.unwrap(RET_0))) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("001356:0067:000 2: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("001358:0067:000 2: ");
                 assert(false);
             }
         }
     }
 
-    function _original_UserDefinedValueTypes_orderPrice(Price p, Quantity q) private returns (Price) {
+    function _original_UserDefinedValueTypes_orderPrice(Price p, Quantity q) internal returns (Price) {
         return Price.wrap(Price.unwrap(p) * Quantity.unwrap(q));
     }
 }
@@ -77,13 +77,13 @@ contract FreeFuncs {
         _original_FreeFuncs_operate();
         unchecked {
             if (!(num == 25)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("001848:0069:000 3: P1");
+                emit __ScribbleUtilsLib__106.AssertionFailed("001851:0069:000 3: P1");
                 assert(false);
             }
         }
     }
 
-    function _original_FreeFuncs_operate() private {
+    function _original_FreeFuncs_operate() internal {
         num = addSome(15);
     }
 }
@@ -93,13 +93,13 @@ contract Foo {
         _original_Foo_main();
         unchecked {
             if (!(1 > 0)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("002208:0067:000 4: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("002212:0067:000 4: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_main() private {}
+    function _original_Foo_main() internal {}
 }
 
 contract Ev {
@@ -107,13 +107,13 @@ contract Ev {
         _original_Ev_main();
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__106.AssertionFailed("002522:0067:000 5: ");
+                emit __ScribbleUtilsLib__106.AssertionFailed("002527:0067:000 5: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Ev_main() private {
+    function _original_Ev_main() internal {
         emit X(1);
     }
 }
diff --git a/test/samples/mixing_if_updated_and_forall.instrumented.sol b/test/samples/mixing_if_updated_and_forall.instrumented.sol
index 4c746278..3f62b31b 100644
--- a/test/samples/mixing_if_updated_and_forall.instrumented.sol
+++ b/test/samples/mixing_if_updated_and_forall.instrumented.sol
@@ -49,7 +49,7 @@ contract Foo {
         }
     }
 
-    function _original_Foo_assign_m1(address a, string memory s, uint v) private returns (uint) {
+    function _original_Foo_assign_m1(address a, string memory s, uint v) internal returns (uint) {
         Foo_m1_idx_address_ptr_string_memory_uint256_set(a, s, v);
         return string_to_uint256_62.get(address_to_string_to_uint256_62_S_64_62.get(m1, a), s);
     }
@@ -65,7 +65,7 @@ contract Foo {
                 if (!_v.forall_2) break;
             }
             if (!(_v.forall_2)) {
-                emit __ScribbleUtilsLib__62.AssertionFailed("002454:0066:000 0: ");
+                emit __ScribbleUtilsLib__62.AssertionFailed("002455:0066:000 0: ");
                 assert(false);
             }
         }
@@ -75,11 +75,11 @@ contract Foo {
         string_to_uint256_62.set(address_to_string_to_uint256_62_S_64_62.get_lhs(m1, ARG2), ARG3, ARG4);
         unchecked {
             if (!(string_to_uint256_62.get(address_to_string_to_uint256_62_S_64_62.get(m1, address(0x00)), "abcd") < 5)) {
-                emit __ScribbleUtilsLib__62.AssertionFailed("002969:0066:000 1: ");
+                emit __ScribbleUtilsLib__62.AssertionFailed("002970:0066:000 1: ");
                 assert(false);
             }
             if (!(ARG2 == address(0x00))) {
-                emit __ScribbleUtilsLib__62.AssertionFailed("003142:0066:000 4: ");
+                emit __ScribbleUtilsLib__62.AssertionFailed("003143:0066:000 4: ");
                 assert(false);
             }
         }
diff --git a/test/samples/mutability.instrumented.sol b/test/samples/mutability.instrumented.sol
index 30a7bcd3..00cb68ef 100644
--- a/test/samples/mutability.instrumented.sol
+++ b/test/samples/mutability.instrumented.sol
@@ -33,7 +33,7 @@ contract Baz {
         __ScribbleUtilsLib__78.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Baz_getX() private view returns (uint) {
+    function _original_Baz_getX() internal view returns (uint) {
         return x;
     }
 
@@ -47,21 +47,21 @@ contract Baz {
         __ScribbleUtilsLib__78.setInContract(true);
         RET_0 = _original_Baz_getXPlus2();
         if (!(x > 2)) {
-            emit __ScribbleUtilsLib__78.AssertionFailed("001475:0066:000 3: ");
+            emit __ScribbleUtilsLib__78.AssertionFailed("001476:0066:000 3: ");
             assert(false);
         }
         if (_v.__scribble_check_invs_at_end) __scribble_check_state_invariants();
         __ScribbleUtilsLib__78.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Baz_getXPlus2() private returns (uint) {
+    function _original_Baz_getXPlus2() internal returns (uint) {
         return getXPlus1() + 1;
     }
 
     /// Check only the current contract's state invariants
     function __scribble_Baz_check_state_invariants_internal() internal {
         if (!(x > 0)) {
-            emit __ScribbleUtilsLib__78.AssertionFailed("002020:0066:000 1: ");
+            emit __ScribbleUtilsLib__78.AssertionFailed("002022:0066:000 1: ");
             assert(false);
         }
     }
@@ -110,12 +110,12 @@ contract Foo is Base {
     function getX() virtual override public returns (uint RET_0) {
         RET_0 = _original_Foo_getX();
         if (!(x > 0)) {
-            emit __ScribbleUtilsLib__78.AssertionFailed("003456:0066:000 0: ");
+            emit __ScribbleUtilsLib__78.AssertionFailed("003458:0066:000 0: ");
             assert(false);
         }
     }
 
-    function _original_Foo_getX() private view returns (uint) {
+    function _original_Foo_getX() internal view returns (uint) {
         return x;
     }
 }
@@ -124,12 +124,12 @@ contract Child is Foo {
     function getX() virtual override public returns (uint RET_0) {
         RET_0 = _original_Child_getX();
         if (!(x > 0)) {
-            emit __ScribbleUtilsLib__78.AssertionFailed("003826:0066:000 0: ");
+            emit __ScribbleUtilsLib__78.AssertionFailed("003829:0066:000 0: ");
             assert(false);
         }
     }
 
-    function _original_Child_getX() private returns (uint) {
+    function _original_Child_getX() internal returns (uint) {
         return x + 1;
     }
 }
diff --git a/test/samples/predefined.instrumented.sol b/test/samples/predefined.instrumented.sol
index 20e56627..266e7ef9 100644
--- a/test/samples/predefined.instrumented.sol
+++ b/test/samples/predefined.instrumented.sol
@@ -20,7 +20,7 @@ contract A {
         }
     }
 
-    function _original_A_testHD() private {}
+    function _original_A_testHD() internal {}
 
     constructor() {
         /// Value assignment for const uint256 H := (60 * 60)
@@ -45,13 +45,13 @@ contract B {
         _original_B_testWHD();
         unchecked {
             if (!(((W_15_0 == (D_15_0 * 7)) && (D_15_0 == (H_15_0 * 24))) && (H_15_0 == (60 * 60)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("001527:0066:000 6: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("001528:0066:000 6: ");
                 assert(false);
             }
         }
     }
 
-    function _original_B_testWHD() private {}
+    function _original_B_testWHD() internal {}
 
     constructor() {
         /// Value assignment for const uint256 H := (60 * 60)
@@ -147,53 +147,53 @@ contract EqEncoded {
         RET_0 = _original_EqEncoded_positive();
         unchecked {
             if (!(__ScribbleUtilsLib__98.eq_encoded("abc", hex"616263"))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("004445:0067:000 14: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("004447:0067:000 14: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(bytes2(0xffcc)), abi.encode(bytes2(0xffcc))))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("004687:0067:000 15: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("004689:0067:000 15: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(0xC0FfEec0ffeeC0FfEec0fFEec0FfeEc0fFEe0000), abi.encode(0xC0FfEec0ffeeC0FfEec0fFEec0FfeEc0fFEe0000)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("004985:0067:000 16: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("004987:0067:000 16: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(uint256(512)), abi.encode(uint16(512))))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("005222:0067:000 17: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("005224:0067:000 17: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(int256(-512)), abi.encode(int256(-512))))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("005460:0067:000 18: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("005462:0067:000 18: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(true), abi.encode(true)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("005682:0067:000 19: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("005684:0067:000 19: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(false), abi.encode(false)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("005906:0067:000 20: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("005908:0067:000 20: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(Some(1)), abi.encode(s)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("006128:0067:000 21: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("006130:0067:000 21: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(Other.A), abi.encode(Other.A)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("006356:0067:000 22: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("006358:0067:000 22: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(a), abi.encode(b)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("006572:0067:000 23: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("006574:0067:000 23: ");
                 assert(false);
             }
             if (!(__ScribbleUtilsLib__98.eq_encoded(abi.encode(d), abi.encode(e)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("006788:0067:000 24: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("006790:0067:000 24: ");
                 assert(false);
             }
         }
     }
 
-    function _original_EqEncoded_positive() private returns (bool) {
+    function _original_EqEncoded_positive() internal returns (bool) {
         return true;
     }
 
@@ -201,57 +201,57 @@ contract EqEncoded {
         RET_0 = _original_EqEncoded_negative();
         unchecked {
             if (!(!__ScribbleUtilsLib__98.eq_encoded("abc", "abcd"))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("007226:0067:000 25: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("007229:0067:000 25: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded("abc", "def"))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("007427:0067:000 26: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("007430:0067:000 26: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(hex"616263", hex"616264"))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("007640:0067:000 27: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("007643:0067:000 27: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(bytes2(0xffcc)), abi.encode(bytes2(0xffff))))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("007883:0067:000 28: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("007886:0067:000 28: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF), abi.encode(0xC0FfEec0ffeeC0FfEec0fFEec0FfeEc0fFEe0000)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("008182:0067:000 29: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("008185:0067:000 29: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(uint256(512)), abi.encode(uint16(1024))))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("008421:0067:000 30: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("008424:0067:000 30: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(int256(-512)), abi.encode(int256(-1024))))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("008661:0067:000 31: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("008664:0067:000 31: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(true), abi.encode(false)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("008885:0067:000 32: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("008888:0067:000 32: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(Some(2)), abi.encode(s)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("009108:0067:000 33: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("009111:0067:000 33: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(Other.A), abi.encode(Other.B)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("009337:0067:000 34: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("009340:0067:000 34: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(a), abi.encode(d)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("009554:0067:000 35: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("009557:0067:000 35: ");
                 assert(false);
             }
             if (!(!__ScribbleUtilsLib__98.eq_encoded(abi.encode(c), abi.encode(f)))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("009771:0067:000 36: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("009774:0067:000 36: ");
                 assert(false);
             }
         }
     }
 
-    function _original_EqEncoded_negative() private returns (bool) {
+    function _original_EqEncoded_negative() internal returns (bool) {
         return true;
     }
 }
@@ -292,7 +292,7 @@ contract C is B {
     constructor() {
         unchecked {
             if (!(W_15_0 == (D_15_0 * 7))) {
-                emit __ScribbleUtilsLib__98.AssertionFailed("011083:0066:000 7: ");
+                emit __ScribbleUtilsLib__98.AssertionFailed("011087:0066:000 7: ");
                 assert(false);
             }
         }
diff --git a/test/samples/solidity_builtins_08.instrumented.sol b/test/samples/solidity_builtins_08.instrumented.sol
index 4f84c22e..5d4ec534 100644
--- a/test/samples/solidity_builtins_08.instrumented.sol
+++ b/test/samples/solidity_builtins_08.instrumented.sol
@@ -55,7 +55,7 @@ contract UserDefinedValueTypes {
         }
     }
 
-    function _original_UserDefinedValueTypes_main(uint32 a, int64 b, A c) private {}
+    function _original_UserDefinedValueTypes_main(uint32 a, int64 b, A c) internal {}
 }
 
 contract Foo {
@@ -63,49 +63,49 @@ contract Foo {
         _original_Foo_foo(v);
         unchecked {
             if (!(abi.encode(v).length > 0)) {
-                emit __ScribbleUtilsLib__61.AssertionFailed("002159:0066:000 7: ");
+                emit __ScribbleUtilsLib__61.AssertionFailed("002160:0066:000 7: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_foo(uint v) private {}
+    function _original_Foo_foo(uint v) internal {}
 
     function foo1(uint v) public {
         _original_Foo_foo1(v);
         unchecked {
             if (!(abi.encodePacked(v).length > 0)) {
-                emit __ScribbleUtilsLib__61.AssertionFailed("002495:0066:000 8: ");
+                emit __ScribbleUtilsLib__61.AssertionFailed("002497:0066:000 8: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_foo1(uint v) private {}
+    function _original_Foo_foo1(uint v) internal {}
 
     function foo2(uint v) public {
         _original_Foo_foo2(v);
         unchecked {
             if (!(abi.encodeWithSelector(bytes4(hex"01020304"), v).length > 0)) {
-                emit __ScribbleUtilsLib__61.AssertionFailed("002861:0066:000 9: ");
+                emit __ScribbleUtilsLib__61.AssertionFailed("002864:0066:000 9: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_foo2(uint v) private {}
+    function _original_Foo_foo2(uint v) internal {}
 
     function foo3(uint v) public {
         _original_Foo_foo3(v);
         unchecked {
             if (!(abi.encodeWithSignature("dummy", v).length > 0)) {
-                emit __ScribbleUtilsLib__61.AssertionFailed("003214:0067:000 10: ");
+                emit __ScribbleUtilsLib__61.AssertionFailed("003218:0067:000 10: ");
                 assert(false);
             }
         }
     }
 
-    function _original_Foo_foo3(uint v) private {}
+    function _original_Foo_foo3(uint v) internal {}
 }
 
 library __ScribbleUtilsLib__61 {
diff --git a/test/samples/token_sale.instrumented.sol b/test/samples/token_sale.instrumented.sol
index b4b2de82..cc5bd97b 100644
--- a/test/samples/token_sale.instrumented.sol
+++ b/test/samples/token_sale.instrumented.sol
@@ -22,7 +22,7 @@ contract TokenSale {
         }
     }
 
-    function _original_TokenSale_buy(uint256 numTokens) private {
+    function _original_TokenSale_buy(uint256 numTokens) internal {
         require(msg.value == (numTokens * PRICE_PER_TOKEN));
         balanceOf[msg.sender] += numTokens;
     }
@@ -30,12 +30,12 @@ contract TokenSale {
     function sell(uint256 numTokens) public {
         _original_TokenSale_sell(numTokens);
         if (!(address(this).balance >= 1)) {
-            __ScribbleUtilsLib__88.assertionFailed("001056:0063:000 1: P1");
+            __ScribbleUtilsLib__88.assertionFailed("001057:0063:000 1: P1");
             assert(false);
         }
     }
 
-    function _original_TokenSale_sell(uint256 numTokens) private {
+    function _original_TokenSale_sell(uint256 numTokens) internal {
         require(balanceOf[msg.sender] >= numTokens);
         balanceOf[msg.sender] -= numTokens;
         msg.sender.transfer(numTokens * PRICE_PER_TOKEN);
diff --git a/test/samples/unicode.instrumented.sol b/test/samples/unicode.instrumented.sol
index e8efefaf..4b90a9de 100644
--- a/test/samples/unicode.instrumented.sol
+++ b/test/samples/unicode.instrumented.sol
@@ -24,13 +24,13 @@ contract Foo {
         __ScribbleUtilsLib__8.setInContract(!_v.__scribble_check_invs_at_end);
     }
 
-    function _original_Foo_main() private {}
+    function _original_Foo_main() internal {}
 
     /// Check only the current contract's state invariants
     function __scribble_Foo_check_state_invariants_internal() internal {
         unchecked {
             if (!(true)) {
-                emit __ScribbleUtilsLib__8.AssertionFailed(unicode"001163:0100:000 0: 😀😀😀😀😀😀😀");
+                emit __ScribbleUtilsLib__8.AssertionFailed(unicode"001164:0100:000 0: 😀😀😀😀😀😀😀");
                 assert(false);
             }
         }
diff --git a/test/samples/vm/contract_pos.instrumented.negative.vm.json b/test/samples/vm/contract_pos.instrumented.negative.vm.json
index b8a83051..5a6b7401 100644
--- a/test/samples/vm/contract_pos.instrumented.negative.vm.json
+++ b/test/samples/vm/contract_pos.instrumented.negative.vm.json
@@ -29,7 +29,7 @@
                         0, 0, 0, 0, 0, 0, 0
                     ]
                 ],
-                ["001627:0066:000 0: "]
+                ["001629:0066:000 0: "]
             ]
         }
     ]
diff --git a/test/samples/vm/dbg_event_tests.vm.json b/test/samples/vm/dbg_event_tests.vm.json
index dc129e60..ab1fa5a4 100644
--- a/test/samples/vm/dbg_event_tests.vm.json
+++ b/test/samples/vm/dbg_event_tests.vm.json
@@ -57,7 +57,7 @@
                         0, 0, 0, 0, 0, 0, 5
                     ]
                 ],
-                ["001451:0067:000 5: "]
+                ["001452:0067:000 5: "]
             ]
         },
         {
@@ -84,7 +84,7 @@
                         0, 0, 2
                     ]
                 ],
-                ["001976:0067:000 6: "]
+                ["001978:0067:000 6: "]
             ]
         },
         {
@@ -111,7 +111,7 @@
                         0, 0, 2
                     ]
                 ],
-                ["002377:0067:000 7: "]
+                ["002380:0067:000 7: "]
             ]
         },
         {
@@ -134,7 +134,7 @@
                         0, 0, 0, 0, 0, 0, 2
                     ]
                 ],
-                ["002794:0067:000 8: "]
+                ["002798:0067:000 8: "]
             ]
         },
         {
@@ -161,7 +161,7 @@
                         0, 0, 3
                     ]
                 ],
-                ["003457:0067:000 9: "]
+                ["003462:0067:000 9: "]
             ]
         },
         {
@@ -191,7 +191,7 @@
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
                     ]
                 ],
-                ["004854:0067:000 0: "]
+                ["004860:0067:000 0: "]
             ]
         },
         {
@@ -217,10 +217,10 @@
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7 
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7
                     ]
                 ],
-                ["005398:0067:000 1: "]
+                ["005404:0067:000 1: "]
             ]
         },
         {
@@ -245,7 +245,7 @@
                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
                     ]
                 ],
-                ["005871:0067:000 2: "]
+                ["005877:0067:000 2: "]
             ]
         },
         {
@@ -272,7 +272,7 @@
                         0, 0, 0, 0
                     ]
                 ],
-                ["006821:0067:000 3: "]
+                ["006827:0067:000 3: "]
             ]
         }
     ]
diff --git a/test/unit/interposing.spec.ts b/test/unit/interposing.spec.ts
index 79724ea0..0ad6e9bf 100644
--- a/test/unit/interposing.spec.ts
+++ b/test/unit/interposing.spec.ts
@@ -61,7 +61,7 @@ contract Foo {
         add = _original_Foo_add(x, y);
     }
 
-    function _original_Foo_add(int8 x, uint64 y) private returns (uint64 add) {
+    function _original_Foo_add(int8 x, uint64 y) internal returns (uint64 add) {
         return uint64(x) + y;
     }
 }`
@@ -103,7 +103,7 @@ contract Foo {
         add = _original_Foo_add(x, y);
     }
 
-    function _original_Foo_add(int8 x, uint64 y) private returns (uint64 add) {
+    function _original_Foo_add(int8 x, uint64 y) internal returns (uint64 add) {
         return uint64(x) + y;
     }
 }
@@ -134,7 +134,7 @@ contract Foo {
         _original_Foo_add(x, y);
     }
 
-    function _original_Foo_add(int8 x, uint64 y) private {
+    function _original_Foo_add(int8 x, uint64 y) internal {
         uint64(x) + y;
     }
 }`
@@ -157,7 +157,7 @@ contract Foo {
         (RET_0, RET_1, RET_2) = _original_Foo_swap(x, y, a);
     }
 
-    function _original_Foo_swap(int8 x, uint64 y, address a) private returns (address, int8, uint64) {
+    function _original_Foo_swap(int8 x, uint64 y, address a) internal returns (address, int8, uint64) {
         return (a, x, y);
     }
 }`
@@ -185,7 +185,7 @@ contract Foo {
         (RET_0, RET_1, RET_2) = _original_Foo_swap(x, y, a);
     }
 
-    function _original_Foo_swap(int8 x, uint64 y, address a) private Dummy() returns (address, int8, uint64) {
+    function _original_Foo_swap(int8 x, uint64 y, address a) internal Dummy() returns (address, int8, uint64) {
         return (a, x, y);
     }
 }`
@@ -208,7 +208,7 @@ contract Foo {
         RET_0 = _original_Foo_pureF(x);
     }
 
-    function _original_Foo_pureF(uint x) private pure returns (uint) {
+    function _original_Foo_pureF(uint x) internal pure returns (uint) {
         return x;
     }
 }`
@@ -229,7 +229,7 @@ contract Foo {
         _original_Foo_foo(x);
     }
 
-    function _original_Foo_foo(uint[] memory x) private {}
+    function _original_Foo_foo(uint[] memory x) internal {}
 }`
         ],
         [
@@ -249,7 +249,7 @@ contract Foo {
         RET_0 = _original_Foo_foo(x);
     }
 
-    function _original_Foo_foo(uint[] calldata x) private returns (uint[] calldata) {
+    function _original_Foo_foo(uint[] calldata x) internal returns (uint[] calldata) {
         return x;
     }
 }`
@@ -272,7 +272,7 @@ contract Foo {
         RET_0 = _original_Foo_add(_DUMMY_ARG_0, y);
     }
 
-    function _original_Foo_add(int8, uint64 y) private returns (uint64) {
+    function _original_Foo_add(int8, uint64 y) internal returns (uint64) {
         return y + 1;
     }
 }`