diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
index 196b044d2a..e738024870 100644
--- a/crates/solidity/inputs/language/src/definition.rs
+++ b/crates/solidity/inputs/language/src/definition.rs
@@ -6738,37 +6738,40 @@ codegen_language_macros::compile!(Language(
             functions = [
                 BuiltInFunction(
                     name = "decode",
-                    parameters = ["bytes memory encodedData", "$Types encodedTypesTuple"],
-                    return_type = "$Types",
+                    parameters = ["bytes memory encodedData", "$Type[] encodedTypesTuple"],
+                    return_type = "$Any[]",
                     enabled = From("0.5.0")
                 ),
                 BuiltInFunction(
                     name = "encode",
-                    parameters = ["$Args valuesToEncode"],
+                    parameters = ["$Any[] valuesToEncode"],
                     return_type = "bytes memory",
                     enabled = From("0.4.22")
                 ),
                 BuiltInFunction(
                     name = "encodeCall",
-                    parameters = ["function() functionPointer", "$Args functionArgumentsTuple"],
+                    parameters = [
+                        "function() functionPointer",
+                        "$Any[] functionArgumentsTuple"
+                    ],
                     return_type = "bytes memory",
                     enabled = From("0.8.11")
                 ),
                 BuiltInFunction(
                     name = "encodePacked",
-                    parameters = ["$Args valuesToEncode"],
+                    parameters = ["$Any[] valuesToEncode"],
                     return_type = "bytes memory",
                     enabled = From("0.4.22")
                 ),
                 BuiltInFunction(
                     name = "encodeWithSelector",
-                    parameters = ["bytes4 selector", "$Args functionArgumentsTuple"],
+                    parameters = ["bytes4 selector", "$Any[] functionArgumentsTuple"],
                     return_type = "bytes memory",
                     enabled = From("0.4.22")
                 ),
                 BuiltInFunction(
                     name = "encodeWithSignature",
-                    parameters = ["string memory signature", "$Args valuesToEncode"],
+                    parameters = ["string memory signature", "$Any[] valuesToEncode"],
                     return_type = "bytes memory",
                     enabled = From("0.4.22")
                 )
@@ -6885,7 +6888,7 @@ codegen_language_macros::compile!(Language(
             fields = [],
             functions = [BuiltInFunction(
                 name = "concat",
-                parameters = ["$Args bytesToConcatenate"],
+                parameters = ["bytes[] bytesToConcatenate"],
                 return_type = "bytes memory"
             )]
         ),
@@ -6964,7 +6967,7 @@ codegen_language_macros::compile!(Language(
             fields = [],
             functions = [BuiltInFunction(
                 name = "concat",
-                parameters = ["$Args stringsToConcatenate"],
+                parameters = ["string[] stringsToConcatenate"],
                 return_type = "string memory"
             )]
         ),
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.11.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.11.sol
index e6031a2c25..a012478422 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.11.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.11.sol
@@ -48,7 +48,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $Function {
     function(uint amount) returns (function()) gas;
@@ -66,7 +66,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.17.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.17.sol
index 18e0f4f960..3ad1ac662a 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.17.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.17.sol
@@ -48,7 +48,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $Function {
     function(uint amount) returns (function()) gas;
@@ -67,7 +67,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.22.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.22.sol
index 3558a73f1a..e0928e5bb4 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.22.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.4.22.sol
@@ -23,10 +23,10 @@ contract $BuiltIns$ {
   function sha3(bytes memory) public returns (bytes32);
   function suicide(address payable recipient) public;
   struct $AbiType {
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -56,7 +56,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $Function {
     function(uint amount) returns (function()) gas;
@@ -75,7 +75,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.0.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.0.sol
index 365807be4a..18996d2bb1 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.0.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.0.sol
@@ -21,11 +21,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -54,7 +54,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $Function {
     function(uint amount) returns (function()) gas;
@@ -72,7 +72,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.3.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.3.sol
index 962c44516e..5dd4bb0750 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.3.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.5.3.sol
@@ -21,11 +21,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -54,7 +54,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $Function {
     function(uint amount) returns (function()) gas;
@@ -72,7 +72,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol
index a61ee7d337..2fcabbc92e 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol
@@ -21,11 +21,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -55,7 +55,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $Function {
     function(uint amount) returns (function()) gas;
@@ -73,7 +73,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol
index 970182e4c8..dc00818947 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol
@@ -21,11 +21,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -55,7 +55,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -78,7 +78,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol
index 8117413c32..4a57dfa48f 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol
@@ -21,11 +21,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -55,7 +55,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -78,7 +78,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol
index 7729502cff..a20e478f50 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol
@@ -21,11 +21,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -55,7 +55,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -78,7 +78,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol
index 6d01d31b6e..6c4e69b5d9 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol
@@ -21,11 +21,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -55,7 +55,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -74,7 +74,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol
index d166afdac4..4626514db5 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol
@@ -16,11 +16,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -53,7 +53,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -72,7 +72,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol
index c419a8b9bb..4fd057bb07 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol
@@ -16,12 +16,12 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function(function() functionPointer, $Args functionArgumentsTuple) returns (bytes memory) encodeCall;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function(function() functionPointer, $Any[] functionArgumentsTuple) returns (bytes memory) encodeCall;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -55,7 +55,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -78,7 +78,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol
index 2d25af2771..edf82c7c7d 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol
@@ -16,12 +16,12 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function(function() functionPointer, $Args functionArgumentsTuple) returns (bytes memory) encodeCall;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function(function() functionPointer, $Any[] functionArgumentsTuple) returns (bytes memory) encodeCall;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -56,7 +56,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -79,7 +79,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol
index 4a97115c9f..be45a8cbf4 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol
@@ -16,11 +16,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -53,7 +53,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -73,7 +73,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol
index 5b017eeddf..5b537bd6f5 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol
@@ -17,12 +17,12 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function(function() functionPointer, $Args functionArgumentsTuple) returns (bytes memory) encodeCall;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function(function() functionPointer, $Any[] functionArgumentsTuple) returns (bytes memory) encodeCall;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -58,7 +58,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -81,7 +81,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol
index f071ec1b24..b27eff44b4 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol
@@ -18,12 +18,12 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function(function() functionPointer, $Args functionArgumentsTuple) returns (bytes memory) encodeCall;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function(function() functionPointer, $Any[] functionArgumentsTuple) returns (bytes memory) encodeCall;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -59,7 +59,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -82,7 +82,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol
index 233fd9bc5b..4ac08e94dd 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol
@@ -16,11 +16,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -53,7 +53,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -76,7 +76,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol
index be5a5eb33f..503367efb7 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol
@@ -16,11 +16,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -54,7 +54,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -77,7 +77,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol
index 900db19925..ec34656dbc 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol
@@ -16,11 +16,11 @@ contract $BuiltIns$ {
   function selfdestruct(address payable recipient) public;
   function sha256(bytes memory) public returns (bytes32);
   struct $AbiType {
-    function(bytes memory encodedData, $Types encodedTypesTuple) returns ($Types) decode;
-    function($Args valuesToEncode) returns (bytes memory) encode;
-    function($Args valuesToEncode) returns (bytes memory) encodePacked;
-    function(bytes4 selector, $Args functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
-    function(string memory signature, $Args valuesToEncode) returns (bytes memory) encodeWithSignature;
+    function(bytes memory encodedData, $Type[] encodedTypesTuple) returns ($Any[]) decode;
+    function($Any[] valuesToEncode) returns (bytes memory) encode;
+    function($Any[] valuesToEncode) returns (bytes memory) encodePacked;
+    function(bytes4 selector, $Any[] functionArgumentsTuple) returns (bytes memory) encodeWithSelector;
+    function(string memory signature, $Any[] valuesToEncode) returns (bytes memory) encodeWithSignature;
   }
   struct $address {
     uint256 balance;
@@ -54,7 +54,7 @@ contract $BuiltIns$ {
     uint length;
   }
   struct $BytesType {
-    function($Args bytesToConcatenate) returns (bytes memory) concat;
+    function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
   struct $CallOptions {
     uint gas;
@@ -77,7 +77,7 @@ contract $BuiltIns$ {
     uint value;
   }
   struct $StringType {
-    function($Args stringsToConcatenate) returns (string memory) concat;
+    function(string[] stringsToConcatenate) returns (string memory) concat;
   }
   struct $TransactionType {
     uint gasprice;