diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli
index 69671f95b943c37f3c23e01b39e0d8e333bb3c28..02f17b96e8db6309885ea54a7310bb01534b3582 100644
--- a/src/proto_alpha/lib_protocol/alpha_context.mli
+++ b/src/proto_alpha/lib_protocol/alpha_context.mli
@@ -1609,30 +1609,27 @@ end
 module Tx_rollup : sig
   include BASIC_DATA
 
-  type tx_rollup = t
-
-  val rpc_arg : tx_rollup RPC_arg.arg
+  val rpc_arg : t RPC_arg.arg
 
-  val to_b58check : tx_rollup -> string
+  val to_b58check : t -> string
 
-  val of_b58check : string -> tx_rollup tzresult
+  val of_b58check : string -> t tzresult
 
-  val of_b58check_opt : string -> tx_rollup option
+  val of_b58check_opt : string -> t option
 
-  val pp : Format.formatter -> tx_rollup -> unit
+  val pp : Format.formatter -> t -> unit
 
-  val encoding : tx_rollup Data_encoding.t
+  val encoding : t Data_encoding.t
 
   val deposit_entrypoint : Entrypoint.t
 
-  val originate : context -> (context * tx_rollup) tzresult Lwt.t
+  val originate : context -> (context * t) tzresult Lwt.t
 
-  module Set : Set.S with type elt = tx_rollup
+  module Set : Set.S with type elt = t
 
   module Internal_for_tests : sig
     (** see [tx_rollup_repr.originated_tx_rollup] for documentation *)
-    val originated_tx_rollup :
-      Origination_nonce.Internal_for_tests.t -> tx_rollup
+    val originated_tx_rollup : Origination_nonce.Internal_for_tests.t -> t
   end
 end
 
diff --git a/src/proto_alpha/lib_protocol/contract_repr.ml b/src/proto_alpha/lib_protocol/contract_repr.ml
index b1cfe042a292ded324a08901333dbd1c60aabd57..512b8993c0dd182d4bd6949c7b104910e4905d87 100644
--- a/src/proto_alpha/lib_protocol/contract_repr.ml
+++ b/src/proto_alpha/lib_protocol/contract_repr.ml
@@ -234,3 +234,7 @@ module Index = struct
 
   let compare = compare
 end
+
+(* Renamed exports. *)
+
+let of_b58data = contract_of_b58data
diff --git a/src/proto_alpha/lib_protocol/contract_repr.mli b/src/proto_alpha/lib_protocol/contract_repr.mli
index ac3695a6f81b37a1d16862bb9f2ceba988288a89..ab76bee991e8440d828c55e25aa4a7e1c17b457c 100644
--- a/src/proto_alpha/lib_protocol/contract_repr.mli
+++ b/src/proto_alpha/lib_protocol/contract_repr.mli
@@ -67,6 +67,8 @@ val to_b58check : t -> string
 
 val of_b58check : string -> t tzresult
 
+val of_b58data : Base58.data -> t option
+
 val pp : Format.formatter -> t -> unit
 
 val pp_short : Format.formatter -> t -> unit
diff --git a/src/proto_alpha/lib_protocol/destination_repr.ml b/src/proto_alpha/lib_protocol/destination_repr.ml
index b8a798212913d3f048e03e74c113181e0a398450..15d0f87bc8162446be5577ca7ead3c32af60809d 100644
--- a/src/proto_alpha/lib_protocol/destination_repr.ml
+++ b/src/proto_alpha/lib_protocol/destination_repr.ml
@@ -68,13 +68,19 @@ let () =
     (function Invalid_destination_b58check x -> Some x | _ -> None)
     (fun x -> Invalid_destination_b58check x)
 
+let of_b58data data =
+  match Contract_repr.of_b58data data with
+  | Some c -> Some (Contract c)
+  | None ->
+      Tx_rollup_repr.of_b58data data
+      |> Option.map (fun tx_rollup -> Tx_rollup tx_rollup)
+
+let of_b58check_opt s = Option.bind (Base58.decode s) of_b58data
+
 let of_b58check s =
-  match Contract_repr.of_b58check s with
-  | Ok s -> Ok (Contract s)
-  | Error _ -> (
-      match Tx_rollup_repr.of_b58check s with
-      | Ok s -> Ok (Tx_rollup s)
-      | Error _ -> error (Invalid_destination_b58check s))
+  match of_b58check_opt s with
+  | None -> error (Invalid_destination_b58check s)
+  | Some dest -> Ok dest
 
 let encoding =
   let open Data_encoding in
diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
index af392490784fbf132c1f775882d1eae71c754bf3..34797b492572d95a6a96812f663c3a32017d9136 100644
--- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
+++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
@@ -1654,7 +1654,7 @@ module Cost_of = struct
     let contract_optimized = key_hash_optimized
 
     (* Reasonable approximation *)
-    let contract_readable = Gas.(S.safe_int 2 *@ key_hash_readable)
+    let contract_readable = key_hash_readable
 
     let bls12_381_g1 = atomic_step_cost cost_DECODING_BLS_G1
 
diff --git a/src/proto_alpha/lib_protocol/tx_rollup_repr.ml b/src/proto_alpha/lib_protocol/tx_rollup_repr.ml
index 2623a090fe3ec729251c43f3b5184c01c7455ebc..5fcfc6be3b6338fea2de7d86c6089c86f42ea669 100644
--- a/src/proto_alpha/lib_protocol/tx_rollup_repr.ml
+++ b/src/proto_alpha/lib_protocol/tx_rollup_repr.ml
@@ -65,8 +65,6 @@ end
 
 type t = Hash.t
 
-type tx_rollup = t
-
 module Compare_impl = Compare.Make (struct
   type nonrec t = t
 
@@ -82,8 +80,9 @@ let in_memory_size _ =
 
 let to_b58check rollup = Hash.to_b58check rollup
 
-let of_b58check_opt s =
-  match Base58.decode s with Some (Hash.Data hash) -> Some hash | _ -> None
+let of_b58data = function Hash.Data hash -> Some hash | _ -> None
+
+let of_b58check_opt s = Option.bind (Base58.decode s) of_b58data
 
 let of_b58check s =
   match of_b58check_opt s with
@@ -130,7 +129,7 @@ let rpc_arg =
     ()
 
 module Index = struct
-  type t = tx_rollup
+  type nonrec t = t
 
   let path_length = 1
 
@@ -155,14 +154,11 @@ end
 
 let deposit_entrypoint = Entrypoint_repr.of_string_strict_exn "deposit"
 
-module Set = Set.Make (struct
-  type t = tx_rollup
-
-  include Compare_impl
-end)
+module Cmp = struct
+  type nonrec t = t
 
-module Map = Map.Make (struct
-  type t = tx_rollup
+  let compare = compare
+end
 
-  include Compare_impl
-end)
+module Set = Set.Make (Cmp)
+module Map = Map.Make (Cmp)
diff --git a/src/proto_alpha/lib_protocol/tx_rollup_repr.mli b/src/proto_alpha/lib_protocol/tx_rollup_repr.mli
index 9fa632d7b5094148fabe3c03cdef1088f243023f..301d8a8009de925f6375658bd5cc9e579f1e1481 100644
--- a/src/proto_alpha/lib_protocol/tx_rollup_repr.mli
+++ b/src/proto_alpha/lib_protocol/tx_rollup_repr.mli
@@ -38,8 +38,6 @@ end
 
 type t = private Hash.t
 
-type tx_rollup = t
-
 include Compare.S with type t := t
 
 (** [in_memory_size tx_rollup] returns the number of bytes [tx_rollup]
@@ -48,6 +46,8 @@ val in_memory_size : t -> Cache_memory_helpers.sint
 
 val to_b58check : t -> string
 
+val of_b58data : Base58.data -> t option
+
 val of_b58check : string -> t tzresult
 
 val of_b58check_opt : string -> t option
@@ -68,6 +68,6 @@ module Index : Storage_description.INDEX with type t = t
     into a transaction rollup. *)
 val deposit_entrypoint : Entrypoint_repr.t
 
-module Set : Set.S with type elt = tx_rollup
+module Set : Set.S with type elt = t
 
-module Map : Map.S with type key = tx_rollup
+module Map : Map.S with type key = t
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
index fcc0ef4dde34c63936b477aa6293c0e7c5504fc7..d277bc77a3ea6e9117708a69459f0d1641d00bd3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestSelfAddressTransfer::test_send_self_address
 
 Node is bootstrapped.
-Estimated gas: 4696.742 units (will add 100 for safety)
+Estimated gas: 4693.442 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000774
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4797
+    Gas limit: 4794
     Storage limit: 0 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000774
@@ -27,7 +27,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 82 bytes
-      Consumed gas: 3493.652
+      Consumed gas: 3490.352
     Internal operations:
       Transaction:
         Amount: ꜩ0
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out
index 093a84cd4ba57c3323b4ac2a55cea9e93880ae8b..0efea4ae84a9abbe847689248120103cde02a13d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[non_regression/bug_843.tz]
 
 Well typed
-Gas remaining: 1039990.549 units remaining
+Gas remaining: 1039993.849 units remaining
 { parameter never ;
   storage (pair address (lambda unit unit)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out
index 9423dfa7d71438f46da19d0a3a5d1d1e7df81aa9..424b6700a1bf0e57a1fdc1143c97e50d2ea1c7a8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sets.tz]
 
 Well typed
-Gas remaining: 1039942.190 units remaining
+Gas remaining: 1039952.090 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out
index da5972dbc68af19c88cdf7874549f188917dac06..5ecbcd2e9330f542a74ada89c3115fe38709502e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_nonexistent_addr.tz]
 
 Well typed
-Gas remaining: 1039986.259 units remaining
+Gas remaining: 1039989.559 units remaining
 { parameter (pair nat address) ;
   storage bool ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
index 458492ee7036f02d1c7abfbf54f5b517f4c13a93..fcfd182e4ee0c015c6d74b3a699f5ece2a5e5241 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_source
 
 Node is bootstrapped.
-Estimated gas: 1416.647 units (will add 100 for safety)
+Estimated gas: 1413.347 units (will add 100 for safety)
 Estimated storage: 322 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000462
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1517
+    Gas limit: 1514
     Storage limit: 342 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000462
@@ -33,7 +33,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 65 bytes
         Paid storage size diff: 65 bytes
-        Consumed gas: 1416.647
+        Consumed gas: 1413.347
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01625
           storage fees ........................... +ꜩ0.01625
@@ -78,7 +78,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 3775.704 units (will add 100 for safety)
+Estimated gas: 3772.404 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -91,7 +91,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000682
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3876
+    Gas limit: 3873
     Storage limit: 0 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000682
@@ -104,7 +104,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 55 bytes
-      Consumed gas: 2572.502
+      Consumed gas: 2569.202
     Internal operations:
       Transaction:
         Amount: ꜩ0
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
index 7bd37a521413fd61d96e4bd27c38b7d2bab46c44..1771ea004a4ca68f1e41d5288f1a93439aca1d68 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
@@ -143,7 +143,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 4683.067 units (will add 100 for safety)
+Estimated gas: 4679.767 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -154,13 +154,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000776
+    Fee to the baker: ꜩ0.000775
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4784
+    Gas limit: 4780
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000776
-      payload fees(the block proposer) ....... +ꜩ0.000776
+      [CONTRACT_HASH] ... -ꜩ0.000775
+      payload fees(the block proposer) ....... +ꜩ0.000775
     Transaction:
       Amount: ꜩ100
       From: [CONTRACT_HASH]
@@ -169,7 +169,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 66 bytes
-      Consumed gas: 3480.265
+      Consumed gas: 3476.965
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
@@ -191,7 +191,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 3771 units (will add 100 for safety)
+Estimated gas: 3767.700 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -202,13 +202,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000685
+    Fee to the baker: ꜩ0.000684
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3871
+    Gas limit: 3868
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000685
-      payload fees(the block proposer) ....... +ꜩ0.000685
+      [CONTRACT_HASH] ... -ꜩ0.000684
+      payload fees(the block proposer) ....... +ꜩ0.000684
     Transaction:
       Amount: ꜩ100
       From: [CONTRACT_HASH]
@@ -217,7 +217,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 66 bytes
-      Consumed gas: 2568.198
+      Consumed gas: 2564.898
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out"
index c8458a1300a782f76476e7c8f4121a56e271fac0..c745e736179687ead84865ec1cbbad197320c234 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out"
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039987.934 units remaining)
+  - location: 9 (remaining gas: 1039991.234 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ]
-  - location: 9 (remaining gas: 1039987.924 units remaining)
+  - location: 9 (remaining gas: 1039991.224 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 10 (remaining gas: 1039987.914 units remaining)
+  - location: 10 (remaining gas: 1039991.214 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 11 (remaining gas: 1039987.904 units remaining)
+  - location: 11 (remaining gas: 1039991.204 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 12 (remaining gas: 1039987.894 units remaining)
+  - location: 12 (remaining gas: 1039991.194 units remaining)
     [ {}
       (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 14 (remaining gas: 1039987.884 units remaining)
+  - location: 14 (remaining gas: 1039991.184 units remaining)
     [ (Pair {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out"
index 38b1029037076ad93925d70a95d07dbeabd90f90..70996020219af76e2a3c0d37fd06f9e5c013c7e8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out"
@@ -7,23 +7,23 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039984.530 units remaining)
+  - location: 7 (remaining gas: 1039987.830 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ]
-  - location: 7 (remaining gas: 1039984.520 units remaining)
+  - location: 7 (remaining gas: 1039987.820 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 8 (remaining gas: 1039984.430 units remaining)
+  - location: 8 (remaining gas: 1039987.730 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 11 (remaining gas: 1039984.420 units remaining)
+  - location: 11 (remaining gas: 1039987.720 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 11 (remaining gas: 1039984.410 units remaining)
+  - location: 11 (remaining gas: 1039987.710 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 17 (remaining gas: 1039984.400 units remaining)
+  - location: 17 (remaining gas: 1039987.700 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039984.390 units remaining)
+  - location: 18 (remaining gas: 1039987.690 units remaining)
     [ Unit ]
-  - location: 19 (remaining gas: 1039984.380 units remaining)
+  - location: 19 (remaining gas: 1039987.680 units remaining)
     [ {}
       Unit ]
-  - location: 21 (remaining gas: 1039984.370 units remaining)
+  - location: 21 (remaining gas: 1039987.670 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out"
index 937344383947bb44c9c40d3c3de4e92f3dc7cfc1..8144070a0e9a8076f79804277f9fb49cbd0e6cb6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039840.730 units remaining)
+  - location: 16 (remaining gas: 1039844.030 units remaining)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -18,7 +18,7 @@ trace
                   "2019-09-09T08:35:33Z"
                   "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             Unit) ]
-  - location: 16 (remaining gas: 1039840.720 units remaining)
+  - location: 16 (remaining gas: 1039844.020 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -28,7 +28,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 17 (remaining gas: 1039840.710 units remaining)
+  - location: 17 (remaining gas: 1039844.010 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -47,7 +47,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 18 (remaining gas: 1039840.700 units remaining)
+  - location: 18 (remaining gas: 1039844 units remaining)
     [ -1
       (Pair -1
             1
@@ -58,7 +58,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039840.690 units remaining)
+  - location: 19 (remaining gas: 1039843.990 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -68,7 +68,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 21 (remaining gas: 1039840.680 units remaining)
+  - location: 21 (remaining gas: 1039843.980 units remaining)
     [ -1
       (Pair 1
             "foobar"
@@ -78,7 +78,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039840.660 units remaining)
+  - location: 19 (remaining gas: 1039843.960 units remaining)
     [ -1
       -1
       (Pair 1
@@ -89,7 +89,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 22 (remaining gas: 1039840.433 units remaining)
+  - location: 22 (remaining gas: 1039843.733 units remaining)
     [ 0x050041
       -1
       (Pair 1
@@ -100,7 +100,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 23 (remaining gas: 1039840.013 units remaining)
+  - location: 23 (remaining gas: 1039843.313 units remaining)
     [ (Some -1)
       -1
       (Pair 1
@@ -111,7 +111,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039840.003 units remaining)
+  - location: 26 (remaining gas: 1039843.303 units remaining)
     [ -1
       -1
       (Pair 1
@@ -122,7 +122,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039839.993 units remaining)
+  - location: 26 (remaining gas: 1039843.293 units remaining)
     [ -1
       -1
       (Pair 1
@@ -133,7 +133,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 34 (remaining gas: 1039839.958 units remaining)
+  - location: 34 (remaining gas: 1039843.258 units remaining)
     [ 0
       (Pair 1
             "foobar"
@@ -143,7 +143,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 35 (remaining gas: 1039839.948 units remaining)
+  - location: 35 (remaining gas: 1039843.248 units remaining)
     [ True
       (Pair 1
             "foobar"
@@ -153,7 +153,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039839.938 units remaining)
+  - location: 36 (remaining gas: 1039843.238 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -162,7 +162,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039839.928 units remaining)
+  - location: 36 (remaining gas: 1039843.228 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -171,7 +171,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 42 (remaining gas: 1039839.918 units remaining)
+  - location: 42 (remaining gas: 1039843.218 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -188,7 +188,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 43 (remaining gas: 1039839.908 units remaining)
+  - location: 43 (remaining gas: 1039843.208 units remaining)
     [ 1
       (Pair 1
             "foobar"
@@ -198,7 +198,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039839.898 units remaining)
+  - location: 44 (remaining gas: 1039843.198 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -207,7 +207,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 46 (remaining gas: 1039839.888 units remaining)
+  - location: 46 (remaining gas: 1039843.188 units remaining)
     [ 1
       (Pair "foobar"
             0x00aabbcc
@@ -216,7 +216,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039839.868 units remaining)
+  - location: 44 (remaining gas: 1039843.168 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -226,7 +226,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 47 (remaining gas: 1039839.641 units remaining)
+  - location: 47 (remaining gas: 1039842.941 units remaining)
     [ 0x050001
       1
       (Pair "foobar"
@@ -236,7 +236,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 48 (remaining gas: 1039839.221 units remaining)
+  - location: 48 (remaining gas: 1039842.521 units remaining)
     [ (Some 1)
       1
       (Pair "foobar"
@@ -246,7 +246,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039839.211 units remaining)
+  - location: 51 (remaining gas: 1039842.511 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -256,7 +256,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039839.201 units remaining)
+  - location: 51 (remaining gas: 1039842.501 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -266,7 +266,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 59 (remaining gas: 1039839.166 units remaining)
+  - location: 59 (remaining gas: 1039842.466 units remaining)
     [ 0
       (Pair "foobar"
             0x00aabbcc
@@ -275,7 +275,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 60 (remaining gas: 1039839.156 units remaining)
+  - location: 60 (remaining gas: 1039842.456 units remaining)
     [ True
       (Pair "foobar"
             0x00aabbcc
@@ -284,7 +284,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039839.146 units remaining)
+  - location: 61 (remaining gas: 1039842.446 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -292,7 +292,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039839.136 units remaining)
+  - location: 61 (remaining gas: 1039842.436 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -300,7 +300,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 67 (remaining gas: 1039839.126 units remaining)
+  - location: 67 (remaining gas: 1039842.426 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -315,7 +315,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 68 (remaining gas: 1039839.116 units remaining)
+  - location: 68 (remaining gas: 1039842.416 units remaining)
     [ "foobar"
       (Pair "foobar"
             0x00aabbcc
@@ -324,7 +324,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039839.106 units remaining)
+  - location: 69 (remaining gas: 1039842.406 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -332,7 +332,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 71 (remaining gas: 1039839.096 units remaining)
+  - location: 71 (remaining gas: 1039842.396 units remaining)
     [ "foobar"
       (Pair 0x00aabbcc
             1000
@@ -340,7 +340,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039839.076 units remaining)
+  - location: 69 (remaining gas: 1039842.376 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -349,7 +349,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 72 (remaining gas: 1039838.552 units remaining)
+  - location: 72 (remaining gas: 1039841.852 units remaining)
     [ 0x050100000006666f6f626172
       "foobar"
       (Pair 0x00aabbcc
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (remaining gas: 1039837.877 units remaining)
+  - location: 73 (remaining gas: 1039841.177 units remaining)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
@@ -367,7 +367,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039837.867 units remaining)
+  - location: 76 (remaining gas: 1039841.167 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -376,7 +376,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039837.857 units remaining)
+  - location: 76 (remaining gas: 1039841.157 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -385,7 +385,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 84 (remaining gas: 1039837.822 units remaining)
+  - location: 84 (remaining gas: 1039841.122 units remaining)
     [ 0
       (Pair 0x00aabbcc
             1000
@@ -393,7 +393,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 85 (remaining gas: 1039837.812 units remaining)
+  - location: 85 (remaining gas: 1039841.112 units remaining)
     [ True
       (Pair 0x00aabbcc
             1000
@@ -401,21 +401,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039837.802 units remaining)
+  - location: 86 (remaining gas: 1039841.102 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039837.792 units remaining)
+  - location: 86 (remaining gas: 1039841.092 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 92 (remaining gas: 1039837.782 units remaining)
+  - location: 92 (remaining gas: 1039841.082 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
@@ -428,7 +428,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 93 (remaining gas: 1039837.772 units remaining)
+  - location: 93 (remaining gas: 1039841.072 units remaining)
     [ 0x00aabbcc
       (Pair 0x00aabbcc
             1000
@@ -436,21 +436,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039837.762 units remaining)
+  - location: 94 (remaining gas: 1039841.062 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 96 (remaining gas: 1039837.752 units remaining)
+  - location: 96 (remaining gas: 1039841.052 units remaining)
     [ 0x00aabbcc
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039837.732 units remaining)
+  - location: 94 (remaining gas: 1039841.032 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -458,7 +458,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 97 (remaining gas: 1039837.274 units remaining)
+  - location: 97 (remaining gas: 1039840.574 units remaining)
     [ 0x050a0000000400aabbcc
       0x00aabbcc
       (Pair 1000
@@ -466,7 +466,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 98 (remaining gas: 1039836.713 units remaining)
+  - location: 98 (remaining gas: 1039840.013 units remaining)
     [ (Some 0x00aabbcc)
       0x00aabbcc
       (Pair 1000
@@ -474,7 +474,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039836.703 units remaining)
+  - location: 101 (remaining gas: 1039840.003 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -482,7 +482,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039836.693 units remaining)
+  - location: 101 (remaining gas: 1039839.993 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -490,33 +490,33 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 109 (remaining gas: 1039836.658 units remaining)
+  - location: 109 (remaining gas: 1039839.958 units remaining)
     [ 0
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 110 (remaining gas: 1039836.648 units remaining)
+  - location: 110 (remaining gas: 1039839.948 units remaining)
     [ True
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039836.638 units remaining)
+  - location: 111 (remaining gas: 1039839.938 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039836.628 units remaining)
+  - location: 111 (remaining gas: 1039839.928 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 117 (remaining gas: 1039836.618 units remaining)
+  - location: 117 (remaining gas: 1039839.918 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
@@ -527,83 +527,83 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 118 (remaining gas: 1039836.608 units remaining)
+  - location: 118 (remaining gas: 1039839.908 units remaining)
     [ 1000
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039836.598 units remaining)
+  - location: 119 (remaining gas: 1039839.898 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 121 (remaining gas: 1039836.588 units remaining)
+  - location: 121 (remaining gas: 1039839.888 units remaining)
     [ 1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039836.568 units remaining)
+  - location: 119 (remaining gas: 1039839.868 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 122 (remaining gas: 1039836.308 units remaining)
+  - location: 122 (remaining gas: 1039839.608 units remaining)
     [ 0x0500a80f
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 123 (remaining gas: 1039835.868 units remaining)
+  - location: 123 (remaining gas: 1039839.168 units remaining)
     [ (Some 1000)
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039835.858 units remaining)
+  - location: 126 (remaining gas: 1039839.158 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039835.848 units remaining)
+  - location: 126 (remaining gas: 1039839.148 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 134 (remaining gas: 1039835.813 units remaining)
+  - location: 134 (remaining gas: 1039839.113 units remaining)
     [ 0
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 135 (remaining gas: 1039835.803 units remaining)
+  - location: 135 (remaining gas: 1039839.103 units remaining)
     [ True
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039835.793 units remaining)
+  - location: 136 (remaining gas: 1039839.093 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039835.783 units remaining)
+  - location: 136 (remaining gas: 1039839.083 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 142 (remaining gas: 1039835.773 units remaining)
+  - location: 142 (remaining gas: 1039839.073 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
@@ -612,234 +612,234 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 143 (remaining gas: 1039835.763 units remaining)
+  - location: 143 (remaining gas: 1039839.063 units remaining)
     [ False
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039835.753 units remaining)
+  - location: 144 (remaining gas: 1039839.053 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 146 (remaining gas: 1039835.743 units remaining)
+  - location: 146 (remaining gas: 1039839.043 units remaining)
     [ False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039835.723 units remaining)
+  - location: 144 (remaining gas: 1039839.023 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 147 (remaining gas: 1039835.496 units remaining)
+  - location: 147 (remaining gas: 1039838.796 units remaining)
     [ 0x050303
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 148 (remaining gas: 1039835.076 units remaining)
+  - location: 148 (remaining gas: 1039838.376 units remaining)
     [ (Some False)
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039835.066 units remaining)
+  - location: 151 (remaining gas: 1039838.366 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039835.056 units remaining)
+  - location: 151 (remaining gas: 1039838.356 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 159 (remaining gas: 1039835.021 units remaining)
+  - location: 159 (remaining gas: 1039838.321 units remaining)
     [ 0
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 160 (remaining gas: 1039835.011 units remaining)
+  - location: 160 (remaining gas: 1039838.311 units remaining)
     [ True
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039835.001 units remaining)
+  - location: 161 (remaining gas: 1039838.301 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039834.991 units remaining)
+  - location: 161 (remaining gas: 1039838.291 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 167 (remaining gas: 1039834.981 units remaining)
+  - location: 167 (remaining gas: 1039838.281 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 168 (remaining gas: 1039834.971 units remaining)
+  - location: 168 (remaining gas: 1039838.271 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039834.961 units remaining)
+  - location: 169 (remaining gas: 1039838.261 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 171 (remaining gas: 1039834.951 units remaining)
+  - location: 171 (remaining gas: 1039838.251 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039834.931 units remaining)
+  - location: 169 (remaining gas: 1039838.231 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 172 (remaining gas: 1039833.841 units remaining)
+  - location: 172 (remaining gas: 1039837.141 units remaining)
     [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 173 (remaining gas: 1039832.888 units remaining)
+  - location: 173 (remaining gas: 1039836.188 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039832.878 units remaining)
+  - location: 176 (remaining gas: 1039836.178 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039832.868 units remaining)
+  - location: 176 (remaining gas: 1039836.168 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 184 (remaining gas: 1039832.832 units remaining)
+  - location: 184 (remaining gas: 1039836.132 units remaining)
     [ 0
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 185 (remaining gas: 1039832.822 units remaining)
+  - location: 185 (remaining gas: 1039836.122 units remaining)
     [ True
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039832.812 units remaining)
+  - location: 186 (remaining gas: 1039836.112 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039832.802 units remaining)
+  - location: 186 (remaining gas: 1039836.102 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 192 (remaining gas: 1039832.792 units remaining)
+  - location: 192 (remaining gas: 1039836.092 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 193 (remaining gas: 1039832.782 units remaining)
+  - location: 193 (remaining gas: 1039836.082 units remaining)
     [ "2019-09-09T08:35:33Z"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 194 (remaining gas: 1039832.772 units remaining)
+  - location: 194 (remaining gas: 1039836.072 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 196 (remaining gas: 1039832.762 units remaining)
+  - location: 196 (remaining gas: 1039836.062 units remaining)
     [ "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 194 (remaining gas: 1039832.742 units remaining)
+  - location: 194 (remaining gas: 1039836.042 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 197 (remaining gas: 1039832.383 units remaining)
+  - location: 197 (remaining gas: 1039835.683 units remaining)
     [ 0x050095bbb0d70b
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 198 (remaining gas: 1039831.883 units remaining)
+  - location: 198 (remaining gas: 1039835.183 units remaining)
     [ (Some "2019-09-09T08:35:33Z")
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039831.873 units remaining)
+  - location: 201 (remaining gas: 1039835.173 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039831.863 units remaining)
+  - location: 201 (remaining gas: 1039835.163 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 209 (remaining gas: 1039831.828 units remaining)
+  - location: 209 (remaining gas: 1039835.128 units remaining)
     [ 0
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 210 (remaining gas: 1039831.818 units remaining)
+  - location: 210 (remaining gas: 1039835.118 units remaining)
     [ True
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039831.808 units remaining)
+  - location: 211 (remaining gas: 1039835.108 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039831.798 units remaining)
+  - location: 211 (remaining gas: 1039835.098 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 217 (remaining gas: 1039831.788 units remaining)
+  - location: 217 (remaining gas: 1039835.088 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 218 (remaining gas: 1039830.665 units remaining)
+  - location: 218 (remaining gas: 1039833.965 units remaining)
     [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 219 (remaining gas: 1039829.692 units remaining)
+  - location: 219 (remaining gas: 1039832.992 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039829.682 units remaining)
+  - location: 222 (remaining gas: 1039832.982 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039829.672 units remaining)
+  - location: 222 (remaining gas: 1039832.972 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 230 (remaining gas: 1039829.636 units remaining)
+  - location: 230 (remaining gas: 1039832.936 units remaining)
     [ 0 ]
-  - location: 231 (remaining gas: 1039829.626 units remaining)
+  - location: 231 (remaining gas: 1039832.926 units remaining)
     [ True ]
-  - location: 232 (remaining gas: 1039829.616 units remaining)
+  - location: 232 (remaining gas: 1039832.916 units remaining)
     [  ]
-  - location: 232 (remaining gas: 1039829.606 units remaining)
+  - location: 232 (remaining gas: 1039832.906 units remaining)
     [  ]
-  - location: 238 (remaining gas: 1039829.596 units remaining)
+  - location: 238 (remaining gas: 1039832.896 units remaining)
     [ 0 ]
-  - location: 241 (remaining gas: 1039829.369 units remaining)
+  - location: 241 (remaining gas: 1039832.669 units remaining)
     [ 0x050000 ]
-  - location: 242 (remaining gas: 1039828.949 units remaining)
+  - location: 242 (remaining gas: 1039832.249 units remaining)
     [ (Some 0) ]
-  - location: 245 (remaining gas: 1039828.939 units remaining)
+  - location: 245 (remaining gas: 1039832.239 units remaining)
     [ 0 ]
-  - location: 245 (remaining gas: 1039828.929 units remaining)
+  - location: 245 (remaining gas: 1039832.229 units remaining)
     [ 0 ]
-  - location: 251 (remaining gas: 1039828.919 units remaining)
+  - location: 251 (remaining gas: 1039832.219 units remaining)
     [  ]
-  - location: 252 (remaining gas: 1039828.909 units remaining)
+  - location: 252 (remaining gas: 1039832.209 units remaining)
     [ -1 ]
-  - location: 255 (remaining gas: 1039828.682 units remaining)
+  - location: 255 (remaining gas: 1039831.982 units remaining)
     [ 0x050041 ]
-  - location: 256 (remaining gas: 1039732.362 units remaining)
+  - location: 256 (remaining gas: 1039735.662 units remaining)
     [ None ]
-  - location: 259 (remaining gas: 1039732.352 units remaining)
+  - location: 259 (remaining gas: 1039735.652 units remaining)
     [  ]
-  - location: 259 (remaining gas: 1039732.342 units remaining)
+  - location: 259 (remaining gas: 1039735.642 units remaining)
     [  ]
-  - location: 265 (remaining gas: 1039732.332 units remaining)
+  - location: 265 (remaining gas: 1039735.632 units remaining)
     [ 0x ]
-  - location: 268 (remaining gas: 1039732.072 units remaining)
+  - location: 268 (remaining gas: 1039735.372 units remaining)
     [ None ]
-  - location: 271 (remaining gas: 1039732.062 units remaining)
+  - location: 271 (remaining gas: 1039735.362 units remaining)
     [  ]
-  - location: 271 (remaining gas: 1039732.052 units remaining)
+  - location: 271 (remaining gas: 1039735.352 units remaining)
     [  ]
-  - location: 277 (remaining gas: 1039732.042 units remaining)
+  - location: 277 (remaining gas: 1039735.342 units remaining)
     [ 0x04 ]
-  - location: 280 (remaining gas: 1039731.762 units remaining)
+  - location: 280 (remaining gas: 1039735.062 units remaining)
     [ None ]
-  - location: 283 (remaining gas: 1039731.752 units remaining)
+  - location: 283 (remaining gas: 1039735.052 units remaining)
     [  ]
-  - location: 283 (remaining gas: 1039731.742 units remaining)
+  - location: 283 (remaining gas: 1039735.042 units remaining)
     [  ]
-  - location: 289 (remaining gas: 1039731.732 units remaining)
+  - location: 289 (remaining gas: 1039735.032 units remaining)
     [ 0x05 ]
-  - location: 292 (remaining gas: 1039731.452 units remaining)
+  - location: 292 (remaining gas: 1039734.752 units remaining)
     [ None ]
-  - location: 295 (remaining gas: 1039731.442 units remaining)
+  - location: 295 (remaining gas: 1039734.742 units remaining)
     [  ]
-  - location: 295 (remaining gas: 1039731.432 units remaining)
+  - location: 295 (remaining gas: 1039734.732 units remaining)
     [  ]
-  - location: 301 (remaining gas: 1039731.422 units remaining)
+  - location: 301 (remaining gas: 1039734.722 units remaining)
     [ Unit ]
-  - location: 302 (remaining gas: 1039731.412 units remaining)
+  - location: 302 (remaining gas: 1039734.712 units remaining)
     [ {}
       Unit ]
-  - location: 304 (remaining gas: 1039731.402 units remaining)
+  - location: 304 (remaining gas: 1039734.702 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out"
index a5ad8debb9ac341f7499bd85d701560662e9416c..0472548952c7c65415cfbf099b27d42dc71ab19b 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039840.730 units remaining)
+  - location: 16 (remaining gas: 1039844.030 units remaining)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -18,7 +18,7 @@ trace
                   "2019-09-09T08:35:33Z"
                   "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             Unit) ]
-  - location: 16 (remaining gas: 1039840.720 units remaining)
+  - location: 16 (remaining gas: 1039844.020 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -28,7 +28,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 17 (remaining gas: 1039840.710 units remaining)
+  - location: 17 (remaining gas: 1039844.010 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -47,7 +47,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 18 (remaining gas: 1039840.700 units remaining)
+  - location: 18 (remaining gas: 1039844 units remaining)
     [ -1
       (Pair -1
             1
@@ -58,7 +58,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039840.690 units remaining)
+  - location: 19 (remaining gas: 1039843.990 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -68,7 +68,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 21 (remaining gas: 1039840.680 units remaining)
+  - location: 21 (remaining gas: 1039843.980 units remaining)
     [ -1
       (Pair 1
             "foobar"
@@ -78,7 +78,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039840.660 units remaining)
+  - location: 19 (remaining gas: 1039843.960 units remaining)
     [ -1
       -1
       (Pair 1
@@ -89,7 +89,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 22 (remaining gas: 1039840.433 units remaining)
+  - location: 22 (remaining gas: 1039843.733 units remaining)
     [ 0x050041
       -1
       (Pair 1
@@ -100,7 +100,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 23 (remaining gas: 1039840.013 units remaining)
+  - location: 23 (remaining gas: 1039843.313 units remaining)
     [ (Some -1)
       -1
       (Pair 1
@@ -111,7 +111,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039840.003 units remaining)
+  - location: 26 (remaining gas: 1039843.303 units remaining)
     [ -1
       -1
       (Pair 1
@@ -122,7 +122,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039839.993 units remaining)
+  - location: 26 (remaining gas: 1039843.293 units remaining)
     [ -1
       -1
       (Pair 1
@@ -133,7 +133,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 34 (remaining gas: 1039839.958 units remaining)
+  - location: 34 (remaining gas: 1039843.258 units remaining)
     [ 0
       (Pair 1
             "foobar"
@@ -143,7 +143,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 35 (remaining gas: 1039839.948 units remaining)
+  - location: 35 (remaining gas: 1039843.248 units remaining)
     [ True
       (Pair 1
             "foobar"
@@ -153,7 +153,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039839.938 units remaining)
+  - location: 36 (remaining gas: 1039843.238 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -162,7 +162,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039839.928 units remaining)
+  - location: 36 (remaining gas: 1039843.228 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -171,7 +171,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 42 (remaining gas: 1039839.918 units remaining)
+  - location: 42 (remaining gas: 1039843.218 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -188,7 +188,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 43 (remaining gas: 1039839.908 units remaining)
+  - location: 43 (remaining gas: 1039843.208 units remaining)
     [ 1
       (Pair 1
             "foobar"
@@ -198,7 +198,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039839.898 units remaining)
+  - location: 44 (remaining gas: 1039843.198 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -207,7 +207,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 46 (remaining gas: 1039839.888 units remaining)
+  - location: 46 (remaining gas: 1039843.188 units remaining)
     [ 1
       (Pair "foobar"
             0x00aabbcc
@@ -216,7 +216,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039839.868 units remaining)
+  - location: 44 (remaining gas: 1039843.168 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -226,7 +226,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 47 (remaining gas: 1039839.641 units remaining)
+  - location: 47 (remaining gas: 1039842.941 units remaining)
     [ 0x050001
       1
       (Pair "foobar"
@@ -236,7 +236,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 48 (remaining gas: 1039839.221 units remaining)
+  - location: 48 (remaining gas: 1039842.521 units remaining)
     [ (Some 1)
       1
       (Pair "foobar"
@@ -246,7 +246,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039839.211 units remaining)
+  - location: 51 (remaining gas: 1039842.511 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -256,7 +256,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039839.201 units remaining)
+  - location: 51 (remaining gas: 1039842.501 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -266,7 +266,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 59 (remaining gas: 1039839.166 units remaining)
+  - location: 59 (remaining gas: 1039842.466 units remaining)
     [ 0
       (Pair "foobar"
             0x00aabbcc
@@ -275,7 +275,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 60 (remaining gas: 1039839.156 units remaining)
+  - location: 60 (remaining gas: 1039842.456 units remaining)
     [ True
       (Pair "foobar"
             0x00aabbcc
@@ -284,7 +284,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039839.146 units remaining)
+  - location: 61 (remaining gas: 1039842.446 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -292,7 +292,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039839.136 units remaining)
+  - location: 61 (remaining gas: 1039842.436 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -300,7 +300,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 67 (remaining gas: 1039839.126 units remaining)
+  - location: 67 (remaining gas: 1039842.426 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -315,7 +315,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 68 (remaining gas: 1039839.116 units remaining)
+  - location: 68 (remaining gas: 1039842.416 units remaining)
     [ "foobar"
       (Pair "foobar"
             0x00aabbcc
@@ -324,7 +324,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039839.106 units remaining)
+  - location: 69 (remaining gas: 1039842.406 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -332,7 +332,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 71 (remaining gas: 1039839.096 units remaining)
+  - location: 71 (remaining gas: 1039842.396 units remaining)
     [ "foobar"
       (Pair 0x00aabbcc
             1000
@@ -340,7 +340,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039839.076 units remaining)
+  - location: 69 (remaining gas: 1039842.376 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -349,7 +349,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 72 (remaining gas: 1039838.552 units remaining)
+  - location: 72 (remaining gas: 1039841.852 units remaining)
     [ 0x050100000006666f6f626172
       "foobar"
       (Pair 0x00aabbcc
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (remaining gas: 1039837.877 units remaining)
+  - location: 73 (remaining gas: 1039841.177 units remaining)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
@@ -367,7 +367,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039837.867 units remaining)
+  - location: 76 (remaining gas: 1039841.167 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -376,7 +376,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039837.857 units remaining)
+  - location: 76 (remaining gas: 1039841.157 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -385,7 +385,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 84 (remaining gas: 1039837.822 units remaining)
+  - location: 84 (remaining gas: 1039841.122 units remaining)
     [ 0
       (Pair 0x00aabbcc
             1000
@@ -393,7 +393,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 85 (remaining gas: 1039837.812 units remaining)
+  - location: 85 (remaining gas: 1039841.112 units remaining)
     [ True
       (Pair 0x00aabbcc
             1000
@@ -401,21 +401,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039837.802 units remaining)
+  - location: 86 (remaining gas: 1039841.102 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039837.792 units remaining)
+  - location: 86 (remaining gas: 1039841.092 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 92 (remaining gas: 1039837.782 units remaining)
+  - location: 92 (remaining gas: 1039841.082 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
@@ -428,7 +428,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 93 (remaining gas: 1039837.772 units remaining)
+  - location: 93 (remaining gas: 1039841.072 units remaining)
     [ 0x00aabbcc
       (Pair 0x00aabbcc
             1000
@@ -436,21 +436,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039837.762 units remaining)
+  - location: 94 (remaining gas: 1039841.062 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 96 (remaining gas: 1039837.752 units remaining)
+  - location: 96 (remaining gas: 1039841.052 units remaining)
     [ 0x00aabbcc
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039837.732 units remaining)
+  - location: 94 (remaining gas: 1039841.032 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -458,7 +458,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 97 (remaining gas: 1039837.274 units remaining)
+  - location: 97 (remaining gas: 1039840.574 units remaining)
     [ 0x050a0000000400aabbcc
       0x00aabbcc
       (Pair 1000
@@ -466,7 +466,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 98 (remaining gas: 1039836.713 units remaining)
+  - location: 98 (remaining gas: 1039840.013 units remaining)
     [ (Some 0x00aabbcc)
       0x00aabbcc
       (Pair 1000
@@ -474,7 +474,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039836.703 units remaining)
+  - location: 101 (remaining gas: 1039840.003 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -482,7 +482,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039836.693 units remaining)
+  - location: 101 (remaining gas: 1039839.993 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -490,33 +490,33 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 109 (remaining gas: 1039836.658 units remaining)
+  - location: 109 (remaining gas: 1039839.958 units remaining)
     [ 0
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 110 (remaining gas: 1039836.648 units remaining)
+  - location: 110 (remaining gas: 1039839.948 units remaining)
     [ True
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039836.638 units remaining)
+  - location: 111 (remaining gas: 1039839.938 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039836.628 units remaining)
+  - location: 111 (remaining gas: 1039839.928 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 117 (remaining gas: 1039836.618 units remaining)
+  - location: 117 (remaining gas: 1039839.918 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
@@ -527,83 +527,83 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 118 (remaining gas: 1039836.608 units remaining)
+  - location: 118 (remaining gas: 1039839.908 units remaining)
     [ 1000
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039836.598 units remaining)
+  - location: 119 (remaining gas: 1039839.898 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 121 (remaining gas: 1039836.588 units remaining)
+  - location: 121 (remaining gas: 1039839.888 units remaining)
     [ 1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039836.568 units remaining)
+  - location: 119 (remaining gas: 1039839.868 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 122 (remaining gas: 1039836.308 units remaining)
+  - location: 122 (remaining gas: 1039839.608 units remaining)
     [ 0x0500a80f
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 123 (remaining gas: 1039835.868 units remaining)
+  - location: 123 (remaining gas: 1039839.168 units remaining)
     [ (Some 1000)
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039835.858 units remaining)
+  - location: 126 (remaining gas: 1039839.158 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039835.848 units remaining)
+  - location: 126 (remaining gas: 1039839.148 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 134 (remaining gas: 1039835.813 units remaining)
+  - location: 134 (remaining gas: 1039839.113 units remaining)
     [ 0
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 135 (remaining gas: 1039835.803 units remaining)
+  - location: 135 (remaining gas: 1039839.103 units remaining)
     [ True
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039835.793 units remaining)
+  - location: 136 (remaining gas: 1039839.093 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039835.783 units remaining)
+  - location: 136 (remaining gas: 1039839.083 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 142 (remaining gas: 1039835.773 units remaining)
+  - location: 142 (remaining gas: 1039839.073 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
@@ -612,234 +612,234 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 143 (remaining gas: 1039835.763 units remaining)
+  - location: 143 (remaining gas: 1039839.063 units remaining)
     [ False
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039835.753 units remaining)
+  - location: 144 (remaining gas: 1039839.053 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 146 (remaining gas: 1039835.743 units remaining)
+  - location: 146 (remaining gas: 1039839.043 units remaining)
     [ False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039835.723 units remaining)
+  - location: 144 (remaining gas: 1039839.023 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 147 (remaining gas: 1039835.496 units remaining)
+  - location: 147 (remaining gas: 1039838.796 units remaining)
     [ 0x050303
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 148 (remaining gas: 1039835.076 units remaining)
+  - location: 148 (remaining gas: 1039838.376 units remaining)
     [ (Some False)
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039835.066 units remaining)
+  - location: 151 (remaining gas: 1039838.366 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039835.056 units remaining)
+  - location: 151 (remaining gas: 1039838.356 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 159 (remaining gas: 1039835.021 units remaining)
+  - location: 159 (remaining gas: 1039838.321 units remaining)
     [ 0
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 160 (remaining gas: 1039835.011 units remaining)
+  - location: 160 (remaining gas: 1039838.311 units remaining)
     [ True
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039835.001 units remaining)
+  - location: 161 (remaining gas: 1039838.301 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039834.991 units remaining)
+  - location: 161 (remaining gas: 1039838.291 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 167 (remaining gas: 1039834.981 units remaining)
+  - location: 167 (remaining gas: 1039838.281 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 168 (remaining gas: 1039834.971 units remaining)
+  - location: 168 (remaining gas: 1039838.271 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039834.961 units remaining)
+  - location: 169 (remaining gas: 1039838.261 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 171 (remaining gas: 1039834.951 units remaining)
+  - location: 171 (remaining gas: 1039838.251 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039834.931 units remaining)
+  - location: 169 (remaining gas: 1039838.231 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 172 (remaining gas: 1039833.841 units remaining)
+  - location: 172 (remaining gas: 1039837.141 units remaining)
     [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 173 (remaining gas: 1039832.888 units remaining)
+  - location: 173 (remaining gas: 1039836.188 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039832.878 units remaining)
+  - location: 176 (remaining gas: 1039836.178 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039832.868 units remaining)
+  - location: 176 (remaining gas: 1039836.168 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 184 (remaining gas: 1039832.832 units remaining)
+  - location: 184 (remaining gas: 1039836.132 units remaining)
     [ 0
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 185 (remaining gas: 1039832.822 units remaining)
+  - location: 185 (remaining gas: 1039836.122 units remaining)
     [ True
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039832.812 units remaining)
+  - location: 186 (remaining gas: 1039836.112 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039832.802 units remaining)
+  - location: 186 (remaining gas: 1039836.102 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 192 (remaining gas: 1039832.792 units remaining)
+  - location: 192 (remaining gas: 1039836.092 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 193 (remaining gas: 1039832.782 units remaining)
+  - location: 193 (remaining gas: 1039836.082 units remaining)
     [ "2019-09-09T08:35:33Z"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 194 (remaining gas: 1039832.772 units remaining)
+  - location: 194 (remaining gas: 1039836.072 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 196 (remaining gas: 1039832.762 units remaining)
+  - location: 196 (remaining gas: 1039836.062 units remaining)
     [ "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 194 (remaining gas: 1039832.742 units remaining)
+  - location: 194 (remaining gas: 1039836.042 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 197 (remaining gas: 1039832.383 units remaining)
+  - location: 197 (remaining gas: 1039835.683 units remaining)
     [ 0x050095bbb0d70b
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 198 (remaining gas: 1039831.883 units remaining)
+  - location: 198 (remaining gas: 1039835.183 units remaining)
     [ (Some "2019-09-09T08:35:33Z")
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039831.873 units remaining)
+  - location: 201 (remaining gas: 1039835.173 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039831.863 units remaining)
+  - location: 201 (remaining gas: 1039835.163 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 209 (remaining gas: 1039831.828 units remaining)
+  - location: 209 (remaining gas: 1039835.128 units remaining)
     [ 0
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 210 (remaining gas: 1039831.818 units remaining)
+  - location: 210 (remaining gas: 1039835.118 units remaining)
     [ True
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039831.808 units remaining)
+  - location: 211 (remaining gas: 1039835.108 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039831.798 units remaining)
+  - location: 211 (remaining gas: 1039835.098 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 217 (remaining gas: 1039831.788 units remaining)
+  - location: 217 (remaining gas: 1039835.088 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 218 (remaining gas: 1039830.665 units remaining)
+  - location: 218 (remaining gas: 1039833.965 units remaining)
     [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 219 (remaining gas: 1039829.692 units remaining)
+  - location: 219 (remaining gas: 1039832.992 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039829.682 units remaining)
+  - location: 222 (remaining gas: 1039832.982 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039829.672 units remaining)
+  - location: 222 (remaining gas: 1039832.972 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 230 (remaining gas: 1039829.636 units remaining)
+  - location: 230 (remaining gas: 1039832.936 units remaining)
     [ 0 ]
-  - location: 231 (remaining gas: 1039829.626 units remaining)
+  - location: 231 (remaining gas: 1039832.926 units remaining)
     [ True ]
-  - location: 232 (remaining gas: 1039829.616 units remaining)
+  - location: 232 (remaining gas: 1039832.916 units remaining)
     [  ]
-  - location: 232 (remaining gas: 1039829.606 units remaining)
+  - location: 232 (remaining gas: 1039832.906 units remaining)
     [  ]
-  - location: 238 (remaining gas: 1039829.596 units remaining)
+  - location: 238 (remaining gas: 1039832.896 units remaining)
     [ 0 ]
-  - location: 241 (remaining gas: 1039829.369 units remaining)
+  - location: 241 (remaining gas: 1039832.669 units remaining)
     [ 0x050000 ]
-  - location: 242 (remaining gas: 1039828.949 units remaining)
+  - location: 242 (remaining gas: 1039832.249 units remaining)
     [ (Some 0) ]
-  - location: 245 (remaining gas: 1039828.939 units remaining)
+  - location: 245 (remaining gas: 1039832.239 units remaining)
     [ 0 ]
-  - location: 245 (remaining gas: 1039828.929 units remaining)
+  - location: 245 (remaining gas: 1039832.229 units remaining)
     [ 0 ]
-  - location: 251 (remaining gas: 1039828.919 units remaining)
+  - location: 251 (remaining gas: 1039832.219 units remaining)
     [  ]
-  - location: 252 (remaining gas: 1039828.909 units remaining)
+  - location: 252 (remaining gas: 1039832.209 units remaining)
     [ -1 ]
-  - location: 255 (remaining gas: 1039828.682 units remaining)
+  - location: 255 (remaining gas: 1039831.982 units remaining)
     [ 0x050041 ]
-  - location: 256 (remaining gas: 1039732.362 units remaining)
+  - location: 256 (remaining gas: 1039735.662 units remaining)
     [ None ]
-  - location: 259 (remaining gas: 1039732.352 units remaining)
+  - location: 259 (remaining gas: 1039735.652 units remaining)
     [  ]
-  - location: 259 (remaining gas: 1039732.342 units remaining)
+  - location: 259 (remaining gas: 1039735.642 units remaining)
     [  ]
-  - location: 265 (remaining gas: 1039732.332 units remaining)
+  - location: 265 (remaining gas: 1039735.632 units remaining)
     [ 0x ]
-  - location: 268 (remaining gas: 1039732.072 units remaining)
+  - location: 268 (remaining gas: 1039735.372 units remaining)
     [ None ]
-  - location: 271 (remaining gas: 1039732.062 units remaining)
+  - location: 271 (remaining gas: 1039735.362 units remaining)
     [  ]
-  - location: 271 (remaining gas: 1039732.052 units remaining)
+  - location: 271 (remaining gas: 1039735.352 units remaining)
     [  ]
-  - location: 277 (remaining gas: 1039732.042 units remaining)
+  - location: 277 (remaining gas: 1039735.342 units remaining)
     [ 0x04 ]
-  - location: 280 (remaining gas: 1039731.762 units remaining)
+  - location: 280 (remaining gas: 1039735.062 units remaining)
     [ None ]
-  - location: 283 (remaining gas: 1039731.752 units remaining)
+  - location: 283 (remaining gas: 1039735.052 units remaining)
     [  ]
-  - location: 283 (remaining gas: 1039731.742 units remaining)
+  - location: 283 (remaining gas: 1039735.042 units remaining)
     [  ]
-  - location: 289 (remaining gas: 1039731.732 units remaining)
+  - location: 289 (remaining gas: 1039735.032 units remaining)
     [ 0x05 ]
-  - location: 292 (remaining gas: 1039731.452 units remaining)
+  - location: 292 (remaining gas: 1039734.752 units remaining)
     [ None ]
-  - location: 295 (remaining gas: 1039731.442 units remaining)
+  - location: 295 (remaining gas: 1039734.742 units remaining)
     [  ]
-  - location: 295 (remaining gas: 1039731.432 units remaining)
+  - location: 295 (remaining gas: 1039734.732 units remaining)
     [  ]
-  - location: 301 (remaining gas: 1039731.422 units remaining)
+  - location: 301 (remaining gas: 1039734.722 units remaining)
     [ Unit ]
-  - location: 302 (remaining gas: 1039731.412 units remaining)
+  - location: 302 (remaining gas: 1039734.712 units remaining)
     [ {}
       Unit ]
-  - location: 304 (remaining gas: 1039731.402 units remaining)
+  - location: 304 (remaining gas: 1039734.702 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out
index 259e92d611a8a9bd4f83019a87e3c2a22f0dcdc0..5c9566781f8303449566483b833dc33fdb637f67 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_add_liquidity
 
 Node is bootstrapped.
-Estimated gas: 8525.181 units (will add 100 for safety)
+Estimated gas: 8521.881 units (will add 100 for safety)
 Estimated storage: 141 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.001218
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 8626
+    Gas limit: 8622
     Storage limit: 161 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.001218
@@ -34,7 +34,7 @@ This sequence of operations was run:
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
       Paid storage size diff: 3 bytes
-      Consumed gas: 3786.199
+      Consumed gas: 3782.899
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00075
         storage fees ........................... +ꜩ0.00075
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out
index e71a2041bf7f8a44e36353e422d34a50742aeee5..0deab38e572d90308ecdfcfb5834f894ed46558f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approval
 
 Node is bootstrapped.
-Estimated gas: 1683.146 units (will add 100 for safety)
+Estimated gas: 1679.846 units (will add 100 for safety)
 Estimated storage: 68 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000486
+    Fee to the baker: ꜩ0.000485
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1784
+    Gas limit: 1780
     Storage limit: 88 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000486
-      payload fees(the block proposer) ....... +ꜩ0.000486
+      [CONTRACT_HASH] ... -ꜩ0.000485
+      payload fees(the block proposer) ....... +ꜩ0.000485
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] to 1000
       Storage size: 2116 bytes
       Paid storage size diff: 68 bytes
-      Consumed gas: 1683.146
+      Consumed gas: 1679.846
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.017
         storage fees ........................... +ꜩ0.017
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out
index 5a3a7887bba1fc227c763813bd1f666d93b7e083..c5fac1f50e3eced90f0c8d4bc0e2f860e0260bdd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approved_transfer
 
 Node is bootstrapped.
-Estimated gas: 3050.833 units (will add 100 for safety)
+Estimated gas: 3044.233 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000673
+    Fee to the baker: ꜩ0.000672
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3151
+    Gas limit: 3145
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000673
-      payload fees(the block proposer) ....... +ꜩ0.000673
+      [CONTRACT_HASH] ... -ꜩ0.000672
+      payload fees(the block proposer) ....... +ꜩ0.000672
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -36,6 +36,6 @@ This sequence of operations was run:
         Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 71007
         Set map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 1000
       Storage size: 2116 bytes
-      Consumed gas: 3050.833
+      Consumed gas: 3044.233
 
 Injected block at minimal timestamp
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out
index 953e360baef1d75783ac980652b26bebf51e1255..9f577271a8f9f860b0cd5dc1dc0d5ce2245e2126 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve1
 
 Node is bootstrapped.
-Estimated gas: 1683.222 units (will add 100 for safety)
+Estimated gas: 1679.922 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000489
+    Fee to the baker: ꜩ0.000488
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1784
+    Gas limit: 1780
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000489
-      payload fees(the block proposer) ....... +ꜩ0.000489
+      [CONTRACT_HASH] ... -ꜩ0.000488
+      payload fees(the block proposer) ....... +ꜩ0.000488
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2053 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 1683.222
+      Consumed gas: 1679.922
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out
index 8d00499bded6e5f21cc1bdff0ddaafb059d8f56a..2016cdb210e5b5ac6ce0f66a04c4c0ddf69efb6e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve2
 
 Node is bootstrapped.
-Estimated gas: 1683.222 units (will add 100 for safety)
+Estimated gas: 1679.922 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000489
+    Fee to the baker: ꜩ0.000488
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1784
+    Gas limit: 1780
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000489
-      payload fees(the block proposer) ....... +ꜩ0.000489
+      [CONTRACT_HASH] ... -ꜩ0.000488
+      payload fees(the block proposer) ....... +ꜩ0.000488
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2124 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 1683.222
+      Consumed gas: 1679.922
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out
index 8444907b6ed1aea02477f06f5657e2628add8d92..a32a6e3bca72d8dc740cbbc96ed83c23f59fdcd0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve3
 
 Node is bootstrapped.
-Estimated gas: 1683.222 units (will add 100 for safety)
+Estimated gas: 1679.922 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000489
+    Fee to the baker: ꜩ0.000488
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1784
+    Gas limit: 1780
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000489
-      payload fees(the block proposer) ....... +ꜩ0.000489
+      [CONTRACT_HASH] ... -ꜩ0.000488
+      payload fees(the block proposer) ....... +ꜩ0.000488
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2195 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 1683.222
+      Consumed gas: 1679.922
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
index 8d753cc3de7dfcbc2923a3b9844334166904c386..1618fceb05990992a55be1fae99c3ee22b1abd90 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_mint_or_burn
 
 Node is bootstrapped.
-Estimated gas: 3186.850 units (will add 100 for safety)
+Estimated gas: 3183.550 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000641
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3287
+    Gas limit: 3284
     Storage limit: 91 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000641
@@ -32,7 +32,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 3187.534
+      Consumed gas: 3184.234
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out
index 8a533d9b9dfa9518281c434c610142b16c6f1683..4f2ebeecda6c07fce57d9bf938fdf85244874302 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_remove_liquidity
 
 Node is bootstrapped.
-Estimated gas: 7522.902 units (will add 100 for safety)
+Estimated gas: 7519.602 units (will add 100 for safety)
 Estimated storage: 67 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.001115
+    Fee to the baker: ꜩ0.001114
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 7623
+    Gas limit: 7620
     Storage limit: 87 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.001115
-      payload fees(the block proposer) ....... +ꜩ0.001115
+      [CONTRACT_HASH] ... -ꜩ0.001114
+      payload fees(the block proposer) ....... +ꜩ0.001114
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
           0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ;
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
-      Consumed gas: 2281.561
+      Consumed gas: 2278.261
     Internal operations:
       Transaction:
         Amount: ꜩ0
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out
index 69e55adfd9a796edbeb1e0733403cba5b6073040..153ae6130672fc7075f4536d72d375ea30726f48 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_add_liquidity
 
 Node is bootstrapped.
-Estimated gas: 8525.181 units (will add 100 for safety)
+Estimated gas: 8521.881 units (will add 100 for safety)
 Estimated storage: 141 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.001218
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 8626
+    Gas limit: 8622
     Storage limit: 161 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.001218
@@ -34,7 +34,7 @@ This sequence of operations was run:
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
       Paid storage size diff: 3 bytes
-      Consumed gas: 3786.199
+      Consumed gas: 3782.899
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00075
         storage fees ........................... +ꜩ0.00075
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out
index 1989244985c0f2d1711e6ec7966ba3447e710be5..e8f5389bf347bce2a43201ab5d4ebbbc92e5a78d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_buy_tok
 
 Node is bootstrapped.
-Estimated gas: 5118.103 units (will add 100 for safety)
+Estimated gas: 5114.803 units (will add 100 for safety)
 Estimated storage: 326 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000869
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 5219
+    Gas limit: 5215
     Storage limit: 346 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000869
@@ -34,7 +34,7 @@ This sequence of operations was run:
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4634 bytes
       Paid storage size diff: 1 bytes
-      Consumed gas: 1750.125
+      Consumed gas: 1746.825
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00025
         storage fees ........................... +ꜩ0.00025
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out
index 82625aed70d1687c119e833c34f1664308bbce75..46fe9c6db93e433ca92a2b3218aae0b88ffe9a8a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve1
 
 Node is bootstrapped.
-Estimated gas: 1683.222 units (will add 100 for safety)
+Estimated gas: 1679.922 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000489
+    Fee to the baker: ꜩ0.000488
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1784
+    Gas limit: 1780
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000489
-      payload fees(the block proposer) ....... +ꜩ0.000489
+      [CONTRACT_HASH] ... -ꜩ0.000488
+      payload fees(the block proposer) ....... +ꜩ0.000488
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2053 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 1683.222
+      Consumed gas: 1679.922
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out
index 4f9f0399a960c1dc7d9289edb1a3711268e85f0b..943b0b0839473183f4c690c83df1e53b2e425d94 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve2
 
 Node is bootstrapped.
-Estimated gas: 1683.222 units (will add 100 for safety)
+Estimated gas: 1679.922 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000489
+    Fee to the baker: ꜩ0.000488
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1784
+    Gas limit: 1780
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000489
-      payload fees(the block proposer) ....... +ꜩ0.000489
+      [CONTRACT_HASH] ... -ꜩ0.000488
+      payload fees(the block proposer) ....... +ꜩ0.000488
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2124 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 1683.222
+      Consumed gas: 1679.922
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out
index 88196ec7f548117d21ac0c92151d91e522dadc67..83cfd78478539ba731b5f93cbd175394a5b6e563 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve3
 
 Node is bootstrapped.
-Estimated gas: 1683.222 units (will add 100 for safety)
+Estimated gas: 1679.922 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000489
+    Fee to the baker: ꜩ0.000488
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1784
+    Gas limit: 1780
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000489
-      payload fees(the block proposer) ....... +ꜩ0.000489
+      [CONTRACT_HASH] ... -ꜩ0.000488
+      payload fees(the block proposer) ....... +ꜩ0.000488
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2195 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 1683.222
+      Consumed gas: 1679.922
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
index 5414d2299d6587f565c866cfecc5211b9e30fe42..07c0380757c657fba31e0e30156bc505c2ccbc23 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_mint_or_burn
 
 Node is bootstrapped.
-Estimated gas: 3186.850 units (will add 100 for safety)
+Estimated gas: 3183.550 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000641
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3287
+    Gas limit: 3284
     Storage limit: 91 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000641
@@ -32,7 +32,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 3187.534
+      Consumed gas: 3184.234
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out
index 5e885f17fc4f139639faa21880ed7108c6b5f31b..d26fb91a317744c52b8a6293497766a5eb6b1651 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_sell_tok
 
 Node is bootstrapped.
-Estimated gas: 7016.814 units (will add 100 for safety)
+Estimated gas: 7013.514 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.001057
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 7117
+    Gas limit: 7114
     Storage limit: 0 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.001057
@@ -33,7 +33,7 @@ This sequence of operations was run:
           0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ;
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
-      Consumed gas: 1751.089
+      Consumed gas: 1747.789
     Internal operations:
       Transaction:
         Amount: ꜩ0
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out
index 76fe5b38eb7e99e74ffc8d5e4ab1de1bf5e1f912..9b49737f438a2d4ca559a200341975a2fd4081ae 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_transfer
 
 Node is bootstrapped.
-Estimated gas: 2383.278 units (will add 100 for safety)
+Estimated gas: 2376.678 units (will add 100 for safety)
 Estimated storage: 68 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000606
+    Fee to the baker: ꜩ0.000605
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2484
+    Gas limit: 2477
     Storage limit: 88 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000606
-      payload fees(the block proposer) ....... +ꜩ0.000606
+      [CONTRACT_HASH] ... -ꜩ0.000605
+      payload fees(the block proposer) ....... +ꜩ0.000605
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -35,7 +35,7 @@ This sequence of operations was run:
         Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 260
       Storage size: 2399 bytes
       Paid storage size diff: 68 bytes
-      Consumed gas: 2383.278
+      Consumed gas: 2376.678
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.017
         storage fees ........................... +ꜩ0.017
diff --git a/tezt/_regressions/hash_data/good.out b/tezt/_regressions/hash_data/good.out
index 60893658e3446e5c08d72b726fbc0033fb96e9a5..aa3f1cb7e878a59ceff446cb78dcafe72aeb1e3c 100644
--- a/tezt/_regressions/hash_data/good.out
+++ b/tezt/_regressions/hash_data/good.out
@@ -160,7 +160,7 @@ Raw Script-expression-ID-Hash: 0x698c356a1846c517db5b16f7a8ff507c3eb4aaa46c316a6
 Ledger Blake2b hash: 871oxBK1GsehvbFAwL4bBF4w22oBKfxom746gk7wnr8d
 Raw Sha256 hash: 0xa5f6f6520cfa43309e72f6745efcbebc1edd1486ab219421e349c8000ddfe485
 Raw Sha512 hash: 0x4618bdd8850b8707c52bbf7f64526f8d83e59ccb3f2f1067ca33b5c470c709be21dc9242db15d5428af7b13dfb77353ab39d9367e2a6a12986e95aaf2d4285a7
-Gas remaining: 1039992.117 units remaining
+Gas remaining: 1039995.417 units remaining
 
 ./tezos-client --mode mockup hash data '"[CONTRACT_HASH]%entrypoint"' of type address
 Raw packed data: 0x050a00000020011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600656e747279706f696e74
@@ -169,7 +169,7 @@ Raw Script-expression-ID-Hash: 0x31241f23ec93014cd7b7cfe1e0a21517bfd0f08b38e348d
 Ledger Blake2b hash: 4JpvZAMQiWdgASBEyfLJB45oCrsFocB5ApSNa99DbRPZ
 Raw Sha256 hash: 0xf1c661a1663f788977e3508c6fe3c85346a34101d76b1d47783839ed2d756303
 Raw Sha512 hash: 0x781bd064edc01ff80b436682932dd2f0550a6dbf26be32ac434c6386235f4b4c5bb4610b9fad23374d606dcf853a7e16fcce4e3c20fd796e116adb587cdddcbd
-Gas remaining: 1039991.786 units remaining
+Gas remaining: 1039995.086 units remaining
 
 ./tezos-client --mode mockup hash data '"[PUBLIC_KEY_HASH]"' of type address
 Raw packed data: 0x050a00000016000002298c03ed7d454a101eb7022bc95f7e5f41ac78
@@ -178,7 +178,7 @@ Raw Script-expression-ID-Hash: 0x644beb3894b35023de5b76a4c054a32eb7a818b2a83a1b0
 Ledger Blake2b hash: 7kWuwaa65KxeAcBTC9U9TvSn4d7eo4hzmTReXrFU6QA1
 Raw Sha256 hash: 0x690cf3688186dafd5f78765b514f62ebf98804ed4732d3e9504d1e5d10f62c64
 Raw Sha512 hash: 0x9fe6e4a006013a541dde89aeef0db58a39c1b6d06f12554c8d01dc67dff183602d4e5d4a04ac37088d8e7e7836d08f044b279bc70a752b3ad3f1ed0131a9ea03
-Gas remaining: 1039992.117 units remaining
+Gas remaining: 1039995.417 units remaining
 
 ./tezos-client --mode mockup hash data '"[PUBLIC_KEY_HASH]"' of type address
 Raw packed data: 0x050a000000160001e5c6d1f726796e98b2bad2a819a36f742b2fe25b
@@ -187,7 +187,7 @@ Raw Script-expression-ID-Hash: 0x102dff270630ac032e24ae0a62b478930f56f4f5a27c9c3
 Ledger Blake2b hash: 26ACmTEYpcjnxbUcXQZxYQgWbig1zpHXpmjKecLqMJEH
 Raw Sha256 hash: 0xc7016dde1b3b0a15dbfc476de05480386d8781f996769b0113bcf8d3a0f73502
 Raw Sha512 hash: 0x8446a69748c9e209bbd9e2d7ec652b3edd1516905b2ef11008993c27d239a237b3372c26854b8a1d393aa504478de76560a9fdd96fef24faff8483851814c6c7
-Gas remaining: 1039992.117 units remaining
+Gas remaining: 1039995.417 units remaining
 
 ./tezos-client --mode mockup hash data '"[PUBLIC_KEY_HASH]"' of type address
 Raw packed data: 0x050a0000001600026c9b3ad59e0f8bdc2bd2011675825f9f547131da
@@ -196,7 +196,7 @@ Raw Script-expression-ID-Hash: 0x85e36142a913e3c8d6fb5a77aaad753b01ebe40096bf460
 Ledger Blake2b hash: A1eKYfrX11WNdtxr3QeEzEpY95epaJtJhmeTQEhw3BTg
 Raw Sha256 hash: 0x1520063584bffabc0cc4d64d1d9f35c205ee403789653fef4465fad7da23a484
 Raw Sha512 hash: 0xe8fa1be3ab9fc177a731fdea29e3242831ccea70db15fa5f0dd8f592794261c9e49b51311e0b5387a81472c77edd87cba3afa6207e36ef0bce7f30b0c03bacb0
-Gas remaining: 1039992.117 units remaining
+Gas remaining: 1039995.417 units remaining
 
 ./tezos-client --mode mockup hash data 0 of type bls12_381_fr
 Raw packed data: 0x050a000000200000000000000000000000000000000000000000000000000000000000000000
diff --git a/tezt/_regressions/run_views.out b/tezt/_regressions/run_views.out
index 9711f724f43a8ad0b219a09ffe065c7e8c317784..1c4dba72423abec14a252bc7fb78a76dc4a6882b 100644
--- a/tezt/_regressions/run_views.out
+++ b/tezt/_regressions/run_views.out
@@ -146,20 +146,20 @@ Contract memorized as check_caller.
 
 ./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU --burn-cap 1 --arg '"KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"'
 Node is bootstrapped.
-Estimated gas: 4418.366 units (will add 100 for safety)
+Estimated gas: 4415.066 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
-Operation hash is 'opKVxALX6z77kHy3Tft1d16KCmivKgyyVcVm9hXuauAs5Mx2FsS'
+Operation hash is 'opUxUeYDcfyyqcKPECMAfz3iSQX6fU7PKUdxpjTwQxcMFp7WnDx'
 NOT waiting for the operation to be included.
 Use command
-  tezos-client wait for opKVxALX6z77kHy3Tft1d16KCmivKgyyVcVm9hXuauAs5Mx2FsS to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
+  tezos-client wait for opUxUeYDcfyyqcKPECMAfz3iSQX6fU7PKUdxpjTwQxcMFp7WnDx to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
 and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
     Fee to the baker: ꜩ0.000748
     Expected counter: 3
-    Gas limit: 4519
+    Gas limit: 4516
     Storage limit: 0 bytes
     Balance updates:
       tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000748
@@ -172,7 +172,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: None
       Storage size: 208 bytes
-      Consumed gas: 4419.164
+      Consumed gas: 4415.864
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1
         KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU ... +ꜩ1
@@ -216,24 +216,24 @@ This sequence of operations was run:
 
 ./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU --burn-cap 1 --arg '"KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"'
 Node is bootstrapped.
-Estimated gas: 4421.623 units (will add 100 for safety)
+Estimated gas: 4418.323 units (will add 100 for safety)
 Estimated storage: 27 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
-Operation hash is 'onfWynbTF2Mhv5YXKRge4vS8dqsm8X75Q6ogUBLw4iVYDgAuvBx'
+Operation hash is 'onuMSYN6eeKuSiHcYnJcYBk2Zy87EZ5dJNTYiRsjozjBi7Gt2dQ'
 NOT waiting for the operation to be included.
 Use command
-  tezos-client wait for onfWynbTF2Mhv5YXKRge4vS8dqsm8X75Q6ogUBLw4iVYDgAuvBx to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
+  tezos-client wait for onuMSYN6eeKuSiHcYnJcYBk2Zy87EZ5dJNTYiRsjozjBi7Gt2dQ to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
 and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-    Fee to the baker: ꜩ0.000749
+    Fee to the baker: ꜩ0.000748
     Expected counter: 5
-    Gas limit: 4522
+    Gas limit: 4519
     Storage limit: 47 bytes
     Balance updates:
-      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000749
-      payload fees(the block proposer) ....... +ꜩ0.000749
+      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000748
+      payload fees(the block proposer) ....... +ꜩ0.000748
     Transaction:
       Amount: ꜩ1
       From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
@@ -243,7 +243,7 @@ This sequence of operations was run:
       Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78)
       Storage size: 235 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 4422.421
+      Consumed gas: 4419.121
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675