diff_with_ptr_optimized_without_ptr_optimized.diff

--- /tmp/with_ptr_opt	2020-03-13 14:54:27.070101705 +0100
+++ /tmp/without_ptr_opt	2020-03-13 14:54:06.510009293 +0100
@@ -11,11 +11,11 @@
         value := calldataload(offset)
         validator_revert_t_address(value)
     }
-    function abi_decode_t_array$_t_address_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_address_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -30,11 +30,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -43,61 +43,61 @@
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_array$_t_bytes_memory_ptr_$2_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_array$_t_bytes_memory_$2_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_bytes_memory_ptr_$2_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_bytes_memory_$2_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x02
-        array := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_$2_memory(length))
         let dst := array
         let src := offset
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_bytes_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_bytes_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$12_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x0c
-        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_ptr_$12_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_$12_memory(length))
         let dst := array
         let src := offset
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_string_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_string_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$20_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x14
-        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_ptr_$20_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_$20_memory(length))
         let dst := array
         let src := offset
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_string_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_string_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_ptr_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -106,16 +106,16 @@
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_string_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_string_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint16_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint16_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint16_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint16_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -130,11 +130,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$30_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$30_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x1e
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$30_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$30_memory(length))
         let dst := array
         let src := offset
         if gt(add(src, mul(length, 0x20)), end) { revert(0, 0) }
@@ -146,11 +146,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$31_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$31_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x1f
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$31_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$31_memory(length))
         let dst := array
         let src := offset
         if gt(add(src, mul(length, 0x20)), end) { revert(0, 0) }
@@ -162,11 +162,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$32_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$32_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x20
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$32_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$32_memory(length))
         let dst := array
         let src := offset
         if gt(add(src, mul(length, 0x20)), end) { revert(0, 0) }
@@ -178,11 +178,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -197,11 +197,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint32_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint32_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint32_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint32_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -216,11 +216,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_bytes_memory_ptr(offset, end) -> array
+    function abi_decode_t_bytes_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_bytes_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_bytes_memory(length))
         mstore(array, length)
         let src := add(offset, 0x20)
         let dst := add(array, 0x20)
@@ -232,11 +232,11 @@
         value := calldataload(offset)
         validator_revert_t_contract$_C_$164(value)
     }
-    function abi_decode_t_string_memory_ptr(offset, end) -> array
+    function abi_decode_t_string_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_string_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_string_memory(length))
         mstore(array, length)
         let src := add(offset, 0x20)
         let dst := add(array, 0x20)
@@ -258,41 +258,41 @@
         value := calldataload(offset)
         validator_revert_t_uint32(value)
     }
-    function abi_decode_tuple_t_array$_t_address_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_bytes_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_address_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_bytes_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_address_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_address_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 64))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value2 := abi_decode_t_bytes_memory_ptr(add(headStart, offset), dataEnd)
+            value2 := abi_decode_t_bytes_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 96
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint16_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint16_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_uint16_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint16_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 64
@@ -303,17 +303,17 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$30_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$30_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1056) { revert(0, 0) }
         {
             let offset := 0
-            value0 := abi_decode_t_array$_t_uint256_$30_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$30_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 960))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 992
@@ -324,17 +324,17 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$31_memory_ptrt_array$_t_string_memory_ptr_$20_memory_ptrt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$31_memoryt_array$_t_string_memory_$20_memoryt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1088) { revert(0, 0) }
         {
             let offset := 0
-            value0 := abi_decode_t_array$_t_uint256_$31_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$31_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 992))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$20_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 1024
@@ -345,17 +345,17 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$32_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$32_memoryt_array$_t_string_memory_$dyn_memoryt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1120) { revert(0, 0) }
         {
             let offset := 0
-            value0 := abi_decode_t_array$_t_uint256_$32_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$32_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 1024))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 1056
@@ -366,18 +366,18 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_uint256_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 64
@@ -388,23 +388,23 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint32_$dyn_memory_ptrt_array$_t_string_memory_ptr_$12_memory_ptrt_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint32_$dyn_memoryt_array$_t_string_memory_$12_memoryt_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_uint32_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint32_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$12_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 64))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value2 := abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value2 := abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 96
@@ -419,9 +419,9 @@
             value0 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
         }
     }
-    function abi_encodeUpdatedPos_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value0, pos) -> updatedPos
+    function abi_encodeUpdatedPos_t_bytes_memory_to_t_bytes_memory(value0, pos) -> updatedPos
     {
-        updatedPos := abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value0, pos)
+        updatedPos := abi_encode_t_bytes_memory_to_t_bytes_memory(value0, pos)
     }
     function abi_encodeUpdatedPos_t_uint16_to_t_uint16(value0, pos) -> updatedPos
     {
@@ -433,70 +433,70 @@
         abi_encode_t_uint256_to_t_uint256(value0, pos)
         updatedPos := add(pos, 0x20)
     }
-    function abi_encode_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_bytes_memory_$dyn_memory_to_t_array$_t_bytes_memory_$dyn_memory_fromStack(value, pos) -> end
     {
-        let length := array_length_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(pos, length)
+        let length := array_length_t_array$_t_bytes_memory_$dyn_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_bytes_memory_$dyn_memory_fromStack(pos, length)
         let headStart := pos
         let tail := add(pos, mul(length, 0x20))
-        let baseRef := array_dataslot_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(value)
+        let baseRef := array_dataslot_t_array$_t_bytes_memory_$dyn_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             mstore(pos, sub(tail, headStart))
             let elementValue0 := mload(srcPtr)
-            tail := abi_encodeUpdatedPos_t_bytes_memory_ptr_to_t_bytes_memory_ptr(elementValue0, tail)
-            srcPtr := array_nextElement_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(srcPtr)
+            tail := abi_encodeUpdatedPos_t_bytes_memory_to_t_bytes_memory(elementValue0, tail)
+            srcPtr := array_nextElement_t_array$_t_bytes_memory_$dyn_memory(srcPtr)
             pos := add(pos, 0x20)
         }
         pos := tail
         end := pos
     }
-    function abi_encode_t_array$_t_uint16_$200_memory_ptr_to_t_array$_t_uint16_$200_memory_ptr_fromStack(value, pos)
+    function abi_encode_t_array$_t_uint16_$200_memory_to_t_array$_t_uint16_$200_memory_fromStack(value, pos)
     {
-        let length := array_length_t_array$_t_uint16_$200_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_ptr_fromStack(pos, length)
-        let baseRef := array_dataslot_t_array$_t_uint16_$200_memory_ptr(value)
+        let length := array_length_t_array$_t_uint16_$200_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_fromStack(pos, length)
+        let baseRef := array_dataslot_t_array$_t_uint16_$200_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementValue0 := mload(srcPtr)
             pos := abi_encodeUpdatedPos_t_uint16_to_t_uint16(elementValue0, pos)
-            srcPtr := array_nextElement_t_array$_t_uint16_$200_memory_ptr(srcPtr)
+            srcPtr := array_nextElement_t_array$_t_uint16_$200_memory(srcPtr)
         }
     }
-    function abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value, pos) -> end
     {
-        let length := array_length_t_array$_t_uint16_$dyn_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_ptr_fromStack(pos, length)
-        let baseRef := array_dataslot_t_array$_t_uint16_$dyn_memory_ptr(value)
+        let length := array_length_t_array$_t_uint16_$dyn_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_fromStack(pos, length)
+        let baseRef := array_dataslot_t_array$_t_uint16_$dyn_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementValue0 := mload(srcPtr)
             pos := abi_encodeUpdatedPos_t_uint16_to_t_uint16(elementValue0, pos)
-            srcPtr := array_nextElement_t_array$_t_uint16_$dyn_memory_ptr(srcPtr)
+            srcPtr := array_nextElement_t_array$_t_uint16_$dyn_memory(srcPtr)
         }
         end := pos
     }
-    function abi_encode_t_array$_t_uint256_$dyn_memory_ptr_to_t_array$_t_uint256_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_uint256_$dyn_memory_to_t_array$_t_uint256_$dyn_memory_fromStack(value, pos) -> end
     {
-        let length := array_length_t_array$_t_uint256_$dyn_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_ptr_fromStack(pos, length)
-        let baseRef := array_dataslot_t_array$_t_uint256_$dyn_memory_ptr(value)
+        let length := array_length_t_array$_t_uint256_$dyn_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_fromStack(pos, length)
+        let baseRef := array_dataslot_t_array$_t_uint256_$dyn_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementValue0 := mload(srcPtr)
             pos := abi_encodeUpdatedPos_t_uint256_to_t_uint256(elementValue0, pos)
-            srcPtr := array_nextElement_t_array$_t_uint256_$dyn_memory_ptr(srcPtr)
+            srcPtr := array_nextElement_t_array$_t_uint256_$dyn_memory(srcPtr)
         }
         end := pos
     }
-    function abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value, pos) -> end
+    function abi_encode_t_bytes_memory_to_t_bytes_memory(value, pos) -> end
     {
-        let length := array_length_t_bytes_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_bytes_memory_ptr(pos, length)
+        let length := array_length_t_bytes_memory(value)
+        pos := array_storeLengthForEncoding_t_bytes_memory(pos, length)
         copy_memory_to_memory(add(value, 0x20), pos, length)
         end := add(pos, round_up_to_mul_of_32(length))
     }
@@ -512,28 +512,28 @@
     {
         mstore(pos, cleanup_t_uint256(value))
     }
-    function abi_encode_tuple_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         tail := add(headStart, 64)
         mstore(add(headStart, 0), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(value0, tail)
+        tail := abi_encode_t_array$_t_bytes_memory_$dyn_memory_to_t_array$_t_bytes_memory_$dyn_memory_fromStack(value0, tail)
         mstore(add(headStart, 32), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail)
     }
-    function abi_encode_tuple_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         tail := add(headStart, 6432)
-        abi_encode_t_array$_t_uint16_$200_memory_ptr_to_t_array$_t_uint16_$200_memory_ptr_fromStack(value0, add(headStart, 0))
+        abi_encode_t_array$_t_uint16_$200_memory_to_t_array$_t_uint16_$200_memory_fromStack(value0, add(headStart, 0))
         mstore(add(headStart, 6400), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail)
     }
-    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         tail := add(headStart, 64)
         mstore(add(headStart, 0), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint256_$dyn_memory_ptr_to_t_array$_t_uint256_$dyn_memory_ptr_fromStack(value0, tail)
+        tail := abi_encode_t_array$_t_uint256_$dyn_memory_to_t_array$_t_uint256_$dyn_memory_fromStack(value0, tail)
         mstore(add(headStart, 32), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail)
     }
     function abi_encode_tuple_t_uint256__to_t_uint256__fromStack(headStart, value0) -> tail
     {
@@ -547,137 +547,137 @@
         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { revert(0, 0) }
         mstore(64, newFreePtr)
     }
-    function array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_address_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_bytes_memory_$2_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_string_memory_ptr_$12_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_string_memory_$12_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_string_memory_ptr_$20_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_string_memory_$20_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_string_memory_ptr_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_string_memory_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint16_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint16_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$30_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$30_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$31_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$31_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$32_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$32_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint32_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint32_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_bytes_memory_ptr(length) -> size
+    function array_allocation_size_t_bytes_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := and(add(length, 0x1f), not(0x1f))
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_string_memory_ptr(length) -> size
+    function array_allocation_size_t_string_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := and(add(length, 0x1f), not(0x1f))
         size := add(size, 0x20)
     }
-    function array_dataslot_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_bytes_memory_$dyn_memory(ptr) -> data
     {
         data := ptr
         data := add(ptr, 0x20)
     }
-    function array_dataslot_t_array$_t_uint16_$200_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_uint16_$200_memory(ptr) -> data
     { data := ptr }
-    function array_dataslot_t_array$_t_uint16_$dyn_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_uint16_$dyn_memory(ptr) -> data
     {
         data := ptr
         data := add(ptr, 0x20)
     }
-    function array_dataslot_t_array$_t_uint256_$dyn_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_uint256_$dyn_memory(ptr) -> data
     {
         data := ptr
         data := add(ptr, 0x20)
     }
-    function array_length_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(value) -> length
+    function array_length_t_array$_t_bytes_memory_$dyn_memory(value) -> length
     { length := mload(value) }
-    function array_length_t_array$_t_uint16_$200_memory_ptr(value) -> length
+    function array_length_t_array$_t_uint16_$200_memory(value) -> length
     { length := 0xc8 }
-    function array_length_t_array$_t_uint16_$dyn_memory_ptr(value) -> length
+    function array_length_t_array$_t_uint16_$dyn_memory(value) -> length
     { length := mload(value) }
-    function array_length_t_array$_t_uint256_$dyn_memory_ptr(value) -> length
+    function array_length_t_array$_t_uint256_$dyn_memory(value) -> length
     { length := mload(value) }
-    function array_length_t_bytes_memory_ptr(value) -> length
+    function array_length_t_bytes_memory(value) -> length
     { length := mload(value) }
-    function array_nextElement_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_bytes_memory_$dyn_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_nextElement_t_array$_t_uint16_$200_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_uint16_$200_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_nextElement_t_array$_t_uint16_$dyn_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_uint16_$dyn_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_nextElement_t_array$_t_uint256_$dyn_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_uint256_$dyn_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_storeLengthForEncoding_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_bytes_memory_$dyn_memory_fromStack(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
     }
-    function array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_fromStack(pos, length) -> updated_pos
     { updated_pos := pos }
-    function array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_fromStack(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
     }
-    function array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_fromStack(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
     }
-    function array_storeLengthForEncoding_t_bytes_memory_ptr(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_bytes_memory(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
@@ -747,11 +747,11 @@
         value := calldataload(offset)
         validator_revert_t_address(value)
     }
-    function abi_decode_t_array$_t_address_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_address_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -766,11 +766,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -779,61 +779,61 @@
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_array$_t_bytes_memory_ptr_$2_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_array$_t_bytes_memory_$2_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_bytes_memory_ptr_$2_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_bytes_memory_$2_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x02
-        array := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_$2_memory(length))
         let dst := array
         let src := offset
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_bytes_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_bytes_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$12_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x0c
-        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_ptr_$12_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_$12_memory(length))
         let dst := array
         let src := offset
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_string_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_string_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$20_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x14
-        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_ptr_$20_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_$20_memory(length))
         let dst := array
         let src := offset
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_string_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_string_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_ptr_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_string_memory_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -842,16 +842,16 @@
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementPos := add(offset, calldataload(src))
-            mstore(dst, abi_decode_t_string_memory_ptr(elementPos, end))
+            mstore(dst, abi_decode_t_string_memory(elementPos, end))
             dst := add(dst, 0x20)
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint16_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint16_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint16_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint16_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -866,11 +866,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$30_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$30_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x1e
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$30_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$30_memory(length))
         let dst := array
         let src := offset
         if gt(add(src, mul(length, 0x20)), end) { revert(0, 0) }
@@ -882,11 +882,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$31_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$31_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x1f
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$31_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$31_memory(length))
         let dst := array
         let src := offset
         if gt(add(src, mul(length, 0x20)), end) { revert(0, 0) }
@@ -898,11 +898,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$32_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$32_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := 0x20
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$32_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$32_memory(length))
         let dst := array
         let src := offset
         if gt(add(src, mul(length, 0x20)), end) { revert(0, 0) }
@@ -914,11 +914,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint256_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint256_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint256_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -933,11 +933,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_array$_t_uint32_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_uint32_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_uint32_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_uint32_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         offset := add(offset, 0x20)
@@ -952,11 +952,11 @@
             src := add(src, 0x20)
         }
     }
-    function abi_decode_t_bytes_memory_ptr(offset, end) -> array
+    function abi_decode_t_bytes_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_bytes_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_bytes_memory(length))
         mstore(array, length)
         let src := add(offset, 0x20)
         let dst := add(array, 0x20)
@@ -968,11 +968,11 @@
         value := calldataload(offset)
         validator_revert_t_contract$_C_$164(value)
     }
-    function abi_decode_t_string_memory_ptr(offset, end) -> array
+    function abi_decode_t_string_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_string_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_string_memory(length))
         mstore(array, length)
         let src := add(offset, 0x20)
         let dst := add(array, 0x20)
@@ -994,41 +994,41 @@
         value := calldataload(offset)
         validator_revert_t_uint32(value)
     }
-    function abi_decode_tuple_t_array$_t_address_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_bytes_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_address_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_bytes_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_address_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_address_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 64))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value2 := abi_decode_t_bytes_memory_ptr(add(headStart, offset), dataEnd)
+            value2 := abi_decode_t_bytes_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 96
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint16_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint16_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_uint16_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint16_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 64
@@ -1039,17 +1039,17 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$30_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$30_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1056) { revert(0, 0) }
         {
             let offset := 0
-            value0 := abi_decode_t_array$_t_uint256_$30_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$30_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 960))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 992
@@ -1060,17 +1060,17 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$31_memory_ptrt_array$_t_string_memory_ptr_$20_memory_ptrt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$31_memoryt_array$_t_string_memory_$20_memoryt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1088) { revert(0, 0) }
         {
             let offset := 0
-            value0 := abi_decode_t_array$_t_uint256_$31_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$31_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 992))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$20_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 1024
@@ -1081,17 +1081,17 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$32_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$32_memoryt_array$_t_string_memory_$dyn_memoryt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1120) { revert(0, 0) }
         {
             let offset := 0
-            value0 := abi_decode_t_array$_t_uint256_$32_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$32_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 1024))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 1056
@@ -1102,18 +1102,18 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_uint256_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint256_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 64
@@ -1124,23 +1124,23 @@
             value3 := abi_decode_t_address(add(headStart, offset), dataEnd)
         }
     }
-    function abi_decode_tuple_t_array$_t_uint32_$dyn_memory_ptrt_array$_t_string_memory_ptr_$12_memory_ptrt_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint32_$dyn_memoryt_array$_t_string_memory_$12_memoryt_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(0, 0) }
         {
             let offset := calldataload(add(headStart, 0))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value0 := abi_decode_t_array$_t_uint32_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value0 := abi_decode_t_array$_t_uint32_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 32))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value1 := abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(add(headStart, offset), dataEnd)
+            value1 := abi_decode_t_array$_t_string_memory_$12_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := calldataload(add(headStart, 64))
             if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
-            value2 := abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+            value2 := abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(add(headStart, offset), dataEnd)
         }
         {
             let offset := 96
@@ -1155,9 +1155,9 @@
             value0 := abi_decode_t_uint256(add(headStart, offset), dataEnd)
         }
     }
-    function abi_encodeUpdatedPos_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value0, pos) -> updatedPos
+    function abi_encodeUpdatedPos_t_bytes_memory_to_t_bytes_memory(value0, pos) -> updatedPos
     {
-        updatedPos := abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value0, pos)
+        updatedPos := abi_encode_t_bytes_memory_to_t_bytes_memory(value0, pos)
     }
     function abi_encodeUpdatedPos_t_uint16_to_t_uint16(value0, pos) -> updatedPos
     {
@@ -1169,70 +1169,70 @@
         abi_encode_t_uint256_to_t_uint256(value0, pos)
         updatedPos := add(pos, 0x20)
     }
-    function abi_encode_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_bytes_memory_$dyn_memory_to_t_array$_t_bytes_memory_$dyn_memory_fromStack(value, pos) -> end
     {
-        let length := array_length_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(pos, length)
+        let length := array_length_t_array$_t_bytes_memory_$dyn_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_bytes_memory_$dyn_memory_fromStack(pos, length)
         let headStart := pos
         let tail := add(pos, mul(length, 0x20))
-        let baseRef := array_dataslot_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(value)
+        let baseRef := array_dataslot_t_array$_t_bytes_memory_$dyn_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             mstore(pos, sub(tail, headStart))
             let elementValue0 := mload(srcPtr)
-            tail := abi_encodeUpdatedPos_t_bytes_memory_ptr_to_t_bytes_memory_ptr(elementValue0, tail)
-            srcPtr := array_nextElement_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(srcPtr)
+            tail := abi_encodeUpdatedPos_t_bytes_memory_to_t_bytes_memory(elementValue0, tail)
+            srcPtr := array_nextElement_t_array$_t_bytes_memory_$dyn_memory(srcPtr)
             pos := add(pos, 0x20)
         }
         pos := tail
         end := pos
     }
-    function abi_encode_t_array$_t_uint16_$200_memory_ptr_to_t_array$_t_uint16_$200_memory_ptr_fromStack(value, pos)
+    function abi_encode_t_array$_t_uint16_$200_memory_to_t_array$_t_uint16_$200_memory_fromStack(value, pos)
     {
-        let length := array_length_t_array$_t_uint16_$200_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_ptr_fromStack(pos, length)
-        let baseRef := array_dataslot_t_array$_t_uint16_$200_memory_ptr(value)
+        let length := array_length_t_array$_t_uint16_$200_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_fromStack(pos, length)
+        let baseRef := array_dataslot_t_array$_t_uint16_$200_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementValue0 := mload(srcPtr)
             pos := abi_encodeUpdatedPos_t_uint16_to_t_uint16(elementValue0, pos)
-            srcPtr := array_nextElement_t_array$_t_uint16_$200_memory_ptr(srcPtr)
+            srcPtr := array_nextElement_t_array$_t_uint16_$200_memory(srcPtr)
         }
     }
-    function abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value, pos) -> end
     {
-        let length := array_length_t_array$_t_uint16_$dyn_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_ptr_fromStack(pos, length)
-        let baseRef := array_dataslot_t_array$_t_uint16_$dyn_memory_ptr(value)
+        let length := array_length_t_array$_t_uint16_$dyn_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_fromStack(pos, length)
+        let baseRef := array_dataslot_t_array$_t_uint16_$dyn_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementValue0 := mload(srcPtr)
             pos := abi_encodeUpdatedPos_t_uint16_to_t_uint16(elementValue0, pos)
-            srcPtr := array_nextElement_t_array$_t_uint16_$dyn_memory_ptr(srcPtr)
+            srcPtr := array_nextElement_t_array$_t_uint16_$dyn_memory(srcPtr)
         }
         end := pos
     }
-    function abi_encode_t_array$_t_uint256_$dyn_memory_ptr_to_t_array$_t_uint256_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_uint256_$dyn_memory_to_t_array$_t_uint256_$dyn_memory_fromStack(value, pos) -> end
     {
-        let length := array_length_t_array$_t_uint256_$dyn_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_ptr_fromStack(pos, length)
-        let baseRef := array_dataslot_t_array$_t_uint256_$dyn_memory_ptr(value)
+        let length := array_length_t_array$_t_uint256_$dyn_memory(value)
+        pos := array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_fromStack(pos, length)
+        let baseRef := array_dataslot_t_array$_t_uint256_$dyn_memory(value)
         let srcPtr := baseRef
         for { let i := 0 } lt(i, length) { i := add(i, 1) }
         {
             let elementValue0 := mload(srcPtr)
             pos := abi_encodeUpdatedPos_t_uint256_to_t_uint256(elementValue0, pos)
-            srcPtr := array_nextElement_t_array$_t_uint256_$dyn_memory_ptr(srcPtr)
+            srcPtr := array_nextElement_t_array$_t_uint256_$dyn_memory(srcPtr)
         }
         end := pos
     }
-    function abi_encode_t_bytes_memory_ptr_to_t_bytes_memory_ptr(value, pos) -> end
+    function abi_encode_t_bytes_memory_to_t_bytes_memory(value, pos) -> end
     {
-        let length := array_length_t_bytes_memory_ptr(value)
-        pos := array_storeLengthForEncoding_t_bytes_memory_ptr(pos, length)
+        let length := array_length_t_bytes_memory(value)
+        pos := array_storeLengthForEncoding_t_bytes_memory(pos, length)
         copy_memory_to_memory(add(value, 0x20), pos, length)
         end := add(pos, round_up_to_mul_of_32(length))
     }
@@ -1248,28 +1248,28 @@
     {
         mstore(pos, cleanup_t_uint256(value))
     }
-    function abi_encode_tuple_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         tail := add(headStart, 64)
         mstore(add(headStart, 0), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(value0, tail)
+        tail := abi_encode_t_array$_t_bytes_memory_$dyn_memory_to_t_array$_t_bytes_memory_$dyn_memory_fromStack(value0, tail)
         mstore(add(headStart, 32), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail)
     }
-    function abi_encode_tuple_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         tail := add(headStart, 6432)
-        abi_encode_t_array$_t_uint16_$200_memory_ptr_to_t_array$_t_uint16_$200_memory_ptr_fromStack(value0, add(headStart, 0))
+        abi_encode_t_array$_t_uint16_$200_memory_to_t_array$_t_uint16_$200_memory_fromStack(value0, add(headStart, 0))
         mstore(add(headStart, 6400), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail)
     }
-    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         tail := add(headStart, 64)
         mstore(add(headStart, 0), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint256_$dyn_memory_ptr_to_t_array$_t_uint256_$dyn_memory_ptr_fromStack(value0, tail)
+        tail := abi_encode_t_array$_t_uint256_$dyn_memory_to_t_array$_t_uint256_$dyn_memory_fromStack(value0, tail)
         mstore(add(headStart, 32), sub(tail, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail)
     }
     function abi_encode_tuple_t_uint256__to_t_uint256__fromStack(headStart, value0) -> tail
     {
@@ -1283,137 +1283,137 @@
         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { revert(0, 0) }
         mstore(64, newFreePtr)
     }
-    function array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_address_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_bytes_memory_$2_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_string_memory_ptr_$12_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_string_memory_$12_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_string_memory_ptr_$20_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_string_memory_$20_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_string_memory_ptr_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_string_memory_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint16_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint16_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$30_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$30_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$31_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$31_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$32_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$32_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint256_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_array$_t_uint32_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_uint32_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := mul(length, 0x20)
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_bytes_memory_ptr(length) -> size
+    function array_allocation_size_t_bytes_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := and(add(length, 0x1f), not(0x1f))
         size := add(size, 0x20)
     }
-    function array_allocation_size_t_string_memory_ptr(length) -> size
+    function array_allocation_size_t_string_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(0, 0) }
         size := and(add(length, 0x1f), not(0x1f))
         size := add(size, 0x20)
     }
-    function array_dataslot_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_bytes_memory_$dyn_memory(ptr) -> data
     {
         data := ptr
         data := add(ptr, 0x20)
     }
-    function array_dataslot_t_array$_t_uint16_$200_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_uint16_$200_memory(ptr) -> data
     { data := ptr }
-    function array_dataslot_t_array$_t_uint16_$dyn_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_uint16_$dyn_memory(ptr) -> data
     {
         data := ptr
         data := add(ptr, 0x20)
     }
-    function array_dataslot_t_array$_t_uint256_$dyn_memory_ptr(ptr) -> data
+    function array_dataslot_t_array$_t_uint256_$dyn_memory(ptr) -> data
     {
         data := ptr
         data := add(ptr, 0x20)
     }
-    function array_length_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(value) -> length
+    function array_length_t_array$_t_bytes_memory_$dyn_memory(value) -> length
     { length := mload(value) }
-    function array_length_t_array$_t_uint16_$200_memory_ptr(value) -> length
+    function array_length_t_array$_t_uint16_$200_memory(value) -> length
     { length := 0xc8 }
-    function array_length_t_array$_t_uint16_$dyn_memory_ptr(value) -> length
+    function array_length_t_array$_t_uint16_$dyn_memory(value) -> length
     { length := mload(value) }
-    function array_length_t_array$_t_uint256_$dyn_memory_ptr(value) -> length
+    function array_length_t_array$_t_uint256_$dyn_memory(value) -> length
     { length := mload(value) }
-    function array_length_t_bytes_memory_ptr(value) -> length
+    function array_length_t_bytes_memory(value) -> length
     { length := mload(value) }
-    function array_nextElement_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_bytes_memory_$dyn_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_nextElement_t_array$_t_uint16_$200_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_uint16_$200_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_nextElement_t_array$_t_uint16_$dyn_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_uint16_$dyn_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_nextElement_t_array$_t_uint256_$dyn_memory_ptr(ptr) -> next
+    function array_nextElement_t_array$_t_uint256_$dyn_memory(ptr) -> next
     { next := add(ptr, 0x20) }
-    function array_storeLengthForEncoding_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_bytes_memory_$dyn_memory_fromStack(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
     }
-    function array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_uint16_$200_memory_fromStack(pos, length) -> updated_pos
     { updated_pos := pos }
-    function array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_uint16_$dyn_memory_fromStack(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
     }
-    function array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_ptr_fromStack(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_array$_t_uint256_$dyn_memory_fromStack(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
     }
-    function array_storeLengthForEncoding_t_bytes_memory_ptr(pos, length) -> updated_pos
+    function array_storeLengthForEncoding_t_bytes_memory(pos, length) -> updated_pos
     {
         mstore(pos, length)
         updated_pos := add(pos, 0x20)
@@ -1483,13 +1483,13 @@
     function abi_decode_t_address(offset, end) -> value
     {
         value := calldataload(offset)
-        if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
+        validator_revert_t_address(value)
     }
-    function abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         let _1 := 0x20
@@ -1500,14 +1500,13 @@
         {
             let _2 := add(offset, calldataload(src))
             if iszero(slt(add(_2, 63), end)) { revert(0, 0) }
-            let _3 := 0x02
-            let dst_1 := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_3))
+            let dst_1 := allocateMemory(64)
             let dst_2 := dst_1
             let src_1 := add(_2, _1)
             let i_1 := 0
-            for { } lt(i_1, _3) { i_1 := add(i_1, 1) }
+            for { } lt(i_1, 0x02) { i_1 := add(i_1, 1) }
             {
-                mstore(dst_1, abi_decode_t_bytes_memory_ptr(add(add(_2, calldataload(src_1)), _1), end))
+                mstore(dst_1, abi_decode_t_bytes_memory(add(add(_2, calldataload(src_1)), _1), end))
                 dst_1 := add(dst_1, _1)
                 src_1 := add(src_1, _1)
             }
@@ -1516,7 +1515,7 @@
             src := add(src, _1)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$12_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         array := allocateMemory(384)
@@ -1525,13 +1524,13 @@
         let i := 0
         for { } lt(i, 0x0c) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_bytes_memory_ptr(add(offset, calldataload(src)), end))
+            mstore(dst, abi_decode_t_bytes_memory(add(offset, calldataload(src)), end))
             let _1 := 0x20
             dst := add(dst, _1)
             src := add(src, _1)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$20_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         array := allocateMemory(640)
@@ -1540,17 +1539,17 @@
         let i := 0
         for { } lt(i, 0x14) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_bytes_memory_ptr(add(offset, calldataload(src)), end))
+            mstore(dst, abi_decode_t_bytes_memory(add(offset, calldataload(src)), end))
             let _1 := 0x20
             dst := add(dst, _1)
             src := add(src, _1)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         let _1 := 0x20
@@ -1559,12 +1558,12 @@
         let i := 0
         for { } lt(i, length) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_bytes_memory_ptr(add(add(offset, calldataload(src)), _1), end))
+            mstore(dst, abi_decode_t_bytes_memory(add(add(offset, calldataload(src)), _1), end))
             dst := add(dst, _1)
             src := add(src, _1)
         }
     }
-    function abi_decode_t_bytes_memory_ptr(offset, end) -> array
+    function abi_decode_t_bytes_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         let length := calldataload(offset)
@@ -1585,7 +1584,7 @@
         value := calldataload(offset)
         if iszero(eq(value, and(value, 0xffffffff))) { revert(0, 0) }
     }
-    function abi_decode_tuple_t_array$_t_address_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_bytes_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_address_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_bytes_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value0, value0) }
         let offset := calldataload(headStart)
@@ -1594,7 +1593,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value0, value0) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -1604,20 +1603,22 @@
         let i := value0
         for { } lt(i, length) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_address(src, dataEnd))
+            let value := calldataload(src)
+            validator_revert_t_address(value)
+            mstore(dst, value)
             dst := add(dst, _3)
             src := add(src, _3)
         }
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value1, value1) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset_1), dataEnd)
         let offset_2 := calldataload(add(headStart, 64))
         if gt(offset_2, _1) { revert(value2, value2) }
-        value2 := abi_decode_t_bytes_memory_ptr(add(headStart, offset_2), dataEnd)
+        value2 := abi_decode_t_bytes_memory(add(headStart, offset_2), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint16_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint16_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value2, value2) }
         let offset := calldataload(headStart)
@@ -1626,7 +1627,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value2, value2) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -1636,23 +1637,25 @@
         let i := value2
         for { } lt(i, length) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_uint16(src, dataEnd))
+            let value := calldataload(src)
+            validator_revert_t_uint16(value)
+            mstore(dst, value)
             dst := add(dst, _3)
             src := add(src, _3)
         }
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset_1), dataEnd)
         value2 := abi_decode_t_uint16(add(headStart, 64), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$30_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$30_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1056) { revert(value2, value2) }
         if iszero(slt(add(headStart, 0x1f), dataEnd)) { revert(value2, value2) }
         let _1 := 0x1e
-        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_1))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_$2_memory(_1))
         let dst_1 := dst
         let src := headStart
         let _2 := add(headStart, 960)
@@ -1668,16 +1671,16 @@
         value0 := dst_1
         let offset := calldataload(_2)
         if gt(offset, 0xffffffffffffffff) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         value2 := abi_decode_t_uint16(add(headStart, 992), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 1024), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$31_memory_ptrt_array$_t_string_memory_ptr_$20_memory_ptrt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$31_memoryt_array$_t_string_memory_$20_memoryt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1088) { revert(value2, value2) }
         let _1 := 0x1f
         if iszero(slt(add(headStart, _1), dataEnd)) { revert(value2, value2) }
-        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_1))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_$2_memory(_1))
         let dst_1 := dst
         let src := headStart
         let _2 := add(headStart, 992)
@@ -1693,35 +1696,37 @@
         value0 := dst_1
         let offset := calldataload(_2)
         if gt(offset, 0xffffffffffffffff) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(add(headStart, offset), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$20_memory(add(headStart, offset), dataEnd)
         value2 := abi_decode_t_address(add(headStart, 1024), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 1056), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$32_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$32_memoryt_array$_t_string_memory_$dyn_memoryt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1120) { revert(value2, value2) }
         if iszero(slt(add(headStart, 0x1f), dataEnd)) { revert(value2, value2) }
-        let _1 := 0x20
-        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_1))
+        let _1 := 1024
+        let dst := allocateMemory(_1)
         let dst_1 := dst
         let src := headStart
-        let _2 := add(headStart, 1024)
+        let _2 := add(headStart, _1)
         if gt(_2, dataEnd) { revert(value2, value2) }
         let i := value2
-        for { } lt(i, _1) { i := add(i, 1) }
+        for { } true { i := add(i, 1) }
         {
+            let _3 := 0x20
+            if iszero(lt(i, _3)) { break }
             mstore(dst, calldataload(src))
-            dst := add(dst, _1)
-            src := add(src, _1)
+            dst := add(dst, _3)
+            src := add(src, _3)
         }
         value0 := dst_1
         let offset := calldataload(_2)
         if gt(offset, 0xffffffffffffffff) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         value2 := abi_decode_t_uint32(add(headStart, 1056), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 1088), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value2, value2) }
         let offset := calldataload(headStart)
@@ -1730,7 +1735,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value2, value2) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -1747,11 +1752,11 @@
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset_1), dataEnd)
         value2 := abi_decode_t_uint16(add(headStart, 64), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint32_$dyn_memory_ptrt_array$_t_string_memory_ptr_$12_memory_ptrt_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint32_$dyn_memoryt_array$_t_string_memory_$12_memoryt_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value2, value2) }
         let offset := calldataload(headStart)
@@ -1760,7 +1765,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value2, value2) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -1777,10 +1782,10 @@
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$12_memory(add(headStart, offset_1), dataEnd)
         let offset_2 := calldataload(add(headStart, 64))
         if gt(offset_2, _1) { revert(value2, value2) }
-        value2 := abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(add(headStart, offset_2), dataEnd)
+        value2 := abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(add(headStart, offset_2), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
     function abi_decode_tuple_t_uint256(headStart, dataEnd) -> value0
@@ -1788,7 +1793,7 @@
         if slt(sub(dataEnd, headStart), 32) { revert(value0, value0) }
         value0 := calldataload(headStart)
     }
-    function abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value, pos) -> end
     {
         let length := mload(value)
         mstore(pos, length)
@@ -1804,7 +1809,7 @@
         }
         end := pos
     }
-    function abi_encode_tuple_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         let tail_1 := add(headStart, 64)
         mstore(headStart, 64)
@@ -1836,9 +1841,9 @@
             pos := add(pos, _1)
         }
         mstore(add(headStart, _1), sub(tail_2, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail_2)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail_2)
     }
-    function abi_encode_tuple_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         let _1 := 6432
         let pos := headStart
@@ -1853,9 +1858,9 @@
             srcPtr := add(srcPtr, _2)
         }
         mstore(add(headStart, 6400), _1)
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, add(headStart, _1))
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, add(headStart, _1))
     }
-    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         let tail_1 := add(headStart, 64)
         mstore(headStart, 64)
@@ -1873,7 +1878,7 @@
             srcPtr := add(srcPtr, _1)
         }
         mstore(add(headStart, _1), sub(pos, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, pos)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, pos)
     }
     function abi_encode_tuple_t_uint256__to_t_uint256__fromStack(headStart, value0) -> tail
     {
@@ -1887,16 +1892,24 @@
         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { revert(0, 0) }
         mstore(64, newFreePtr)
     }
-    function array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_address_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(size, size) }
         size := add(mul(length, 0x20), 0x20)
     }
-    function array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_bytes_memory_$2_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(size, size) }
         size := mul(length, 0x20)
     }
+    function validator_revert_t_address(value)
+    {
+        if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
+    }
+    function validator_revert_t_uint16(value)
+    {
+        if iszero(eq(value, and(value, 0xffff))) { revert(0, 0) }
+    }
 }
 After optimizer:
 {
@@ -1904,13 +1917,13 @@
     function abi_decode_t_address(offset, end) -> value
     {
         value := calldataload(offset)
-        if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
+        validator_revert_t_address(value)
     }
-    function abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         let _1 := 0x20
@@ -1921,14 +1934,13 @@
         {
             let _2 := add(offset, calldataload(src))
             if iszero(slt(add(_2, 63), end)) { revert(0, 0) }
-            let _3 := 0x02
-            let dst_1 := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_3))
+            let dst_1 := allocateMemory(64)
             let dst_2 := dst_1
             let src_1 := add(_2, _1)
             let i_1 := 0
-            for { } lt(i_1, _3) { i_1 := add(i_1, 1) }
+            for { } lt(i_1, 0x02) { i_1 := add(i_1, 1) }
             {
-                mstore(dst_1, abi_decode_t_bytes_memory_ptr(add(add(_2, calldataload(src_1)), _1), end))
+                mstore(dst_1, abi_decode_t_bytes_memory(add(add(_2, calldataload(src_1)), _1), end))
                 dst_1 := add(dst_1, _1)
                 src_1 := add(src_1, _1)
             }
@@ -1937,7 +1949,7 @@
             src := add(src, _1)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$12_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         array := allocateMemory(384)
@@ -1946,13 +1958,13 @@
         let i := 0
         for { } lt(i, 0x0c) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_bytes_memory_ptr(add(offset, calldataload(src)), end))
+            mstore(dst, abi_decode_t_bytes_memory(add(offset, calldataload(src)), end))
             let _1 := 0x20
             dst := add(dst, _1)
             src := add(src, _1)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$20_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         array := allocateMemory(640)
@@ -1961,17 +1973,17 @@
         let i := 0
         for { } lt(i, 0x14) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_bytes_memory_ptr(add(offset, calldataload(src)), end))
+            mstore(dst, abi_decode_t_bytes_memory(add(offset, calldataload(src)), end))
             let _1 := 0x20
             dst := add(dst, _1)
             src := add(src, _1)
         }
     }
-    function abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(offset, end) -> array
+    function abi_decode_t_array$_t_string_memory_$dyn_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         let length := calldataload(offset)
-        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        array := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst := array
         mstore(array, length)
         let _1 := 0x20
@@ -1980,12 +1992,12 @@
         let i := 0
         for { } lt(i, length) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_bytes_memory_ptr(add(add(offset, calldataload(src)), _1), end))
+            mstore(dst, abi_decode_t_bytes_memory(add(add(offset, calldataload(src)), _1), end))
             dst := add(dst, _1)
             src := add(src, _1)
         }
     }
-    function abi_decode_t_bytes_memory_ptr(offset, end) -> array
+    function abi_decode_t_bytes_memory(offset, end) -> array
     {
         if iszero(slt(add(offset, 0x1f), end)) { revert(array, array) }
         let length := calldataload(offset)
@@ -2006,7 +2018,7 @@
         value := calldataload(offset)
         if iszero(eq(value, and(value, 0xffffffff))) { revert(0, 0) }
     }
-    function abi_decode_tuple_t_array$_t_address_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_bytes_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_address_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_bytes_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value0, value0) }
         let offset := calldataload(headStart)
@@ -2015,7 +2027,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value0, value0) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -2025,20 +2037,22 @@
         let i := value0
         for { } lt(i, length) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_address(src, dataEnd))
+            let value := calldataload(src)
+            validator_revert_t_address(value)
+            mstore(dst, value)
             dst := add(dst, _3)
             src := add(src, _3)
         }
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value1, value1) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset_1), dataEnd)
         let offset_2 := calldataload(add(headStart, 64))
         if gt(offset_2, _1) { revert(value2, value2) }
-        value2 := abi_decode_t_bytes_memory_ptr(add(headStart, offset_2), dataEnd)
+        value2 := abi_decode_t_bytes_memory(add(headStart, offset_2), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint16_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint16_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value2, value2) }
         let offset := calldataload(headStart)
@@ -2047,7 +2061,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value2, value2) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -2057,23 +2071,25 @@
         let i := value2
         for { } lt(i, length) { i := add(i, 1) }
         {
-            mstore(dst, abi_decode_t_uint16(src, dataEnd))
+            let value := calldataload(src)
+            validator_revert_t_uint16(value)
+            mstore(dst, value)
             dst := add(dst, _3)
             src := add(src, _3)
         }
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset_1), dataEnd)
         value2 := abi_decode_t_uint16(add(headStart, 64), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$30_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$30_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1056) { revert(value2, value2) }
         if iszero(slt(add(headStart, 0x1f), dataEnd)) { revert(value2, value2) }
         let _1 := 0x1e
-        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_1))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_$2_memory(_1))
         let dst_1 := dst
         let src := headStart
         let _2 := add(headStart, 960)
@@ -2089,16 +2105,16 @@
         value0 := dst_1
         let offset := calldataload(_2)
         if gt(offset, 0xffffffffffffffff) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         value2 := abi_decode_t_uint16(add(headStart, 992), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 1024), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$31_memory_ptrt_array$_t_string_memory_ptr_$20_memory_ptrt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$31_memoryt_array$_t_string_memory_$20_memoryt_contract$_C_$164t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1088) { revert(value2, value2) }
         let _1 := 0x1f
         if iszero(slt(add(headStart, _1), dataEnd)) { revert(value2, value2) }
-        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_1))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_$2_memory(_1))
         let dst_1 := dst
         let src := headStart
         let _2 := add(headStart, 992)
@@ -2114,35 +2130,37 @@
         value0 := dst_1
         let offset := calldataload(_2)
         if gt(offset, 0xffffffffffffffff) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$20_memory_ptr(add(headStart, offset), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$20_memory(add(headStart, offset), dataEnd)
         value2 := abi_decode_t_address(add(headStart, 1024), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 1056), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$32_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$32_memoryt_array$_t_string_memory_$dyn_memoryt_uint32t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 1120) { revert(value2, value2) }
         if iszero(slt(add(headStart, 0x1f), dataEnd)) { revert(value2, value2) }
-        let _1 := 0x20
-        let dst := allocateMemory(array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(_1))
+        let _1 := 1024
+        let dst := allocateMemory(_1)
         let dst_1 := dst
         let src := headStart
-        let _2 := add(headStart, 1024)
+        let _2 := add(headStart, _1)
         if gt(_2, dataEnd) { revert(value2, value2) }
         let i := value2
-        for { } lt(i, _1) { i := add(i, 1) }
+        for { } true { i := add(i, 1) }
         {
+            let _3 := 0x20
+            if iszero(lt(i, _3)) { break }
             mstore(dst, calldataload(src))
-            dst := add(dst, _1)
-            src := add(src, _1)
+            dst := add(dst, _3)
+            src := add(src, _3)
         }
         value0 := dst_1
         let offset := calldataload(_2)
         if gt(offset, 0xffffffffffffffff) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset), dataEnd)
         value2 := abi_decode_t_uint32(add(headStart, 1056), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 1088), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptrt_array$_t_string_memory_ptr_$dyn_memory_ptrt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint256_$dyn_memoryt_array$_t_string_memory_$dyn_memoryt_uint16t_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value2, value2) }
         let offset := calldataload(headStart)
@@ -2151,7 +2169,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value2, value2) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -2168,11 +2186,11 @@
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$dyn_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$dyn_memory(add(headStart, offset_1), dataEnd)
         value2 := abi_decode_t_uint16(add(headStart, 64), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
-    function abi_decode_tuple_t_array$_t_uint32_$dyn_memory_ptrt_array$_t_string_memory_ptr_$12_memory_ptrt_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptrt_address(headStart, dataEnd) -> value0, value1, value2, value3
+    function abi_decode_tuple_t_array$_t_uint32_$dyn_memoryt_array$_t_string_memory_$12_memoryt_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memoryt_address(headStart, dataEnd) -> value0, value1, value2, value3
     {
         if slt(sub(dataEnd, headStart), 128) { revert(value2, value2) }
         let offset := calldataload(headStart)
@@ -2181,7 +2199,7 @@
         let _2 := add(headStart, offset)
         if iszero(slt(add(_2, 0x1f), dataEnd)) { revert(value2, value2) }
         let length := calldataload(_2)
-        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length))
+        let dst := allocateMemory(array_allocation_size_t_array$_t_address_$dyn_memory(length))
         let dst_1 := dst
         mstore(dst, length)
         let _3 := 0x20
@@ -2198,10 +2216,10 @@
         value0 := dst_1
         let offset_1 := calldataload(add(headStart, _3))
         if gt(offset_1, _1) { revert(value2, value2) }
-        value1 := abi_decode_t_array$_t_string_memory_ptr_$12_memory_ptr(add(headStart, offset_1), dataEnd)
+        value1 := abi_decode_t_array$_t_string_memory_$12_memory(add(headStart, offset_1), dataEnd)
         let offset_2 := calldataload(add(headStart, 64))
         if gt(offset_2, _1) { revert(value2, value2) }
-        value2 := abi_decode_t_array$_t_array$_t_bytes_memory_ptr_$2_memory_ptr_$dyn_memory_ptr(add(headStart, offset_2), dataEnd)
+        value2 := abi_decode_t_array$_t_array$_t_bytes_memory_$2_memory_$dyn_memory(add(headStart, offset_2), dataEnd)
         value3 := abi_decode_t_address(add(headStart, 96), dataEnd)
     }
     function abi_decode_tuple_t_uint256(headStart, dataEnd) -> value0
@@ -2209,7 +2227,7 @@
         if slt(sub(dataEnd, headStart), 32) { revert(value0, value0) }
         value0 := calldataload(headStart)
     }
-    function abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value, pos) -> end
+    function abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value, pos) -> end
     {
         let length := mload(value)
         mstore(pos, length)
@@ -2225,7 +2243,7 @@
         }
         end := pos
     }
-    function abi_encode_tuple_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_bytes_memory_ptr_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_bytes_memory_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         let tail_1 := add(headStart, 64)
         mstore(headStart, 64)
@@ -2257,9 +2275,9 @@
             pos := add(pos, _1)
         }
         mstore(add(headStart, _1), sub(tail_2, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, tail_2)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, tail_2)
     }
-    function abi_encode_tuple_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint16_$200_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint16_$200_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         let _1 := 6432
         let pos := headStart
@@ -2274,9 +2292,9 @@
             srcPtr := add(srcPtr, _2)
         }
         mstore(add(headStart, 6400), _1)
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, add(headStart, _1))
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, add(headStart, _1))
     }
-    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__to_t_array$_t_uint256_$dyn_memory_ptr_t_array$_t_uint16_$dyn_memory_ptr__fromStack(headStart, value1, value0) -> tail
+    function abi_encode_tuple_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__to_t_array$_t_uint256_$dyn_memory_t_array$_t_uint16_$dyn_memory__fromStack(headStart, value1, value0) -> tail
     {
         let tail_1 := add(headStart, 64)
         mstore(headStart, 64)
@@ -2294,7 +2312,7 @@
             srcPtr := add(srcPtr, _1)
         }
         mstore(add(headStart, _1), sub(pos, headStart))
-        tail := abi_encode_t_array$_t_uint16_$dyn_memory_ptr_to_t_array$_t_uint16_$dyn_memory_ptr_fromStack(value1, pos)
+        tail := abi_encode_t_array$_t_uint16_$dyn_memory_to_t_array$_t_uint16_$dyn_memory_fromStack(value1, pos)
     }
     function abi_encode_tuple_t_uint256__to_t_uint256__fromStack(headStart, value0) -> tail
     {
@@ -2308,15 +2326,23 @@
         if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { revert(0, 0) }
         mstore(64, newFreePtr)
     }
-    function array_allocation_size_t_array$_t_address_$dyn_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_address_$dyn_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(size, size) }
         size := add(mul(length, 0x20), 0x20)
     }
-    function array_allocation_size_t_array$_t_bytes_memory_ptr_$2_memory_ptr(length) -> size
+    function array_allocation_size_t_array$_t_bytes_memory_$2_memory(length) -> size
     {
         if gt(length, 0xffffffffffffffff) { revert(size, size) }
         size := mul(length, 0x20)
     }
+    function validator_revert_t_address(value)
+    {
+        if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
+    }
+    function validator_revert_t_uint16(value)
+    {
+        if iszero(eq(value, and(value, 0xffff))) { revert(0, 0) }
+    }
 }
 { if condition { revert(0, 0) } }