@latticexyz/world 2.0.0-alpha.1.21 → 2.0.0-alpha.1.22

package/abi/PackedCounter.sol/PackedCounterLib.json

@@ -127,23 +127,23 @@
   },
   "ast": {
     "absolutePath": "/home/runner/work/mud/mud/packages/store/src/PackedCounter.sol",
-    "id": 1498,
+    "id": 1510,
     "exportedSymbols": {
       "Bytes": [
         731
       ],
       "PackedCounter": [
-        1081
+        1093
       ],
       "PackedCounterLib": [
-        1497
+        1509
       ]
     },
     "nodeType": "SourceUnit",
     "src": "32:4096:4",
     "nodes": [
       {
-        "id": 1077,
+        "id": 1089,
         "nodeType": "PragmaDirective",
         "src": "32:24:4",
         "nodes": [],
@@ -155,19 +155,19 @@
         ]
       },
       {
-        "id": 1079,
+        "id": 1091,
         "nodeType": "ImportDirective",
         "src": "58:36:4",
         "nodes": [],
         "absolutePath": "/home/runner/work/mud/mud/packages/store/src/Bytes.sol",
         "file": "./Bytes.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 1498,
+        "scope": 1510,
         "sourceUnit": 732,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 1078,
+              "id": 1090,
               "name": "Bytes",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
@@ -181,7 +181,7 @@
         "unitAlias": ""
       },
       {
-        "id": 1081,
+        "id": 1093,
         "nodeType": "UserDefinedValueTypeDefinition",
         "src": "161:30:4",
         "nodes": [],
@@ -189,7 +189,7 @@
         "name": "PackedCounter",
         "nameLocation": "166:13:4",
         "underlyingType": {
-          "id": 1080,
+          "id": 1092,
           "name": "bytes32",
           "nodeType": "ElementaryTypeName",
           "src": "183:7:4",
@@ -200,65 +200,65 @@
         }
       },
       {
-        "id": 1085,
+        "id": 1097,
         "nodeType": "UsingForDirective",
         "src": "193:48:4",
         "nodes": [],
         "global": true,
         "libraryName": {
-          "id": 1082,
+          "id": 1094,
           "name": "PackedCounterLib",
           "nodeType": "IdentifierPath",
-          "referencedDeclaration": 1497,
+          "referencedDeclaration": 1509,
           "src": "199:16:4"
         },
         "typeName": {
-          "id": 1084,
+          "id": 1096,
           "nodeType": "UserDefinedTypeName",
           "pathNode": {
-            "id": 1083,
+            "id": 1095,
             "name": "PackedCounter",
             "nodeType": "IdentifierPath",
-            "referencedDeclaration": 1081,
+            "referencedDeclaration": 1093,
             "src": "220:13:4"
           },
-          "referencedDeclaration": 1081,
+          "referencedDeclaration": 1093,
           "src": "220:13:4",
           "typeDescriptions": {
-            "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+            "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
             "typeString": "PackedCounter"
           }
         }
       },
       {
-        "id": 1497,
+        "id": 1509,
         "nodeType": "ContractDefinition",
         "src": "243:3884:4",
         "nodes": [
           {
-            "id": 1156,
+            "id": 1168,
             "nodeType": "FunctionDefinition",
             "src": "621:563:4",
             "nodes": [],
             "body": {
-              "id": 1155,
+              "id": 1167,
               "nodeType": "Block",
               "src": "699:485:4",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    1096
+                    1108
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1096,
+                      "id": 1108,
                       "mutability": "mutable",
                       "name": "packedCounter",
                       "nameLocation": "713:13:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1155,
+                      "scope": 1167,
                       "src": "705:21:4",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -267,7 +267,7 @@
                         "typeString": "bytes32"
                       },
                       "typeName": {
-                        "id": 1095,
+                        "id": 1107,
                         "name": "bytes32",
                         "nodeType": "ElementaryTypeName",
                         "src": "705:7:4",
@@ -279,23 +279,23 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1097,
+                  "id": 1109,
                   "nodeType": "VariableDeclarationStatement",
                   "src": "705:21:4"
                 },
                 {
                   "assignments": [
-                    1099
+                    1111
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1099,
+                      "id": 1111,
                       "mutability": "mutable",
                       "name": "accumulator",
                       "nameLocation": "739:11:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1155,
+                      "scope": 1167,
                       "src": "732:18:4",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -304,7 +304,7 @@
                         "typeString": "uint32"
                       },
                       "typeName": {
-                        "id": 1098,
+                        "id": 1110,
                         "name": "uint32",
                         "nodeType": "ElementaryTypeName",
                         "src": "732:6:4",
@@ -316,29 +316,29 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1100,
+                  "id": 1112,
                   "nodeType": "VariableDeclarationStatement",
                   "src": "732:18:4"
                 },
                 {
                   "body": {
-                    "id": 1136,
+                    "id": 1148,
                     "nodeType": "Block",
                     "src": "864:166:4",
                     "statements": [
                       {
                         "expression": {
-                          "id": 1124,
+                          "id": 1136,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
-                            "id": 1108,
+                            "id": 1120,
                             "name": "packedCounter",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1096,
+                            "referencedDeclaration": 1108,
                             "src": "872:13:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bytes32",
@@ -350,11 +350,11 @@
                           "rightHandSide": {
                             "arguments": [
                               {
-                                "id": 1111,
+                                "id": 1123,
                                 "name": "packedCounter",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1096,
+                                "referencedDeclaration": 1108,
                                 "src": "904:13:4",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes32",
@@ -366,14 +366,14 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 1116,
+                                "id": 1128,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftExpression": {
                                   "hexValue": "34",
-                                  "id": 1112,
+                                  "id": 1124,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -394,14 +394,14 @@
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   },
-                                  "id": 1115,
+                                  "id": 1127,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftExpression": {
                                     "hexValue": "32",
-                                    "id": 1113,
+                                    "id": 1125,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -418,11 +418,11 @@
                                   "nodeType": "BinaryOperation",
                                   "operator": "*",
                                   "rightExpression": {
-                                    "id": 1114,
+                                    "id": 1126,
                                     "name": "i",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1102,
+                                    "referencedDeclaration": 1114,
                                     "src": "927:1:4",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
@@ -445,24 +445,24 @@
                                 "arguments": [
                                   {
                                     "baseExpression": {
-                                      "id": 1119,
+                                      "id": 1131,
                                       "name": "counters",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1089,
+                                      "referencedDeclaration": 1101,
                                       "src": "937:8:4",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                                         "typeString": "uint16[] memory"
                                       }
                                     },
-                                    "id": 1121,
+                                    "id": 1133,
                                     "indexExpression": {
-                                      "id": 1120,
+                                      "id": 1132,
                                       "name": "i",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1102,
+                                      "referencedDeclaration": 1114,
                                       "src": "946:1:4",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
@@ -488,7 +488,7 @@
                                       "typeString": "uint16"
                                     }
                                   ],
-                                  "id": 1118,
+                                  "id": 1130,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -500,14 +500,14 @@
                                     "typeString": "type(bytes2)"
                                   },
                                   "typeName": {
-                                    "id": 1117,
+                                    "id": 1129,
                                     "name": "bytes2",
                                     "nodeType": "ElementaryTypeName",
                                     "src": "930:6:4",
                                     "typeDescriptions": {}
                                   }
                                 },
-                                "id": 1122,
+                                "id": 1134,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -539,7 +539,7 @@
                                 }
                               ],
                               "expression": {
-                                "id": 1109,
+                                "id": 1121,
                                 "name": "Bytes",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
@@ -550,7 +550,7 @@
                                   "typeString": "type(library Bytes)"
                                 }
                               },
-                              "id": 1110,
+                              "id": 1122,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -564,7 +564,7 @@
                                 "typeString": "function (bytes32,uint256,bytes2) pure returns (bytes32)"
                               }
                             },
-                            "id": 1123,
+                            "id": 1135,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -585,23 +585,23 @@
                             "typeString": "bytes32"
                           }
                         },
-                        "id": 1125,
+                        "id": 1137,
                         "nodeType": "ExpressionStatement",
                         "src": "872:78:4"
                       },
                       {
                         "expression": {
-                          "id": 1130,
+                          "id": 1142,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
-                            "id": 1126,
+                            "id": 1138,
                             "name": "accumulator",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1099,
+                            "referencedDeclaration": 1111,
                             "src": "958:11:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint32",
@@ -612,24 +612,24 @@
                           "operator": "+=",
                           "rightHandSide": {
                             "baseExpression": {
-                              "id": 1127,
+                              "id": 1139,
                               "name": "counters",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1089,
+                              "referencedDeclaration": 1101,
                               "src": "973:8:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                                 "typeString": "uint16[] memory"
                               }
                             },
-                            "id": 1129,
+                            "id": 1141,
                             "indexExpression": {
-                              "id": 1128,
+                              "id": 1140,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1102,
+                              "referencedDeclaration": 1114,
                               "src": "982:1:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -653,18 +653,18 @@
                             "typeString": "uint32"
                           }
                         },
-                        "id": 1131,
+                        "id": 1143,
                         "nodeType": "ExpressionStatement",
                         "src": "958:26:4"
                       },
                       {
-                        "id": 1135,
+                        "id": 1147,
                         "nodeType": "UncheckedBlock",
                         "src": "992:32:4",
                         "statements": [
                           {
                             "expression": {
-                              "id": 1133,
+                              "id": 1145,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -674,11 +674,11 @@
                               "prefix": false,
                               "src": "1012:3:4",
                               "subExpression": {
-                                "id": 1132,
+                                "id": 1144,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1102,
+                                "referencedDeclaration": 1114,
                                 "src": "1012:1:4",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
@@ -690,7 +690,7 @@
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 1134,
+                            "id": 1146,
                             "nodeType": "ExpressionStatement",
                             "src": "1012:3:4"
                           }
@@ -703,17 +703,17 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1107,
+                    "id": 1119,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
-                      "id": 1104,
+                      "id": 1116,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1102,
+                      "referencedDeclaration": 1114,
                       "src": "841:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -724,18 +724,18 @@
                     "operator": "<",
                     "rightExpression": {
                       "expression": {
-                        "id": 1105,
+                        "id": 1117,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1089,
+                        "referencedDeclaration": 1101,
                         "src": "845:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1106,
+                      "id": 1118,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -754,20 +754,20 @@
                       "typeString": "bool"
                     }
                   },
-                  "id": 1137,
+                  "id": 1149,
                   "initializationExpression": {
                     "assignments": [
-                      1102
+                      1114
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 1102,
+                        "id": 1114,
                         "mutability": "mutable",
                         "name": "i",
                         "nameLocation": "838:1:4",
                         "nodeType": "VariableDeclaration",
-                        "scope": 1137,
+                        "scope": 1149,
                         "src": "830:9:4",
                         "stateVariable": false,
                         "storageLocation": "default",
@@ -776,7 +776,7 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 1101,
+                          "id": 1113,
                           "name": "uint256",
                           "nodeType": "ElementaryTypeName",
                           "src": "830:7:4",
@@ -788,7 +788,7 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 1103,
+                    "id": 1115,
                     "nodeType": "VariableDeclarationStatement",
                     "src": "830:9:4"
                   },
@@ -797,17 +797,17 @@
                 },
                 {
                   "expression": {
-                    "id": 1148,
+                    "id": 1160,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
-                      "id": 1138,
+                      "id": 1150,
                       "name": "packedCounter",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1096,
+                      "referencedDeclaration": 1108,
                       "src": "1062:13:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bytes32",
@@ -819,11 +819,11 @@
                     "rightHandSide": {
                       "arguments": [
                         {
-                          "id": 1141,
+                          "id": 1153,
                           "name": "packedCounter",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1096,
+                          "referencedDeclaration": 1108,
                           "src": "1094:13:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
@@ -832,7 +832,7 @@
                         },
                         {
                           "hexValue": "30",
-                          "id": 1142,
+                          "id": 1154,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -849,11 +849,11 @@
                         {
                           "arguments": [
                             {
-                              "id": 1145,
+                              "id": 1157,
                               "name": "accumulator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1099,
+                              "referencedDeclaration": 1111,
                               "src": "1119:11:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint32",
@@ -868,7 +868,7 @@
                                 "typeString": "uint32"
                               }
                             ],
-                            "id": 1144,
+                            "id": 1156,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -880,14 +880,14 @@
                               "typeString": "type(bytes4)"
                             },
                             "typeName": {
-                              "id": 1143,
+                              "id": 1155,
                               "name": "bytes4",
                               "nodeType": "ElementaryTypeName",
                               "src": "1112:6:4",
                               "typeDescriptions": {}
                             }
                           },
-                          "id": 1146,
+                          "id": 1158,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -919,7 +919,7 @@
                           }
                         ],
                         "expression": {
-                          "id": 1139,
+                          "id": 1151,
                           "name": "Bytes",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
@@ -930,7 +930,7 @@
                             "typeString": "type(library Bytes)"
                           }
                         },
-                        "id": 1140,
+                        "id": 1152,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -944,7 +944,7 @@
                           "typeString": "function (bytes32,uint256,bytes4) pure returns (bytes32)"
                         }
                       },
-                      "id": 1147,
+                      "id": 1159,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -965,7 +965,7 @@
                       "typeString": "bytes32"
                     }
                   },
-                  "id": 1149,
+                  "id": 1161,
                   "nodeType": "ExpressionStatement",
                   "src": "1062:70:4"
                 },
@@ -973,11 +973,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 1152,
+                        "id": 1164,
                         "name": "packedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1096,
+                        "referencedDeclaration": 1108,
                         "src": "1165:13:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
@@ -993,18 +993,18 @@
                         }
                       ],
                       "expression": {
-                        "id": 1150,
+                        "id": 1162,
                         "name": "PackedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1081,
+                        "referencedDeclaration": 1093,
                         "src": "1146:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1093_$",
                           "typeString": "type(PackedCounter)"
                         }
                       },
-                      "id": 1151,
+                      "id": 1163,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1013,11 +1013,11 @@
                       "nodeType": "MemberAccess",
                       "src": "1146:18:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_wrap_pure$_t_bytes32_$returns$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                        "typeIdentifier": "t_function_wrap_pure$_t_bytes32_$returns$_t_userDefinedValueType$_PackedCounter_$1093_$",
                         "typeString": "function (bytes32) pure returns (PackedCounter)"
                       }
                     },
-                    "id": 1153,
+                    "id": 1165,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1028,19 +1028,19 @@
                     "src": "1146:33:4",
                     "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
-                  "functionReturnParameters": 1094,
-                  "id": 1154,
+                  "functionReturnParameters": 1106,
+                  "id": 1166,
                   "nodeType": "Return",
                   "src": "1139:40:4"
                 }
               ]
             },
             "documentation": {
-              "id": 1086,
+              "id": 1098,
               "nodeType": "StructuredDocumentation",
               "src": "461:157:4",
               "text": " Encode the given counters into a single packed counter\n - 4 bytes for the accumulated length\n - 2 bytes per counter -> max 14 counters"
@@ -1051,17 +1051,17 @@
             "name": "pack",
             "nameLocation": "630:4:4",
             "parameters": {
-              "id": 1090,
+              "id": 1102,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1089,
+                  "id": 1101,
                   "mutability": "mutable",
                   "name": "counters",
                   "nameLocation": "651:8:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1156,
+                  "scope": 1168,
                   "src": "635:24:4",
                   "stateVariable": false,
                   "storageLocation": "memory",
@@ -1071,7 +1071,7 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 1087,
+                      "id": 1099,
                       "name": "uint16",
                       "nodeType": "ElementaryTypeName",
                       "src": "635:6:4",
@@ -1080,7 +1080,7 @@
                         "typeString": "uint16"
                       }
                     },
-                    "id": 1088,
+                    "id": 1100,
                     "nodeType": "ArrayTypeName",
                     "src": "635:8:4",
                     "typeDescriptions": {
@@ -1094,38 +1094,38 @@
               "src": "634:26:4"
             },
             "returnParameters": {
-              "id": 1094,
+              "id": 1106,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1093,
+                  "id": 1105,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1156,
+                  "scope": 1168,
                   "src": "684:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1092,
+                    "id": 1104,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1091,
+                      "id": 1103,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "684:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "684:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -1134,35 +1134,35 @@
               ],
               "src": "683:15:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1186,
+            "id": 1198,
             "nodeType": "FunctionDefinition",
             "src": "1221:163:4",
             "nodes": [],
             "body": {
-              "id": 1185,
+              "id": 1197,
               "nodeType": "Block",
               "src": "1283:101:4",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    1168
+                    1180
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1168,
+                      "id": 1180,
                       "mutability": "mutable",
                       "name": "counters",
                       "nameLocation": "1305:8:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1185,
+                      "scope": 1197,
                       "src": "1289:24:4",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -1172,7 +1172,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1166,
+                          "id": 1178,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1289:6:4",
@@ -1181,7 +1181,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1167,
+                        "id": 1179,
                         "nodeType": "ArrayTypeName",
                         "src": "1289:8:4",
                         "typeDescriptions": {
@@ -1192,12 +1192,12 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1174,
+                  "id": 1186,
                   "initialValue": {
                     "arguments": [
                       {
                         "hexValue": "31",
-                        "id": 1172,
+                        "id": 1184,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1219,7 +1219,7 @@
                           "typeString": "int_const 1"
                         }
                       ],
-                      "id": 1171,
+                      "id": 1183,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1232,7 +1232,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1169,
+                          "id": 1181,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1320:6:4",
@@ -1241,7 +1241,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1170,
+                        "id": 1182,
                         "nodeType": "ArrayTypeName",
                         "src": "1320:8:4",
                         "typeDescriptions": {
@@ -1250,7 +1250,7 @@
                         }
                       }
                     },
-                    "id": 1173,
+                    "id": 1185,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -1270,28 +1270,28 @@
                 },
                 {
                   "expression": {
-                    "id": 1179,
+                    "id": 1191,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1175,
+                        "id": 1187,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1168,
+                        "referencedDeclaration": 1180,
                         "src": "1337:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1177,
+                      "id": 1189,
                       "indexExpression": {
                         "hexValue": "30",
-                        "id": 1176,
+                        "id": 1188,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1319,11 +1319,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1178,
+                      "id": 1190,
                       "name": "a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1158,
+                      "referencedDeclaration": 1170,
                       "src": "1351:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -1336,7 +1336,7 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1180,
+                  "id": 1192,
                   "nodeType": "ExpressionStatement",
                   "src": "1337:15:4"
                 },
@@ -1344,11 +1344,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 1182,
+                        "id": 1194,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1168,
+                        "referencedDeclaration": 1180,
                         "src": "1370:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
@@ -1363,24 +1363,24 @@
                           "typeString": "uint16[] memory"
                         }
                       ],
-                      "id": 1181,
+                      "id": 1193,
                       "name": "pack",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        1156,
-                        1186,
-                        1224,
-                        1270,
-                        1324
+                        1168,
+                        1198,
+                        1236,
+                        1282,
+                        1336
                       ],
-                      "referencedDeclaration": 1156,
+                      "referencedDeclaration": 1168,
                       "src": "1365:4:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1093_$",
                         "typeString": "function (uint16[] memory) pure returns (PackedCounter)"
                       }
                     },
-                    "id": 1183,
+                    "id": 1195,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1391,12 +1391,12 @@
                     "src": "1365:14:4",
                     "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
-                  "functionReturnParameters": 1163,
-                  "id": 1184,
+                  "functionReturnParameters": 1175,
+                  "id": 1196,
                   "nodeType": "Return",
                   "src": "1358:21:4"
                 }
@@ -1408,17 +1408,17 @@
             "name": "pack",
             "nameLocation": "1230:4:4",
             "parameters": {
-              "id": 1159,
+              "id": 1171,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1158,
+                  "id": 1170,
                   "mutability": "mutable",
                   "name": "a",
                   "nameLocation": "1242:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1186,
+                  "scope": 1198,
                   "src": "1235:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1427,7 +1427,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1157,
+                    "id": 1169,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1235:6:4",
@@ -1442,38 +1442,38 @@
               "src": "1234:10:4"
             },
             "returnParameters": {
-              "id": 1163,
+              "id": 1175,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1162,
+                  "id": 1174,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1186,
+                  "scope": 1198,
                   "src": "1268:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1161,
+                    "id": 1173,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1160,
+                      "id": 1172,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "1268:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "1268:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -1482,35 +1482,35 @@
               ],
               "src": "1267:15:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1224,
+            "id": 1236,
             "nodeType": "FunctionDefinition",
             "src": "1388:194:4",
             "nodes": [],
             "body": {
-              "id": 1223,
+              "id": 1235,
               "nodeType": "Block",
               "src": "1460:122:4",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    1200
+                    1212
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1200,
+                      "id": 1212,
                       "mutability": "mutable",
                       "name": "counters",
                       "nameLocation": "1482:8:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1223,
+                      "scope": 1235,
                       "src": "1466:24:4",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -1520,7 +1520,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1198,
+                          "id": 1210,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1466:6:4",
@@ -1529,7 +1529,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1199,
+                        "id": 1211,
                         "nodeType": "ArrayTypeName",
                         "src": "1466:8:4",
                         "typeDescriptions": {
@@ -1540,12 +1540,12 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1206,
+                  "id": 1218,
                   "initialValue": {
                     "arguments": [
                       {
                         "hexValue": "32",
-                        "id": 1204,
+                        "id": 1216,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1567,7 +1567,7 @@
                           "typeString": "int_const 2"
                         }
                       ],
-                      "id": 1203,
+                      "id": 1215,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1580,7 +1580,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1201,
+                          "id": 1213,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1497:6:4",
@@ -1589,7 +1589,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1202,
+                        "id": 1214,
                         "nodeType": "ArrayTypeName",
                         "src": "1497:8:4",
                         "typeDescriptions": {
@@ -1598,7 +1598,7 @@
                         }
                       }
                     },
-                    "id": 1205,
+                    "id": 1217,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -1618,28 +1618,28 @@
                 },
                 {
                   "expression": {
-                    "id": 1211,
+                    "id": 1223,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1207,
+                        "id": 1219,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1200,
+                        "referencedDeclaration": 1212,
                         "src": "1514:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1209,
+                      "id": 1221,
                       "indexExpression": {
                         "hexValue": "30",
-                        "id": 1208,
+                        "id": 1220,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1667,11 +1667,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1210,
+                      "id": 1222,
                       "name": "a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1188,
+                      "referencedDeclaration": 1200,
                       "src": "1528:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -1684,34 +1684,34 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1212,
+                  "id": 1224,
                   "nodeType": "ExpressionStatement",
                   "src": "1514:15:4"
                 },
                 {
                   "expression": {
-                    "id": 1217,
+                    "id": 1229,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1213,
+                        "id": 1225,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1200,
+                        "referencedDeclaration": 1212,
                         "src": "1535:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1215,
+                      "id": 1227,
                       "indexExpression": {
                         "hexValue": "31",
-                        "id": 1214,
+                        "id": 1226,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1739,11 +1739,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1216,
+                      "id": 1228,
                       "name": "b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1190,
+                      "referencedDeclaration": 1202,
                       "src": "1549:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -1756,7 +1756,7 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1218,
+                  "id": 1230,
                   "nodeType": "ExpressionStatement",
                   "src": "1535:15:4"
                 },
@@ -1764,11 +1764,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 1220,
+                        "id": 1232,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1200,
+                        "referencedDeclaration": 1212,
                         "src": "1568:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
@@ -1783,24 +1783,24 @@
                           "typeString": "uint16[] memory"
                         }
                       ],
-                      "id": 1219,
+                      "id": 1231,
                       "name": "pack",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        1156,
-                        1186,
-                        1224,
-                        1270,
-                        1324
+                        1168,
+                        1198,
+                        1236,
+                        1282,
+                        1336
                       ],
-                      "referencedDeclaration": 1156,
+                      "referencedDeclaration": 1168,
                       "src": "1563:4:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1093_$",
                         "typeString": "function (uint16[] memory) pure returns (PackedCounter)"
                       }
                     },
-                    "id": 1221,
+                    "id": 1233,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1811,12 +1811,12 @@
                     "src": "1563:14:4",
                     "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
-                  "functionReturnParameters": 1195,
-                  "id": 1222,
+                  "functionReturnParameters": 1207,
+                  "id": 1234,
                   "nodeType": "Return",
                   "src": "1556:21:4"
                 }
@@ -1828,17 +1828,17 @@
             "name": "pack",
             "nameLocation": "1397:4:4",
             "parameters": {
-              "id": 1191,
+              "id": 1203,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1188,
+                  "id": 1200,
                   "mutability": "mutable",
                   "name": "a",
                   "nameLocation": "1409:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1224,
+                  "scope": 1236,
                   "src": "1402:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1847,7 +1847,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1187,
+                    "id": 1199,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1402:6:4",
@@ -1860,12 +1860,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1190,
+                  "id": 1202,
                   "mutability": "mutable",
                   "name": "b",
                   "nameLocation": "1419:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1224,
+                  "scope": 1236,
                   "src": "1412:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1874,7 +1874,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1189,
+                    "id": 1201,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1412:6:4",
@@ -1889,38 +1889,38 @@
               "src": "1401:20:4"
             },
             "returnParameters": {
-              "id": 1195,
+              "id": 1207,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1194,
+                  "id": 1206,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1224,
+                  "scope": 1236,
                   "src": "1445:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1193,
+                    "id": 1205,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1192,
+                      "id": 1204,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "1445:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "1445:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -1929,35 +1929,35 @@
               ],
               "src": "1444:15:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1270,
+            "id": 1282,
             "nodeType": "FunctionDefinition",
             "src": "1586:225:4",
             "nodes": [],
             "body": {
-              "id": 1269,
+              "id": 1281,
               "nodeType": "Block",
               "src": "1668:143:4",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    1240
+                    1252
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1240,
+                      "id": 1252,
                       "mutability": "mutable",
                       "name": "counters",
                       "nameLocation": "1690:8:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1269,
+                      "scope": 1281,
                       "src": "1674:24:4",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -1967,7 +1967,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1238,
+                          "id": 1250,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1674:6:4",
@@ -1976,7 +1976,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1239,
+                        "id": 1251,
                         "nodeType": "ArrayTypeName",
                         "src": "1674:8:4",
                         "typeDescriptions": {
@@ -1987,12 +1987,12 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1246,
+                  "id": 1258,
                   "initialValue": {
                     "arguments": [
                       {
                         "hexValue": "33",
-                        "id": 1244,
+                        "id": 1256,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2014,7 +2014,7 @@
                           "typeString": "int_const 3"
                         }
                       ],
-                      "id": 1243,
+                      "id": 1255,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -2027,7 +2027,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1241,
+                          "id": 1253,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1705:6:4",
@@ -2036,7 +2036,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1242,
+                        "id": 1254,
                         "nodeType": "ArrayTypeName",
                         "src": "1705:8:4",
                         "typeDescriptions": {
@@ -2045,7 +2045,7 @@
                         }
                       }
                     },
-                    "id": 1245,
+                    "id": 1257,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -2065,28 +2065,28 @@
                 },
                 {
                   "expression": {
-                    "id": 1251,
+                    "id": 1263,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1247,
+                        "id": 1259,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1240,
+                        "referencedDeclaration": 1252,
                         "src": "1722:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1249,
+                      "id": 1261,
                       "indexExpression": {
                         "hexValue": "30",
-                        "id": 1248,
+                        "id": 1260,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2114,11 +2114,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1250,
+                      "id": 1262,
                       "name": "a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1226,
+                      "referencedDeclaration": 1238,
                       "src": "1736:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -2131,34 +2131,34 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1252,
+                  "id": 1264,
                   "nodeType": "ExpressionStatement",
                   "src": "1722:15:4"
                 },
                 {
                   "expression": {
-                    "id": 1257,
+                    "id": 1269,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1253,
+                        "id": 1265,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1240,
+                        "referencedDeclaration": 1252,
                         "src": "1743:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1255,
+                      "id": 1267,
                       "indexExpression": {
                         "hexValue": "31",
-                        "id": 1254,
+                        "id": 1266,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2186,11 +2186,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1256,
+                      "id": 1268,
                       "name": "b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1228,
+                      "referencedDeclaration": 1240,
                       "src": "1757:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -2203,34 +2203,34 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1258,
+                  "id": 1270,
                   "nodeType": "ExpressionStatement",
                   "src": "1743:15:4"
                 },
                 {
                   "expression": {
-                    "id": 1263,
+                    "id": 1275,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1259,
+                        "id": 1271,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1240,
+                        "referencedDeclaration": 1252,
                         "src": "1764:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1261,
+                      "id": 1273,
                       "indexExpression": {
                         "hexValue": "32",
-                        "id": 1260,
+                        "id": 1272,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2258,11 +2258,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1262,
+                      "id": 1274,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1230,
+                      "referencedDeclaration": 1242,
                       "src": "1778:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -2275,7 +2275,7 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1264,
+                  "id": 1276,
                   "nodeType": "ExpressionStatement",
                   "src": "1764:15:4"
                 },
@@ -2283,11 +2283,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 1266,
+                        "id": 1278,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1240,
+                        "referencedDeclaration": 1252,
                         "src": "1797:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
@@ -2302,24 +2302,24 @@
                           "typeString": "uint16[] memory"
                         }
                       ],
-                      "id": 1265,
+                      "id": 1277,
                       "name": "pack",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        1156,
-                        1186,
-                        1224,
-                        1270,
-                        1324
+                        1168,
+                        1198,
+                        1236,
+                        1282,
+                        1336
                       ],
-                      "referencedDeclaration": 1156,
+                      "referencedDeclaration": 1168,
                       "src": "1792:4:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1093_$",
                         "typeString": "function (uint16[] memory) pure returns (PackedCounter)"
                       }
                     },
-                    "id": 1267,
+                    "id": 1279,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2330,12 +2330,12 @@
                     "src": "1792:14:4",
                     "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
-                  "functionReturnParameters": 1235,
-                  "id": 1268,
+                  "functionReturnParameters": 1247,
+                  "id": 1280,
                   "nodeType": "Return",
                   "src": "1785:21:4"
                 }
@@ -2347,17 +2347,17 @@
             "name": "pack",
             "nameLocation": "1595:4:4",
             "parameters": {
-              "id": 1231,
+              "id": 1243,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1226,
+                  "id": 1238,
                   "mutability": "mutable",
                   "name": "a",
                   "nameLocation": "1607:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1270,
+                  "scope": 1282,
                   "src": "1600:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2366,7 +2366,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1225,
+                    "id": 1237,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1600:6:4",
@@ -2379,12 +2379,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1228,
+                  "id": 1240,
                   "mutability": "mutable",
                   "name": "b",
                   "nameLocation": "1617:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1270,
+                  "scope": 1282,
                   "src": "1610:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2393,7 +2393,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1227,
+                    "id": 1239,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1610:6:4",
@@ -2406,12 +2406,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1230,
+                  "id": 1242,
                   "mutability": "mutable",
                   "name": "c",
                   "nameLocation": "1627:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1270,
+                  "scope": 1282,
                   "src": "1620:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2420,7 +2420,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1229,
+                    "id": 1241,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1620:6:4",
@@ -2435,38 +2435,38 @@
               "src": "1599:30:4"
             },
             "returnParameters": {
-              "id": 1235,
+              "id": 1247,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1234,
+                  "id": 1246,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1270,
+                  "scope": 1282,
                   "src": "1653:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1233,
+                    "id": 1245,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1232,
+                      "id": 1244,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "1653:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "1653:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -2475,35 +2475,35 @@
               ],
               "src": "1652:15:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1324,
+            "id": 1336,
             "nodeType": "FunctionDefinition",
             "src": "1815:256:4",
             "nodes": [],
             "body": {
-              "id": 1323,
+              "id": 1335,
               "nodeType": "Block",
               "src": "1907:164:4",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    1288
+                    1300
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1288,
+                      "id": 1300,
                       "mutability": "mutable",
                       "name": "counters",
                       "nameLocation": "1929:8:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1323,
+                      "scope": 1335,
                       "src": "1913:24:4",
                       "stateVariable": false,
                       "storageLocation": "memory",
@@ -2513,7 +2513,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1286,
+                          "id": 1298,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1913:6:4",
@@ -2522,7 +2522,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1287,
+                        "id": 1299,
                         "nodeType": "ArrayTypeName",
                         "src": "1913:8:4",
                         "typeDescriptions": {
@@ -2533,12 +2533,12 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1294,
+                  "id": 1306,
                   "initialValue": {
                     "arguments": [
                       {
                         "hexValue": "34",
-                        "id": 1292,
+                        "id": 1304,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2560,7 +2560,7 @@
                           "typeString": "int_const 4"
                         }
                       ],
-                      "id": 1291,
+                      "id": 1303,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -2573,7 +2573,7 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 1289,
+                          "id": 1301,
                           "name": "uint16",
                           "nodeType": "ElementaryTypeName",
                           "src": "1944:6:4",
@@ -2582,7 +2582,7 @@
                             "typeString": "uint16"
                           }
                         },
-                        "id": 1290,
+                        "id": 1302,
                         "nodeType": "ArrayTypeName",
                         "src": "1944:8:4",
                         "typeDescriptions": {
@@ -2591,7 +2591,7 @@
                         }
                       }
                     },
-                    "id": 1293,
+                    "id": 1305,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -2611,28 +2611,28 @@
                 },
                 {
                   "expression": {
-                    "id": 1299,
+                    "id": 1311,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1295,
+                        "id": 1307,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1288,
+                        "referencedDeclaration": 1300,
                         "src": "1961:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1297,
+                      "id": 1309,
                       "indexExpression": {
                         "hexValue": "30",
-                        "id": 1296,
+                        "id": 1308,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2660,11 +2660,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1298,
+                      "id": 1310,
                       "name": "a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1272,
+                      "referencedDeclaration": 1284,
                       "src": "1975:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -2677,34 +2677,34 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1300,
+                  "id": 1312,
                   "nodeType": "ExpressionStatement",
                   "src": "1961:15:4"
                 },
                 {
                   "expression": {
-                    "id": 1305,
+                    "id": 1317,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1301,
+                        "id": 1313,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1288,
+                        "referencedDeclaration": 1300,
                         "src": "1982:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1303,
+                      "id": 1315,
                       "indexExpression": {
                         "hexValue": "31",
-                        "id": 1302,
+                        "id": 1314,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2732,11 +2732,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1304,
+                      "id": 1316,
                       "name": "b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1274,
+                      "referencedDeclaration": 1286,
                       "src": "1996:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -2749,34 +2749,34 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1306,
+                  "id": 1318,
                   "nodeType": "ExpressionStatement",
                   "src": "1982:15:4"
                 },
                 {
                   "expression": {
-                    "id": 1311,
+                    "id": 1323,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1307,
+                        "id": 1319,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1288,
+                        "referencedDeclaration": 1300,
                         "src": "2003:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1309,
+                      "id": 1321,
                       "indexExpression": {
                         "hexValue": "32",
-                        "id": 1308,
+                        "id": 1320,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2804,11 +2804,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1310,
+                      "id": 1322,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1276,
+                      "referencedDeclaration": 1288,
                       "src": "2017:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -2821,34 +2821,34 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1312,
+                  "id": 1324,
                   "nodeType": "ExpressionStatement",
                   "src": "2003:15:4"
                 },
                 {
                   "expression": {
-                    "id": 1317,
+                    "id": 1329,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "baseExpression": {
-                        "id": 1313,
+                        "id": 1325,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1288,
+                        "referencedDeclaration": 1300,
                         "src": "2024:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
                           "typeString": "uint16[] memory"
                         }
                       },
-                      "id": 1315,
+                      "id": 1327,
                       "indexExpression": {
                         "hexValue": "33",
-                        "id": 1314,
+                        "id": 1326,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -2876,11 +2876,11 @@
                     "nodeType": "Assignment",
                     "operator": "=",
                     "rightHandSide": {
-                      "id": 1316,
+                      "id": 1328,
                       "name": "d",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1278,
+                      "referencedDeclaration": 1290,
                       "src": "2038:1:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint16",
@@ -2893,7 +2893,7 @@
                       "typeString": "uint16"
                     }
                   },
-                  "id": 1318,
+                  "id": 1330,
                   "nodeType": "ExpressionStatement",
                   "src": "2024:15:4"
                 },
@@ -2901,11 +2901,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 1320,
+                        "id": 1332,
                         "name": "counters",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1288,
+                        "referencedDeclaration": 1300,
                         "src": "2057:8:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint16_$dyn_memory_ptr",
@@ -2920,24 +2920,24 @@
                           "typeString": "uint16[] memory"
                         }
                       ],
-                      "id": 1319,
+                      "id": 1331,
                       "name": "pack",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        1156,
-                        1186,
-                        1224,
-                        1270,
-                        1324
+                        1168,
+                        1198,
+                        1236,
+                        1282,
+                        1336
                       ],
-                      "referencedDeclaration": 1156,
+                      "referencedDeclaration": 1168,
                       "src": "2052:4:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                        "typeIdentifier": "t_function_internal_pure$_t_array$_t_uint16_$dyn_memory_ptr_$returns$_t_userDefinedValueType$_PackedCounter_$1093_$",
                         "typeString": "function (uint16[] memory) pure returns (PackedCounter)"
                       }
                     },
-                    "id": 1321,
+                    "id": 1333,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2948,12 +2948,12 @@
                     "src": "2052:14:4",
                     "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
-                  "functionReturnParameters": 1283,
-                  "id": 1322,
+                  "functionReturnParameters": 1295,
+                  "id": 1334,
                   "nodeType": "Return",
                   "src": "2045:21:4"
                 }
@@ -2965,17 +2965,17 @@
             "name": "pack",
             "nameLocation": "1824:4:4",
             "parameters": {
-              "id": 1279,
+              "id": 1291,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1272,
+                  "id": 1284,
                   "mutability": "mutable",
                   "name": "a",
                   "nameLocation": "1836:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1324,
+                  "scope": 1336,
                   "src": "1829:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2984,7 +2984,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1271,
+                    "id": 1283,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1829:6:4",
@@ -2997,12 +2997,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1274,
+                  "id": 1286,
                   "mutability": "mutable",
                   "name": "b",
                   "nameLocation": "1846:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1324,
+                  "scope": 1336,
                   "src": "1839:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3011,7 +3011,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1273,
+                    "id": 1285,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1839:6:4",
@@ -3024,12 +3024,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1276,
+                  "id": 1288,
                   "mutability": "mutable",
                   "name": "c",
                   "nameLocation": "1856:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1324,
+                  "scope": 1336,
                   "src": "1849:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3038,7 +3038,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1275,
+                    "id": 1287,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1849:6:4",
@@ -3051,12 +3051,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1278,
+                  "id": 1290,
                   "mutability": "mutable",
                   "name": "d",
                   "nameLocation": "1866:1:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1324,
+                  "scope": 1336,
                   "src": "1859:8:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3065,7 +3065,7 @@
                     "typeString": "uint16"
                   },
                   "typeName": {
-                    "id": 1277,
+                    "id": 1289,
                     "name": "uint16",
                     "nodeType": "ElementaryTypeName",
                     "src": "1859:6:4",
@@ -3080,38 +3080,38 @@
               "src": "1828:40:4"
             },
             "returnParameters": {
-              "id": 1283,
+              "id": 1295,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1282,
+                  "id": 1294,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1324,
+                  "scope": 1336,
                   "src": "1892:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1281,
+                    "id": 1293,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1280,
+                      "id": 1292,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "1892:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "1892:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -3120,18 +3120,18 @@
               ],
               "src": "1891:15:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1348,
+            "id": 1360,
             "nodeType": "FunctionDefinition",
             "src": "2356:154:4",
             "nodes": [],
             "body": {
-              "id": 1347,
+              "id": 1359,
               "nodeType": "Block",
               "src": "2432:78:4",
               "nodes": [],
@@ -3146,14 +3146,14 @@
                               {
                                 "arguments": [
                                   {
-                                    "id": 1341,
+                                    "id": 1353,
                                     "name": "packedCounter",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1328,
+                                    "referencedDeclaration": 1340,
                                     "src": "2488:13:4",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                                       "typeString": "PackedCounter"
                                     }
                                   }
@@ -3161,23 +3161,23 @@
                                 "expression": {
                                   "argumentTypes": [
                                     {
-                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                                       "typeString": "PackedCounter"
                                     }
                                   ],
                                   "expression": {
-                                    "id": 1339,
+                                    "id": 1351,
                                     "name": "PackedCounter",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1081,
+                                    "referencedDeclaration": 1093,
                                     "src": "2467:13:4",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                                      "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1093_$",
                                       "typeString": "type(PackedCounter)"
                                     }
                                   },
-                                  "id": 1340,
+                                  "id": 1352,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -3186,11 +3186,11 @@
                                   "nodeType": "MemberAccess",
                                   "src": "2467:20:4",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1081_$returns$_t_bytes32_$",
+                                    "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1093_$returns$_t_bytes32_$",
                                     "typeString": "function (PackedCounter) pure returns (bytes32)"
                                   }
                                 },
-                                "id": 1342,
+                                "id": 1354,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3213,7 +3213,7 @@
                                   "typeString": "bytes32"
                                 }
                               ],
-                              "id": 1338,
+                              "id": 1350,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -3225,14 +3225,14 @@
                                 "typeString": "type(bytes4)"
                               },
                               "typeName": {
-                                "id": 1337,
+                                "id": 1349,
                                 "name": "bytes4",
                                 "nodeType": "ElementaryTypeName",
                                 "src": "2460:6:4",
                                 "typeDescriptions": {}
                               }
                             },
-                            "id": 1343,
+                            "id": 1355,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3255,7 +3255,7 @@
                               "typeString": "bytes4"
                             }
                           ],
-                          "id": 1336,
+                          "id": 1348,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -3267,14 +3267,14 @@
                             "typeString": "type(uint32)"
                           },
                           "typeName": {
-                            "id": 1335,
+                            "id": 1347,
                             "name": "uint32",
                             "nodeType": "ElementaryTypeName",
                             "src": "2453:6:4",
                             "typeDescriptions": {}
                           }
                         },
-                        "id": 1344,
+                        "id": 1356,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3297,7 +3297,7 @@
                           "typeString": "uint32"
                         }
                       ],
-                      "id": 1334,
+                      "id": 1346,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -3309,14 +3309,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 1333,
+                        "id": 1345,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2445:7:4",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 1345,
+                    "id": 1357,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3331,15 +3331,15 @@
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1332,
-                  "id": 1346,
+                  "functionReturnParameters": 1344,
+                  "id": 1358,
                   "nodeType": "Return",
                   "src": "2438:67:4"
                 }
               ]
             },
             "documentation": {
-              "id": 1325,
+              "id": 1337,
               "nodeType": "StructuredDocumentation",
               "src": "2266:87:4",
               "text": " Decode the accumulated counter\n (first four bytes of packed counter)"
@@ -3350,38 +3350,38 @@
             "name": "total",
             "nameLocation": "2365:5:4",
             "parameters": {
-              "id": 1329,
+              "id": 1341,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1328,
+                  "id": 1340,
                   "mutability": "mutable",
                   "name": "packedCounter",
                   "nameLocation": "2385:13:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1348,
+                  "scope": 1360,
                   "src": "2371:27:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1327,
+                    "id": 1339,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1326,
+                      "id": 1338,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "2371:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "2371:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -3391,17 +3391,17 @@
               "src": "2370:29:4"
             },
             "returnParameters": {
-              "id": 1332,
+              "id": 1344,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1331,
+                  "id": 1343,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1348,
+                  "scope": 1360,
                   "src": "2423:7:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3410,7 +3410,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1330,
+                    "id": 1342,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2423:7:4",
@@ -3424,35 +3424,35 @@
               ],
               "src": "2422:9:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1383,
+            "id": 1395,
             "nodeType": "FunctionDefinition",
             "src": "2625:221:4",
             "nodes": [],
             "body": {
-              "id": 1382,
+              "id": 1394,
               "nodeType": "Block",
               "src": "2718:128:4",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    1360
+                    1372
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1360,
+                      "id": 1372,
                       "mutability": "mutable",
                       "name": "offset",
                       "nameLocation": "2732:6:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1382,
+                      "scope": 1394,
                       "src": "2724:14:4",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -3461,7 +3461,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1359,
+                        "id": 1371,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2724:7:4",
@@ -3473,20 +3473,20 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1366,
+                  "id": 1378,
                   "initialValue": {
                     "commonType": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1365,
+                    "id": 1377,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "hexValue": "34",
-                      "id": 1361,
+                      "id": 1373,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -3507,17 +3507,17 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 1364,
+                      "id": 1376,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
-                        "id": 1362,
+                        "id": 1374,
                         "name": "index",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1354,
+                        "referencedDeclaration": 1366,
                         "src": "2745:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -3528,7 +3528,7 @@
                       "operator": "*",
                       "rightExpression": {
                         "hexValue": "32",
-                        "id": 1363,
+                        "id": 1375,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -3567,14 +3567,14 @@
                               {
                                 "arguments": [
                                   {
-                                    "id": 1375,
+                                    "id": 1387,
                                     "name": "packedCounter",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1352,
+                                    "referencedDeclaration": 1364,
                                     "src": "2816:13:4",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                                       "typeString": "PackedCounter"
                                     }
                                   }
@@ -3582,23 +3582,23 @@
                                 "expression": {
                                   "argumentTypes": [
                                     {
-                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                                       "typeString": "PackedCounter"
                                     }
                                   ],
                                   "expression": {
-                                    "id": 1373,
+                                    "id": 1385,
                                     "name": "PackedCounter",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1081,
+                                    "referencedDeclaration": 1093,
                                     "src": "2795:13:4",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                                      "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1093_$",
                                       "typeString": "type(PackedCounter)"
                                     }
                                   },
-                                  "id": 1374,
+                                  "id": 1386,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -3607,11 +3607,11 @@
                                   "nodeType": "MemberAccess",
                                   "src": "2795:20:4",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1081_$returns$_t_bytes32_$",
+                                    "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1093_$returns$_t_bytes32_$",
                                     "typeString": "function (PackedCounter) pure returns (bytes32)"
                                   }
                                 },
-                                "id": 1376,
+                                "id": 1388,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3627,11 +3627,11 @@
                                 }
                               },
                               {
-                                "id": 1377,
+                                "id": 1389,
                                 "name": "offset",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1360,
+                                "referencedDeclaration": 1372,
                                 "src": "2832:6:4",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
@@ -3651,7 +3651,7 @@
                                 }
                               ],
                               "expression": {
-                                "id": 1371,
+                                "id": 1383,
                                 "name": "Bytes",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
@@ -3662,7 +3662,7 @@
                                   "typeString": "type(library Bytes)"
                                 }
                               },
-                              "id": 1372,
+                              "id": 1384,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -3676,7 +3676,7 @@
                                 "typeString": "function (bytes32,uint256) pure returns (bytes2)"
                               }
                             },
-                            "id": 1378,
+                            "id": 1390,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3699,7 +3699,7 @@
                               "typeString": "bytes2"
                             }
                           ],
-                          "id": 1370,
+                          "id": 1382,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -3711,14 +3711,14 @@
                             "typeString": "type(uint16)"
                           },
                           "typeName": {
-                            "id": 1369,
+                            "id": 1381,
                             "name": "uint16",
                             "nodeType": "ElementaryTypeName",
                             "src": "2775:6:4",
                             "typeDescriptions": {}
                           }
                         },
-                        "id": 1379,
+                        "id": 1391,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3741,7 +3741,7 @@
                           "typeString": "uint16"
                         }
                       ],
-                      "id": 1368,
+                      "id": 1380,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -3753,14 +3753,14 @@
                         "typeString": "type(uint256)"
                       },
                       "typeName": {
-                        "id": 1367,
+                        "id": 1379,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "2767:7:4",
                         "typeDescriptions": {}
                       }
                     },
-                    "id": 1380,
+                    "id": 1392,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3775,15 +3775,15 @@
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1358,
-                  "id": 1381,
+                  "functionReturnParameters": 1370,
+                  "id": 1393,
                   "nodeType": "Return",
                   "src": "2760:81:4"
                 }
               ]
             },
             "documentation": {
-              "id": 1349,
+              "id": 1361,
               "nodeType": "StructuredDocumentation",
               "src": "2514:108:4",
               "text": " Decode the counter at the given index\n (two bytes per counter after the first four bytes)"
@@ -3794,38 +3794,38 @@
             "name": "atIndex",
             "nameLocation": "2634:7:4",
             "parameters": {
-              "id": 1355,
+              "id": 1367,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1352,
+                  "id": 1364,
                   "mutability": "mutable",
                   "name": "packedCounter",
                   "nameLocation": "2656:13:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1383,
+                  "scope": 1395,
                   "src": "2642:27:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1351,
+                    "id": 1363,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1350,
+                      "id": 1362,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "2642:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "2642:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -3833,12 +3833,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1354,
+                  "id": 1366,
                   "mutability": "mutable",
                   "name": "index",
                   "nameLocation": "2679:5:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1383,
+                  "scope": 1395,
                   "src": "2671:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3847,7 +3847,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1353,
+                    "id": 1365,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2671:7:4",
@@ -3862,17 +3862,17 @@
               "src": "2641:44:4"
             },
             "returnParameters": {
-              "id": 1358,
+              "id": 1370,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1357,
+                  "id": 1369,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1383,
+                  "scope": 1395,
                   "src": "2709:7:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -3881,7 +3881,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1356,
+                    "id": 1368,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2709:7:4",
@@ -3895,35 +3895,35 @@
               ],
               "src": "2708:9:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1482,
+            "id": 1494,
             "nodeType": "FunctionDefinition",
             "src": "2931:1018:4",
             "nodes": [],
             "body": {
-              "id": 1481,
+              "id": 1493,
               "nodeType": "Block",
               "src": "3074:875:4",
               "nodes": [],
               "statements": [
                 {
                   "assignments": [
-                    1398
+                    1410
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1398,
+                      "id": 1410,
                       "mutability": "mutable",
                       "name": "rawPackedCounter",
                       "nameLocation": "3088:16:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1481,
+                      "scope": 1493,
                       "src": "3080:24:4",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -3932,7 +3932,7 @@
                         "typeString": "bytes32"
                       },
                       "typeName": {
-                        "id": 1397,
+                        "id": 1409,
                         "name": "bytes32",
                         "nodeType": "ElementaryTypeName",
                         "src": "3080:7:4",
@@ -3944,18 +3944,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1403,
+                  "id": 1415,
                   "initialValue": {
                     "arguments": [
                       {
-                        "id": 1401,
+                        "id": 1413,
                         "name": "packedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1387,
+                        "referencedDeclaration": 1399,
                         "src": "3128:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         }
                       }
@@ -3963,23 +3963,23 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         }
                       ],
                       "expression": {
-                        "id": 1399,
+                        "id": 1411,
                         "name": "PackedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1081,
+                        "referencedDeclaration": 1093,
                         "src": "3107:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1093_$",
                           "typeString": "type(PackedCounter)"
                         }
                       },
-                      "id": 1400,
+                      "id": 1412,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -3988,11 +3988,11 @@
                       "nodeType": "MemberAccess",
                       "src": "3107:20:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1081_$returns$_t_bytes32_$",
+                        "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1093_$returns$_t_bytes32_$",
                         "typeString": "function (PackedCounter) pure returns (bytes32)"
                       }
                     },
-                    "id": 1402,
+                    "id": 1414,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4012,17 +4012,17 @@
                 },
                 {
                   "assignments": [
-                    1405
+                    1417
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1405,
+                      "id": 1417,
                       "mutability": "mutable",
                       "name": "accumulator",
                       "nameLocation": "3205:11:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1481,
+                      "scope": 1493,
                       "src": "3197:19:4",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -4031,7 +4031,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1404,
+                        "id": 1416,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "3197:7:4",
@@ -4043,18 +4043,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1409,
+                  "id": 1421,
                   "initialValue": {
                     "arguments": [
                       {
-                        "id": 1407,
+                        "id": 1419,
                         "name": "packedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1387,
+                        "referencedDeclaration": 1399,
                         "src": "3225:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         }
                       }
@@ -4062,22 +4062,22 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         }
                       ],
-                      "id": 1406,
+                      "id": 1418,
                       "name": "total",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1348,
+                      "referencedDeclaration": 1360,
                       "src": "3219:5:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_pure$_t_userDefinedValueType$_PackedCounter_$1081_$returns$_t_uint256_$",
+                        "typeIdentifier": "t_function_internal_pure$_t_userDefinedValueType$_PackedCounter_$1093_$returns$_t_uint256_$",
                         "typeString": "function (PackedCounter) pure returns (uint256)"
                       }
                     },
-                    "id": 1408,
+                    "id": 1420,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4097,17 +4097,17 @@
                 },
                 {
                   "assignments": [
-                    1411
+                    1423
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1411,
+                      "id": 1423,
                       "mutability": "mutable",
                       "name": "currentValueAtIndex",
                       "nameLocation": "3253:19:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1481,
+                      "scope": 1493,
                       "src": "3245:27:4",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -4116,7 +4116,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1410,
+                        "id": 1422,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "3245:7:4",
@@ -4128,29 +4128,29 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1419,
+                  "id": 1431,
                   "initialValue": {
                     "arguments": [
                       {
-                        "id": 1413,
+                        "id": 1425,
                         "name": "packedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1387,
+                        "referencedDeclaration": 1399,
                         "src": "3283:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         }
                       },
                       {
                         "arguments": [
                           {
-                            "id": 1416,
+                            "id": 1428,
                             "name": "index",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1389,
+                            "referencedDeclaration": 1401,
                             "src": "3304:5:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -4165,7 +4165,7 @@
                               "typeString": "uint256"
                             }
                           ],
-                          "id": 1415,
+                          "id": 1427,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -4177,14 +4177,14 @@
                             "typeString": "type(uint8)"
                           },
                           "typeName": {
-                            "id": 1414,
+                            "id": 1426,
                             "name": "uint8",
                             "nodeType": "ElementaryTypeName",
                             "src": "3298:5:4",
                             "typeDescriptions": {}
                           }
                         },
-                        "id": 1417,
+                        "id": 1429,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4203,7 +4203,7 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         },
                         {
@@ -4211,18 +4211,18 @@
                           "typeString": "uint8"
                         }
                       ],
-                      "id": 1412,
+                      "id": 1424,
                       "name": "atIndex",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1383,
+                      "referencedDeclaration": 1395,
                       "src": "3275:7:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_pure$_t_userDefinedValueType$_PackedCounter_$1081_$_t_uint256_$returns$_t_uint256_$",
+                        "typeIdentifier": "t_function_internal_pure$_t_userDefinedValueType$_PackedCounter_$1093_$_t_uint256_$returns$_t_uint256_$",
                         "typeString": "function (PackedCounter,uint256) pure returns (uint256)"
                       }
                     },
-                    "id": 1418,
+                    "id": 1430,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4246,17 +4246,17 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1422,
+                    "id": 1434,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
-                      "id": 1420,
+                      "id": 1432,
                       "name": "newValueAtIndex",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1391,
+                      "referencedDeclaration": 1403,
                       "src": "3379:15:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -4266,11 +4266,11 @@
                     "nodeType": "BinaryOperation",
                     "operator": ">=",
                     "rightExpression": {
-                      "id": 1421,
+                      "id": 1433,
                       "name": "currentValueAtIndex",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1411,
+                      "referencedDeclaration": 1423,
                       "src": "3398:19:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -4284,23 +4284,23 @@
                     }
                   },
                   "falseBody": {
-                    "id": 1436,
+                    "id": 1448,
                     "nodeType": "Block",
                     "src": "3492:67:4",
                     "statements": [
                       {
                         "expression": {
-                          "id": 1434,
+                          "id": 1446,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
-                            "id": 1430,
+                            "id": 1442,
                             "name": "accumulator",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1405,
+                            "referencedDeclaration": 1417,
                             "src": "3500:11:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -4314,17 +4314,17 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 1433,
+                            "id": 1445,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
-                              "id": 1431,
+                              "id": 1443,
                               "name": "currentValueAtIndex",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1411,
+                              "referencedDeclaration": 1423,
                               "src": "3515:19:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -4334,11 +4334,11 @@
                             "nodeType": "BinaryOperation",
                             "operator": "-",
                             "rightExpression": {
-                              "id": 1432,
+                              "id": 1444,
                               "name": "newValueAtIndex",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1391,
+                              "referencedDeclaration": 1403,
                               "src": "3537:15:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -4357,33 +4357,33 @@
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1435,
+                        "id": 1447,
                         "nodeType": "ExpressionStatement",
                         "src": "3500:52:4"
                       }
                     ]
                   },
-                  "id": 1437,
+                  "id": 1449,
                   "nodeType": "IfStatement",
                   "src": "3375:184:4",
                   "trueBody": {
-                    "id": 1429,
+                    "id": 1441,
                     "nodeType": "Block",
                     "src": "3419:67:4",
                     "statements": [
                       {
                         "expression": {
-                          "id": 1427,
+                          "id": 1439,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
-                            "id": 1423,
+                            "id": 1435,
                             "name": "accumulator",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1405,
+                            "referencedDeclaration": 1417,
                             "src": "3427:11:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -4397,17 +4397,17 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 1426,
+                            "id": 1438,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
-                              "id": 1424,
+                              "id": 1436,
                               "name": "newValueAtIndex",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1391,
+                              "referencedDeclaration": 1403,
                               "src": "3442:15:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -4417,11 +4417,11 @@
                             "nodeType": "BinaryOperation",
                             "operator": "-",
                             "rightExpression": {
-                              "id": 1425,
+                              "id": 1437,
                               "name": "currentValueAtIndex",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1411,
+                              "referencedDeclaration": 1423,
                               "src": "3460:19:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -4440,7 +4440,7 @@
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1428,
+                        "id": 1440,
                         "nodeType": "ExpressionStatement",
                         "src": "3427:52:4"
                       }
@@ -4449,17 +4449,17 @@
                 },
                 {
                   "assignments": [
-                    1439
+                    1451
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1439,
+                      "id": 1451,
                       "mutability": "mutable",
                       "name": "offset",
                       "nameLocation": "3629:6:4",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1481,
+                      "scope": 1493,
                       "src": "3621:14:4",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -4468,7 +4468,7 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1438,
+                        "id": 1450,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
                         "src": "3621:7:4",
@@ -4480,20 +4480,20 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1445,
+                  "id": 1457,
                   "initialValue": {
                     "commonType": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1444,
+                    "id": 1456,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "hexValue": "34",
-                      "id": 1440,
+                      "id": 1452,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -4514,17 +4514,17 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 1443,
+                      "id": 1455,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
-                        "id": 1441,
+                        "id": 1453,
                         "name": "index",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1389,
+                        "referencedDeclaration": 1401,
                         "src": "3642:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -4535,7 +4535,7 @@
                       "operator": "*",
                       "rightExpression": {
                         "hexValue": "32",
-                        "id": 1442,
+                        "id": 1454,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -4566,17 +4566,17 @@
                 },
                 {
                   "expression": {
-                    "id": 1459,
+                    "id": 1471,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
-                      "id": 1446,
+                      "id": 1458,
                       "name": "rawPackedCounter",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1398,
+                      "referencedDeclaration": 1410,
                       "src": "3711:16:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bytes32",
@@ -4588,11 +4588,11 @@
                     "rightHandSide": {
                       "arguments": [
                         {
-                          "id": 1449,
+                          "id": 1461,
                           "name": "rawPackedCounter",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1398,
+                          "referencedDeclaration": 1410,
                           "src": "3746:16:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
@@ -4601,7 +4601,7 @@
                         },
                         {
                           "hexValue": "30",
-                          "id": 1450,
+                          "id": 1462,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -4620,11 +4620,11 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 1455,
+                                  "id": 1467,
                                   "name": "accumulator",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1405,
+                                  "referencedDeclaration": 1417,
                                   "src": "3781:11:4",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
@@ -4639,7 +4639,7 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 1454,
+                                "id": 1466,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -4651,14 +4651,14 @@
                                   "typeString": "type(uint32)"
                                 },
                                 "typeName": {
-                                  "id": 1453,
+                                  "id": 1465,
                                   "name": "uint32",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "3774:6:4",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 1456,
+                              "id": 1468,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4681,7 +4681,7 @@
                                 "typeString": "uint32"
                               }
                             ],
-                            "id": 1452,
+                            "id": 1464,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -4693,14 +4693,14 @@
                               "typeString": "type(bytes4)"
                             },
                             "typeName": {
-                              "id": 1451,
+                              "id": 1463,
                               "name": "bytes4",
                               "nodeType": "ElementaryTypeName",
                               "src": "3767:6:4",
                               "typeDescriptions": {}
                             }
                           },
-                          "id": 1457,
+                          "id": 1469,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4732,7 +4732,7 @@
                           }
                         ],
                         "expression": {
-                          "id": 1447,
+                          "id": 1459,
                           "name": "Bytes",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
@@ -4743,7 +4743,7 @@
                             "typeString": "type(library Bytes)"
                           }
                         },
-                        "id": 1448,
+                        "id": 1460,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4757,7 +4757,7 @@
                           "typeString": "function (bytes32,uint256,bytes4) pure returns (bytes32)"
                         }
                       },
-                      "id": 1458,
+                      "id": 1470,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4778,23 +4778,23 @@
                       "typeString": "bytes32"
                     }
                   },
-                  "id": 1460,
+                  "id": 1472,
                   "nodeType": "ExpressionStatement",
                   "src": "3711:84:4"
                 },
                 {
                   "expression": {
-                    "id": 1474,
+                    "id": 1486,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
-                      "id": 1461,
+                      "id": 1473,
                       "name": "rawPackedCounter",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1398,
+                      "referencedDeclaration": 1410,
                       "src": "3801:16:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bytes32",
@@ -4806,11 +4806,11 @@
                     "rightHandSide": {
                       "arguments": [
                         {
-                          "id": 1464,
+                          "id": 1476,
                           "name": "rawPackedCounter",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1398,
+                          "referencedDeclaration": 1410,
                           "src": "3836:16:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
@@ -4818,11 +4818,11 @@
                           }
                         },
                         {
-                          "id": 1465,
+                          "id": 1477,
                           "name": "offset",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1439,
+                          "referencedDeclaration": 1451,
                           "src": "3854:6:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -4834,11 +4834,11 @@
                             {
                               "arguments": [
                                 {
-                                  "id": 1470,
+                                  "id": 1482,
                                   "name": "newValueAtIndex",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1391,
+                                  "referencedDeclaration": 1403,
                                   "src": "3876:15:4",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
@@ -4853,7 +4853,7 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 1469,
+                                "id": 1481,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -4865,14 +4865,14 @@
                                   "typeString": "type(uint16)"
                                 },
                                 "typeName": {
-                                  "id": 1468,
+                                  "id": 1480,
                                   "name": "uint16",
                                   "nodeType": "ElementaryTypeName",
                                   "src": "3869:6:4",
                                   "typeDescriptions": {}
                                 }
                               },
-                              "id": 1471,
+                              "id": 1483,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4895,7 +4895,7 @@
                                 "typeString": "uint16"
                               }
                             ],
-                            "id": 1467,
+                            "id": 1479,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -4907,14 +4907,14 @@
                               "typeString": "type(bytes2)"
                             },
                             "typeName": {
-                              "id": 1466,
+                              "id": 1478,
                               "name": "bytes2",
                               "nodeType": "ElementaryTypeName",
                               "src": "3862:6:4",
                               "typeDescriptions": {}
                             }
                           },
-                          "id": 1472,
+                          "id": 1484,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4946,7 +4946,7 @@
                           }
                         ],
                         "expression": {
-                          "id": 1462,
+                          "id": 1474,
                           "name": "Bytes",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
@@ -4957,7 +4957,7 @@
                             "typeString": "type(library Bytes)"
                           }
                         },
-                        "id": 1463,
+                        "id": 1475,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4971,7 +4971,7 @@
                           "typeString": "function (bytes32,uint256,bytes2) pure returns (bytes32)"
                         }
                       },
-                      "id": 1473,
+                      "id": 1485,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4992,7 +4992,7 @@
                       "typeString": "bytes32"
                     }
                   },
-                  "id": 1475,
+                  "id": 1487,
                   "nodeType": "ExpressionStatement",
                   "src": "3801:93:4"
                 },
@@ -5000,11 +5000,11 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 1478,
+                        "id": 1490,
                         "name": "rawPackedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1398,
+                        "referencedDeclaration": 1410,
                         "src": "3927:16:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
@@ -5020,18 +5020,18 @@
                         }
                       ],
                       "expression": {
-                        "id": 1476,
+                        "id": 1488,
                         "name": "PackedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1081,
+                        "referencedDeclaration": 1093,
                         "src": "3908:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1093_$",
                           "typeString": "type(PackedCounter)"
                         }
                       },
-                      "id": 1477,
+                      "id": 1489,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5040,11 +5040,11 @@
                       "nodeType": "MemberAccess",
                       "src": "3908:18:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_wrap_pure$_t_bytes32_$returns$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                        "typeIdentifier": "t_function_wrap_pure$_t_bytes32_$returns$_t_userDefinedValueType$_PackedCounter_$1093_$",
                         "typeString": "function (bytes32) pure returns (PackedCounter)"
                       }
                     },
-                    "id": 1479,
+                    "id": 1491,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5055,19 +5055,19 @@
                     "src": "3908:36:4",
                     "tryCall": false,
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
-                  "functionReturnParameters": 1396,
-                  "id": 1480,
+                  "functionReturnParameters": 1408,
+                  "id": 1492,
                   "nodeType": "Return",
                   "src": "3901:43:4"
                 }
               ]
             },
             "documentation": {
-              "id": 1384,
+              "id": 1396,
               "nodeType": "StructuredDocumentation",
               "src": "2850:78:4",
               "text": " Set a counter at the given index, return the new packed counter"
@@ -5078,38 +5078,38 @@
             "name": "setAtIndex",
             "nameLocation": "2940:10:4",
             "parameters": {
-              "id": 1392,
+              "id": 1404,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1387,
+                  "id": 1399,
                   "mutability": "mutable",
                   "name": "packedCounter",
                   "nameLocation": "2970:13:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1482,
+                  "scope": 1494,
                   "src": "2956:27:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1386,
+                    "id": 1398,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1385,
+                      "id": 1397,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "2956:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "2956:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -5117,12 +5117,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1389,
+                  "id": 1401,
                   "mutability": "mutable",
                   "name": "index",
                   "nameLocation": "2997:5:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1482,
+                  "scope": 1494,
                   "src": "2989:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -5131,7 +5131,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1388,
+                    "id": 1400,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2989:7:4",
@@ -5144,12 +5144,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 1391,
+                  "id": 1403,
                   "mutability": "mutable",
                   "name": "newValueAtIndex",
                   "nameLocation": "3016:15:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1482,
+                  "scope": 1494,
                   "src": "3008:23:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -5158,7 +5158,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1390,
+                    "id": 1402,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3008:7:4",
@@ -5173,38 +5173,38 @@
               "src": "2950:85:4"
             },
             "returnParameters": {
-              "id": 1396,
+              "id": 1408,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1395,
+                  "id": 1407,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1482,
+                  "scope": 1494,
                   "src": "3059:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1394,
+                    "id": 1406,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1393,
+                      "id": 1405,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "3059:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "3059:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -5213,18 +5213,18 @@
               ],
               "src": "3058:15:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
           },
           {
-            "id": 1496,
+            "id": 1508,
             "nodeType": "FunctionDefinition",
             "src": "3995:130:4",
             "nodes": [],
             "body": {
-              "id": 1495,
+              "id": 1507,
               "nodeType": "Block",
               "src": "4072:53:4",
               "nodes": [],
@@ -5233,14 +5233,14 @@
                   "expression": {
                     "arguments": [
                       {
-                        "id": 1492,
+                        "id": 1504,
                         "name": "packedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1485,
+                        "referencedDeclaration": 1497,
                         "src": "4106:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         }
                       }
@@ -5248,23 +5248,23 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                          "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                           "typeString": "PackedCounter"
                         }
                       ],
                       "expression": {
-                        "id": 1490,
+                        "id": 1502,
                         "name": "PackedCounter",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1081,
+                        "referencedDeclaration": 1093,
                         "src": "4085:13:4",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1081_$",
+                          "typeIdentifier": "t_type$_t_userDefinedValueType$_PackedCounter_$1093_$",
                           "typeString": "type(PackedCounter)"
                         }
                       },
-                      "id": 1491,
+                      "id": 1503,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5273,11 +5273,11 @@
                       "nodeType": "MemberAccess",
                       "src": "4085:20:4",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1081_$returns$_t_bytes32_$",
+                        "typeIdentifier": "t_function_unwrap_pure$_t_userDefinedValueType$_PackedCounter_$1093_$returns$_t_bytes32_$",
                         "typeString": "function (PackedCounter) pure returns (bytes32)"
                       }
                     },
-                    "id": 1493,
+                    "id": 1505,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5292,8 +5292,8 @@
                       "typeString": "bytes32"
                     }
                   },
-                  "functionReturnParameters": 1489,
-                  "id": 1494,
+                  "functionReturnParameters": 1501,
+                  "id": 1506,
                   "nodeType": "Return",
                   "src": "4078:42:4"
                 }
@@ -5305,38 +5305,38 @@
             "name": "unwrap",
             "nameLocation": "4004:6:4",
             "parameters": {
-              "id": 1486,
+              "id": 1498,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1485,
+                  "id": 1497,
                   "mutability": "mutable",
                   "name": "packedCounter",
                   "nameLocation": "4025:13:4",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1496,
+                  "scope": 1508,
                   "src": "4011:27:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                    "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                     "typeString": "PackedCounter"
                   },
                   "typeName": {
-                    "id": 1484,
+                    "id": 1496,
                     "nodeType": "UserDefinedTypeName",
                     "pathNode": {
-                      "id": 1483,
+                      "id": 1495,
                       "name": "PackedCounter",
                       "nodeType": "IdentifierPath",
-                      "referencedDeclaration": 1081,
+                      "referencedDeclaration": 1093,
                       "src": "4011:13:4"
                     },
-                    "referencedDeclaration": 1081,
+                    "referencedDeclaration": 1093,
                     "src": "4011:13:4",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1081",
+                      "typeIdentifier": "t_userDefinedValueType$_PackedCounter_$1093",
                       "typeString": "PackedCounter"
                     }
                   },
@@ -5346,17 +5346,17 @@
               "src": "4010:29:4"
             },
             "returnParameters": {
-              "id": 1489,
+              "id": 1501,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1488,
+                  "id": 1500,
                   "mutability": "mutable",
                   "name": "",
                   "nameLocation": "-1:-1:-1",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1496,
+                  "scope": 1508,
                   "src": "4063:7:4",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -5365,7 +5365,7 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 1487,
+                    "id": 1499,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
                     "src": "4063:7:4",
@@ -5379,7 +5379,7 @@
               ],
               "src": "4062:9:4"
             },
-            "scope": 1497,
+            "scope": 1509,
             "stateMutability": "pure",
             "virtual": false,
             "visibility": "internal"
@@ -5392,11 +5392,11 @@
         "contractKind": "library",
         "fullyImplemented": true,
         "linearizedBaseContracts": [
-          1497
+          1509
         ],
         "name": "PackedCounterLib",
         "nameLocation": "251:16:4",
-        "scope": 1498,
+        "scope": 1510,
         "usedErrors": []
       }
     ],