diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli
index 96e23acf71dd4f79043231c66528f09ff3e3eda3..6fbd0a25f0085128d2ac2ebbc4b2d32bb160099c 100644
--- a/src/proto_alpha/lib_protocol/alpha_context.mli
+++ b/src/proto_alpha/lib_protocol/alpha_context.mli
@@ -1425,6 +1425,8 @@ module Sapling : sig
     val parse_z : Z.t -> (t, string) result
 
     val unparse_to_z : t -> Z.t
+
+    val in_memory_size : t -> Cache_memory_helpers.sint
   end
 
   type state = private {id : Id.t option; diff : diff; memo_size : Memo_size.t}
diff --git a/src/proto_alpha/lib_protocol/sapling_repr.ml b/src/proto_alpha/lib_protocol/sapling_repr.ml
index 5b9a1586d73fe7e46e7bc4c9d07615ebdc325fee..0e54e90a57272d4e81559f3987ca526dc250da22 100644
--- a/src/proto_alpha/lib_protocol/sapling_repr.ml
+++ b/src/proto_alpha/lib_protocol/sapling_repr.ml
@@ -85,6 +85,10 @@ module Memo_size = struct
     else err
 
   let unparse_to_z = Z.of_int
+
+  let in_memory_size (_ : t) =
+    let open Cache_memory_helpers in
+    !!0
 end
 
 let transaction_get_memo_size (transaction : Sapling.UTXO.transaction) =
diff --git a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml
index 661ac6846d39e325a134a1e223b54e2ba050de94..778ea564c9fa05b096c46bbb098d08e7a6866c4f 100644
--- a/src/proto_alpha/lib_protocol/script_typed_ir_size.ml
+++ b/src/proto_alpha/lib_protocol/script_typed_ir_size.ml
@@ -29,9 +29,6 @@ include Cache_memory_helpers
 
 let script_string_size s = Script_string.to_string s |> string_size
 
-(* Memo-sizes are 16-bit integers *)
-let sapling_memo_size_size = !!0
-
 let ty_traverse_f =
   let base_basic =
     !!0
@@ -81,15 +78,21 @@ let ty_traverse_f =
         ret_succ_adding accu @@ (base_compound a +! (word_size *? 2))
     | Contract_t (_ty, a) ->
         ret_succ_adding accu @@ (base_compound a +! word_size)
-    | Sapling_transaction_t _m ->
+    | Sapling_transaction_t m ->
         ret_succ_adding accu
-        @@ (base_compound_no_meta +! sapling_memo_size_size +! word_size)
-    | Sapling_transaction_deprecated_t _m ->
+        @@ base_compound_no_meta
+           +! Sapling.Memo_size.in_memory_size m
+           +! word_size
+    | Sapling_transaction_deprecated_t m ->
         ret_succ_adding accu
-        @@ (base_compound_no_meta +! sapling_memo_size_size +! word_size)
-    | Sapling_state_t _m ->
+        @@ base_compound_no_meta
+           +! Sapling.Memo_size.in_memory_size m
+           +! word_size
+    | Sapling_state_t m ->
         ret_succ_adding accu
-        @@ (base_compound_no_meta +! sapling_memo_size_size +! word_size)
+        @@ base_compound_no_meta
+           +! Sapling.Memo_size.in_memory_size m
+           +! word_size
     | Ticket_t (_cty, a) ->
         ret_succ_adding accu @@ (base_compound a +! word_size)
   in
@@ -140,10 +143,6 @@ let view_signature_size (View_signature {name; input_ty; output_ty}) =
 
 let script_expr_hash_size = !!64
 
-let peano_shape_proof =
-  let scale = header_size +! h1w in
-  fun k -> scale *? k
-
 (* Note: this function is NOT tail-recursive, but that's okay, since
    the recursion is bound by the size of the witness, which is an
    11-bit unsigned integer, i.e. at most 2048. This is enough to
@@ -158,24 +157,36 @@ let rec stack_prefix_preservation_witness_size :
         h3w
   | KRest -> zero
 
-let comb_gadt_witness_size = peano_shape_proof
+let stack_prefix_preservation_witness_size (_n : int) w =
+  stack_prefix_preservation_witness_size w
 
-let uncomb_gadt_witness_size = peano_shape_proof
+let peano_shape_proof =
+  let scale = header_size +! h1w in
+  fun k -> scale *? k
 
-let comb_get_gadt_witness_size = peano_shape_proof
+let comb_gadt_witness_size n (_w : (_, _, _, _, _, _) comb_gadt_witness) =
+  peano_shape_proof n
 
-let comb_set_gadt_witness_size = peano_shape_proof
+let uncomb_gadt_witness_size n (_w : (_, _, _, _, _, _) uncomb_gadt_witness) =
+  peano_shape_proof n
 
-let dup_n_gadt_witness_size = peano_shape_proof
+let comb_get_gadt_witness_size n (_w : (_, _) comb_get_gadt_witness) =
+  peano_shape_proof n
+
+let comb_set_gadt_witness_size n (_w : (_, _, _) comb_set_gadt_witness) =
+  peano_shape_proof n
+
+let dup_n_gadt_witness_size n (_w : (_, _, _, _) dup_n_gadt_witness) =
+  peano_shape_proof n
 
 let contract_size (Typed_contract {arg_ty; address}) =
   ret_adding (ty_size arg_ty) (h2w +! address_size address)
 
-let sapling_state_size {Sapling.id; diff; memo_size = _} =
+let sapling_state_size {Sapling.id; diff; memo_size} =
   h3w
   +! option_size (fun x -> z_size (Sapling.Id.unparse_to_z x)) id
   +! Sapling.diff_in_memory_size diff
-  +! sapling_memo_size_size
+  +! Sapling.Memo_size.in_memory_size memo_size
 
 let chain_id_size = !!16 (* by Obj.reachable_words. *)
 
@@ -347,251 +358,274 @@ and kinstr_size :
     (a, s, r, f) kinstr ->
     nodes_and_size =
  fun ~count_lambda_nodes accu t ->
-  let base = h2w in
+  (* To avoid forgetting counting things, the [apply] function below must ignore
+     no values (can be checked by grepping \b_\w*\b), except for the [ILog] case.
+     Use the [base] function depending on the number of continuations in the
+     instruction and only count other fields.
+     Location counts as zero because it's an immediate integer.
+     Continuations are counted by the [kinstr_traverse] function.
+  *)
+  let base0 (_loc : Script.location) = h1w in
+  let base1 (_loc : Script.location) (_k : (_, _, _, _) kinstr) = h2w in
+  let base2 (_loc : Script.location) (_k1 : (_, _, _, _) kinstr)
+      (_k2 : (_, _, _, _) kinstr) =
+    h3w
+  in
+  let base3 (_loc : Script.location) (_k1 : (_, _, _, _) kinstr)
+      (_k2 : (_, _, _, _) kinstr) (_k3 : (_, _, _, _) kinstr) =
+    h4w
+  in
   let apply :
       type a s r f. nodes_and_size -> (a, s, r, f) kinstr -> nodes_and_size =
    fun accu t ->
     match t with
-    | IDrop (_, _) -> ret_succ_adding accu base
-    | IDup (_, _) -> ret_succ_adding accu base
-    | ISwap (_, _) -> ret_succ_adding accu base
-    | IConst (_, ty, x, _) ->
-        let accu = ret_succ_adding accu (base +! (word_size *? 2)) in
+    | IDrop (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IDup (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISwap (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IConst (loc, ty, x, k) ->
+        let accu = ret_succ_adding accu (base1 loc k +! (word_size *? 2)) in
         (value_size [@ocaml.tailcall])
           ~count_lambda_nodes
           (accu ++ ty_size ty)
           ty
           x
-    | ICons_pair (_, _) -> ret_succ_adding accu base
-    | ICar (_, _) -> ret_succ_adding accu base
-    | ICdr (_, _) -> ret_succ_adding accu base
-    | IUnpair (_, _) -> ret_succ_adding accu base
-    | ICons_some (_, _) -> ret_succ_adding accu base
-    | ICons_none (_, ty, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | IIf_none {loc = _; branch_if_none = _; branch_if_some = _; k = _} ->
-        ret_succ_adding accu (base +! (word_size *? 2))
-    | IOpt_map {loc = _; body = _; k = _} ->
-        ret_succ_adding accu (base +! word_size)
-    | ICons_left (_, ty, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | ICons_right (_, ty, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | IIf_left {loc = _; branch_if_left = _; branch_if_right = _; k = _} ->
-        ret_succ_adding accu (base +! (word_size *? 2))
-    | ICons_list (_, _) -> ret_succ_adding accu base
-    | INil (_, ty, _) -> ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | IIf_cons {loc = _; branch_if_nil = _; branch_if_cons = _; k = _} ->
-        ret_succ_adding accu (base +! (word_size *? 2))
-    | IList_map (_loc, _k1, ty, _k2) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! (word_size *? 2))
-    | IList_iter (_, ty, _, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! (word_size *? 2))
-    | IList_size (_, _) -> ret_succ_adding accu base
-    | IEmpty_set (_, cty, _) ->
-        ret_succ_adding (accu ++ ty_size cty) (base +! word_size)
-    | ISet_iter (_, ty, _, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! (word_size *? 2))
-    | ISet_mem (_, _) -> ret_succ_adding accu base
-    | ISet_update (_, _) -> ret_succ_adding accu base
-    | ISet_size (_, _) -> ret_succ_adding accu base
-    | IEmpty_map (_, cty, vty, _) ->
+    | ICons_pair (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ICar (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ICdr (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IUnpair (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ICons_some (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ICons_none (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | IIf_none {loc; branch_if_none = k1; branch_if_some = k2; k = k3} ->
+        ret_succ_adding accu (base3 loc k1 k2 k3)
+    | IOpt_map {loc; body = k1; k = k2} ->
+        ret_succ_adding accu (base2 loc k1 k2)
+    | ICons_left (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | ICons_right (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | IIf_left {loc; branch_if_left = k1; branch_if_right = k2; k = k3} ->
+        ret_succ_adding accu (base3 loc k1 k2 k3)
+    | ICons_list (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INil (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | IIf_cons {loc; branch_if_nil = k1; branch_if_cons = k2; k = k3} ->
+        ret_succ_adding accu (base3 loc k1 k2 k3)
+    | IList_map (loc, k1, ty, k2) ->
+        ret_succ_adding (accu ++ ty_size ty) (base2 loc k1 k2 +! word_size)
+    | IList_iter (loc, ty, k1, k2) ->
+        ret_succ_adding (accu ++ ty_size ty) (base2 loc k1 k2 +! word_size)
+    | IList_size (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEmpty_set (loc, cty, k) ->
+        ret_succ_adding (accu ++ ty_size cty) (base1 loc k +! word_size)
+    | ISet_iter (loc, ty, k1, k2) ->
+        ret_succ_adding (accu ++ ty_size ty) (base2 loc k1 k2 +! word_size)
+    | ISet_mem (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISet_update (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISet_size (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEmpty_map (loc, cty, vty, k) ->
         ret_succ_adding
           (accu ++ ty_size cty ++ ty_size vty)
-          (base +! (word_size *? 2))
-    | IMap_map (_, ty, _, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! (word_size *? 2))
-    | IMap_iter (_, kvty, _, _) ->
-        ret_succ_adding (accu ++ ty_size kvty) (base +! (word_size *? 2))
-    | IMap_mem (_, _) -> ret_succ_adding accu base
-    | IMap_get (_, _) -> ret_succ_adding accu base
-    | IMap_update (_, _) -> ret_succ_adding accu base
-    | IMap_get_and_update (_, _) -> ret_succ_adding accu base
-    | IMap_size (_, _) -> ret_succ_adding accu base
-    | IEmpty_big_map (_, cty, ty, _) ->
+          (base1 loc k +! (word_size *? 2))
+    | IMap_map (loc, ty, k1, k2) ->
+        ret_succ_adding (accu ++ ty_size ty) (base2 loc k1 k2 +! word_size)
+    | IMap_iter (loc, kvty, k1, k2) ->
+        ret_succ_adding (accu ++ ty_size kvty) (base2 loc k1 k2 +! word_size)
+    | IMap_mem (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMap_get (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMap_update (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMap_get_and_update (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMap_size (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEmpty_big_map (loc, cty, ty, k) ->
         ret_succ_adding
           (accu ++ ty_size cty ++ ty_size ty)
-          (base +! (word_size *? 2))
-    | IBig_map_mem (_, _) -> ret_succ_adding accu base
-    | IBig_map_get (_, _) -> ret_succ_adding accu base
-    | IBig_map_update (_, _) -> ret_succ_adding accu base
-    | IBig_map_get_and_update (_, _) -> ret_succ_adding accu base
-    | IConcat_string (_, _) -> ret_succ_adding accu base
-    | IConcat_string_pair (_, _) -> ret_succ_adding accu base
-    | ISlice_string (_, _) -> ret_succ_adding accu base
-    | IString_size (_, _) -> ret_succ_adding accu base
-    | IConcat_bytes (_, _) -> ret_succ_adding accu base
-    | IConcat_bytes_pair (_, _) -> ret_succ_adding accu base
-    | ISlice_bytes (_, _) -> ret_succ_adding accu base
-    | IBytes_size (_, _) -> ret_succ_adding accu base
-    | IAdd_seconds_to_timestamp (_, _) -> ret_succ_adding accu base
-    | IAdd_timestamp_to_seconds (_, _) -> ret_succ_adding accu base
-    | ISub_timestamp_seconds (_, _) -> ret_succ_adding accu base
-    | IDiff_timestamps (_, _) -> ret_succ_adding accu base
-    | IAdd_tez (_, _) -> ret_succ_adding accu base
-    | ISub_tez (_, _) -> ret_succ_adding accu base
-    | ISub_tez_legacy (_, _) -> ret_succ_adding accu base
-    | IMul_teznat (_, _) -> ret_succ_adding accu base
-    | IMul_nattez (_, _) -> ret_succ_adding accu base
-    | IEdiv_teznat (_, _) -> ret_succ_adding accu base
-    | IEdiv_tez (_, _) -> ret_succ_adding accu base
-    | IOr (_, _) -> ret_succ_adding accu base
-    | IAnd (_, _) -> ret_succ_adding accu base
-    | IXor (_, _) -> ret_succ_adding accu base
-    | INot (_, _) -> ret_succ_adding accu base
-    | IIs_nat (_, _) -> ret_succ_adding accu base
-    | INeg (_, _) -> ret_succ_adding accu base
-    | IAbs_int (_, _) -> ret_succ_adding accu base
-    | IInt_nat (_, _) -> ret_succ_adding accu base
-    | IAdd_int (_, _) -> ret_succ_adding accu base
-    | IAdd_nat (_, _) -> ret_succ_adding accu base
-    | ISub_int (_, _) -> ret_succ_adding accu base
-    | IMul_int (_, _) -> ret_succ_adding accu base
-    | IMul_nat (_, _) -> ret_succ_adding accu base
-    | IEdiv_int (_, _) -> ret_succ_adding accu base
-    | IEdiv_nat (_, _) -> ret_succ_adding accu base
-    | ILsl_nat (_, _) -> ret_succ_adding accu base
-    | ILsr_nat (_, _) -> ret_succ_adding accu base
-    | IOr_nat (_, _) -> ret_succ_adding accu base
-    | IAnd_nat (_, _) -> ret_succ_adding accu base
-    | IAnd_int_nat (_, _) -> ret_succ_adding accu base
-    | IXor_nat (_, _) -> ret_succ_adding accu base
-    | INot_int (_, _) -> ret_succ_adding accu base
-    | IIf {loc = _; branch_if_true = _; branch_if_false = _; k = _} ->
-        ret_succ_adding accu (base +! (word_size *? 2))
-    | ILoop (_, _, _) -> ret_succ_adding accu (base +! word_size)
-    | ILoop_left (_, _, _) -> ret_succ_adding accu (base +! word_size)
-    | IDip (_, _, _, _) -> ret_succ_adding accu (base +! word_size)
-    | IExec (_, sty, _) ->
-        ret_succ_adding (accu ++ stack_ty_size sty) (base +! (word_size *? 2))
-    | IApply (_, ty, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | ILambda (_, lambda, _) ->
-        let accu = ret_succ_adding accu (base +! word_size) in
+          (base1 loc k +! (word_size *? 2))
+    | IBig_map_mem (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IBig_map_get (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IBig_map_update (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IBig_map_get_and_update (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IConcat_string (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IConcat_string_pair (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISlice_string (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IString_size (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IConcat_bytes (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IConcat_bytes_pair (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISlice_bytes (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IBytes_size (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_seconds_to_timestamp (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_timestamp_to_seconds (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISub_timestamp_seconds (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IDiff_timestamps (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_tez (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISub_tez (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISub_tez_legacy (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_teznat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_nattez (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEdiv_teznat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEdiv_tez (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IOr (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAnd (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IXor (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INot (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IIs_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INeg (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAbs_int (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IInt_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_int (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISub_int (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_int (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEdiv_int (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEdiv_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ILsl_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ILsr_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IOr_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAnd_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAnd_int_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IXor_nat (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INot_int (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IIf {loc; branch_if_true = k1; branch_if_false = k2; k = k3} ->
+        ret_succ_adding accu (base3 loc k1 k2 k3)
+    | ILoop (loc, k1, k2) -> ret_succ_adding accu (base2 loc k1 k2)
+    | ILoop_left (loc, k1, k2) -> ret_succ_adding accu (base2 loc k1 k2)
+    | IDip (loc, k1, ty, k2) ->
+        ret_succ_adding (accu ++ ty_size ty) (base2 loc k1 k2 +! word_size)
+    | IExec (loc, sty, k) ->
+        ret_succ_adding (accu ++ stack_ty_size sty) (base1 loc k +! word_size)
+    | IApply (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | ILambda (loc, lambda, k) ->
+        let accu = ret_succ_adding accu (base1 loc k +! word_size) in
         (lambda_size [@ocaml.tailcall]) ~count_lambda_nodes accu lambda
-    | IFailwith (_, ty) -> ret_succ_adding (accu ++ ty_size ty) base
-    | ICompare (_, cty, _) ->
-        ret_succ_adding (accu ++ ty_size cty) (base +! word_size)
-    | IEq (_, _) -> ret_succ_adding accu base
-    | INeq (_, _) -> ret_succ_adding accu base
-    | ILt (_, _) -> ret_succ_adding accu base
-    | IGt (_, _) -> ret_succ_adding accu base
-    | ILe (_, _) -> ret_succ_adding accu base
-    | IGe (_, _) -> ret_succ_adding accu base
-    | IAddress (_, _) -> ret_succ_adding accu base
-    | IContract (_, ty, s, _) ->
+    | IFailwith (loc, ty) ->
+        ret_succ_adding (accu ++ ty_size ty) (base0 loc +! word_size)
+    | ICompare (loc, cty, k) ->
+        ret_succ_adding (accu ++ ty_size cty) (base1 loc k +! word_size)
+    | IEq (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INeq (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ILt (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IGt (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ILe (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IGe (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAddress (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IContract (loc, ty, s, k) ->
         ret_succ_adding
           (accu ++ ty_size ty)
-          (base +! Entrypoint.in_memory_size s +! (word_size *? 2))
-    | IView (_loc, s, sty, _k) ->
+          (base1 loc k +! Entrypoint.in_memory_size s +! (word_size *? 2))
+    | IView (loc, s, sty, k) ->
         ret_succ_adding
           (accu ++ view_signature_size s ++ stack_ty_size sty)
-          (base +! (word_size *? 2))
-    | ITransfer_tokens (_, _) -> ret_succ_adding accu base
-    | IImplicit_account (_, _) -> ret_succ_adding accu base
-    | ICreate_contract {loc = _; storage_type; code; k = _} ->
+          (base1 loc k +! (word_size *? 2))
+    | ITransfer_tokens (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IImplicit_account (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ICreate_contract {loc; storage_type; code; k} ->
         ret_succ_adding
           (accu ++ ty_size storage_type ++ expr_size code)
-          (word_size *? 2)
-    | ISet_delegate (_, _) -> ret_succ_adding accu base
-    | INow (_, _) -> ret_succ_adding accu base
-    | IMin_block_time (_, _) -> ret_succ_adding accu base
-    | IBalance (_, _) -> ret_succ_adding accu base
-    | ILevel (_, _) -> ret_succ_adding accu base
-    | ICheck_signature (_, _) -> ret_succ_adding accu base
-    | IHash_key (_, _) -> ret_succ_adding accu base
-    | IPack (_, ty, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | IUnpack (_, ty, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | IBlake2b (_, _) -> ret_succ_adding accu base
-    | ISha256 (_, _) -> ret_succ_adding accu base
-    | ISha512 (_, _) -> ret_succ_adding accu base
-    | ISource (_, _) -> ret_succ_adding accu base
-    | ISender (_, _) -> ret_succ_adding accu base
-    | ISelf (_, ty, s, _) ->
+          (base1 loc k +! (word_size *? 2))
+    | ISet_delegate (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INow (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMin_block_time (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IBalance (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ILevel (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ICheck_signature (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IHash_key (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IPack (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | IUnpack (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | IBlake2b (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISha256 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISha512 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISource (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISender (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISelf (loc, ty, s, k) ->
         ret_succ_adding
           (accu ++ ty_size ty)
-          (base +! (word_size *? 2) +! Entrypoint.in_memory_size s)
-    | ISelf_address (_, _) -> ret_succ_adding accu base
-    | IAmount (_, _) -> ret_succ_adding accu base
-    | ISapling_empty_state (_, _m, _) ->
-        ret_succ_adding accu (base +! word_size +! sapling_memo_size_size)
-    | ISapling_verify_update (_, _) -> ret_succ_adding accu base
-    | ISapling_verify_update_deprecated (_, _) -> ret_succ_adding accu base
-    | IDig (_loc, _n, w, _k) ->
+          (base1 loc k +! (word_size *? 2) +! Entrypoint.in_memory_size s)
+    | ISelf_address (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAmount (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISapling_empty_state (loc, m, k) ->
+        ret_succ_adding
+          accu
+          (base1 loc k +! word_size +! Sapling.Memo_size.in_memory_size m)
+    | ISapling_verify_update (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISapling_verify_update_deprecated (loc, k) ->
+        ret_succ_adding accu (base1 loc k)
+    | IDig (loc, n, w, k) ->
         ret_succ_adding
-          (accu ++ stack_prefix_preservation_witness_size w)
-          (base +! (word_size *? 2))
-    | IDug (_loc, _n, w, _k) ->
+          (accu ++ stack_prefix_preservation_witness_size n w)
+          (base1 loc k +! (word_size *? 2))
+    | IDug (loc, n, w, k) ->
         ret_succ_adding
-          (accu ++ stack_prefix_preservation_witness_size w)
-          (base +! (word_size *? 2))
-    | IDipn (_loc, _n, w, _k1, _k2) ->
+          (accu ++ stack_prefix_preservation_witness_size n w)
+          (base1 loc k +! (word_size *? 2))
+    | IDipn (loc, n, w, k1, k2) ->
         ret_succ_adding
-          (accu ++ stack_prefix_preservation_witness_size w)
-          (base +! (word_size *? 3))
-    | IDropn (_loc, _n, w, _k) ->
+          (accu ++ stack_prefix_preservation_witness_size n w)
+          (base2 loc k1 k2 +! (word_size *? 2))
+    | IDropn (loc, n, w, k) ->
         ret_succ_adding
-          (accu ++ stack_prefix_preservation_witness_size w)
-          (base +! (word_size *? 2))
-    | IChainId (_, _) -> ret_succ_adding accu base
-    | INever _loc -> ret_succ_adding accu h1w
-    | IVoting_power (_, _) -> ret_succ_adding accu base
-    | ITotal_voting_power (_, _) -> ret_succ_adding accu base
-    | IKeccak (_, _) -> ret_succ_adding accu base
-    | ISha3 (_, _) -> ret_succ_adding accu base
-    | IAdd_bls12_381_g1 (_, _) -> ret_succ_adding accu base
-    | IAdd_bls12_381_g2 (_, _) -> ret_succ_adding accu base
-    | IAdd_bls12_381_fr (_, _) -> ret_succ_adding accu base
-    | IMul_bls12_381_g1 (_, _) -> ret_succ_adding accu base
-    | IMul_bls12_381_g2 (_, _) -> ret_succ_adding accu base
-    | IMul_bls12_381_fr (_, _) -> ret_succ_adding accu base
-    | IMul_bls12_381_z_fr (_, _) -> ret_succ_adding accu base
-    | IMul_bls12_381_fr_z (_, _) -> ret_succ_adding accu base
-    | IInt_bls12_381_fr (_, _) -> ret_succ_adding accu base
-    | INeg_bls12_381_g1 (_, _) -> ret_succ_adding accu base
-    | INeg_bls12_381_g2 (_, _) -> ret_succ_adding accu base
-    | INeg_bls12_381_fr (_, _) -> ret_succ_adding accu base
-    | IPairing_check_bls12_381 (_, _) -> ret_succ_adding accu base
-    | IComb (_, n, _, _) ->
+          (accu ++ stack_prefix_preservation_witness_size n w)
+          (base1 loc k +! (word_size *? 2))
+    | IChainId (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INever loc -> ret_succ_adding accu (base0 loc)
+    | IVoting_power (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ITotal_voting_power (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IKeccak (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | ISha3 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_bls12_381_g1 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_bls12_381_g2 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IAdd_bls12_381_fr (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_bls12_381_g1 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_bls12_381_g2 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_bls12_381_fr (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_bls12_381_z_fr (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IMul_bls12_381_fr_z (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IInt_bls12_381_fr (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INeg_bls12_381_g1 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INeg_bls12_381_g2 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | INeg_bls12_381_fr (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IPairing_check_bls12_381 (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IComb (loc, n, w, k) ->
         ret_succ_adding
           accu
-          (base +! (word_size *? 2) +! comb_gadt_witness_size n)
-    | IUncomb (_, n, _, _) ->
+          (base1 loc k +! (word_size *? 2) +! comb_gadt_witness_size n w)
+    | IUncomb (loc, n, w, k) ->
         ret_succ_adding
           accu
-          (base +! (word_size *? 2) +! uncomb_gadt_witness_size n)
-    | IComb_get (_, n, _, _) ->
+          (base1 loc k +! (word_size *? 2) +! uncomb_gadt_witness_size n w)
+    | IComb_get (loc, n, w, k) ->
         ret_succ_adding
           accu
-          (base +! (word_size *? 2) +! comb_get_gadt_witness_size n)
-    | IComb_set (_, n, _, _) ->
+          (base1 loc k +! (word_size *? 2) +! comb_get_gadt_witness_size n w)
+    | IComb_set (loc, n, w, k) ->
         ret_succ_adding
           accu
-          (base +! (word_size *? 2) +! comb_set_gadt_witness_size n)
-    | IDup_n (_, n, _, _) ->
+          (base1 loc k +! (word_size *? 2) +! comb_set_gadt_witness_size n w)
+    | IDup_n (loc, n, w, k) ->
         ret_succ_adding
           accu
-          (base +! (word_size *? 2) +! dup_n_gadt_witness_size n)
-    | ITicket (_, cty, _) ->
-        ret_succ_adding (accu ++ ty_size cty) (base +! word_size)
-    | IRead_ticket (_, ty, _) ->
-        ret_succ_adding (accu ++ ty_size ty) (base +! word_size)
-    | ISplit_ticket (_, _) -> ret_succ_adding accu base
-    | IJoin_tickets (_, cty, _) ->
-        ret_succ_adding (accu ++ ty_size cty) (base +! word_size)
-    | IOpen_chest (_, _) -> ret_succ_adding accu base
-    | IEmit {loc = _; tag; ty; addr = _; k = _} ->
+          (base1 loc k +! (word_size *? 2) +! dup_n_gadt_witness_size n w)
+    | ITicket (loc, cty, k) ->
+        ret_succ_adding (accu ++ ty_size cty) (base1 loc k +! word_size)
+    | IRead_ticket (loc, ty, k) ->
+        ret_succ_adding (accu ++ ty_size ty) (base1 loc k +! word_size)
+    | ISplit_ticket (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IJoin_tickets (loc, cty, k) ->
+        ret_succ_adding (accu ++ ty_size cty) (base1 loc k +! word_size)
+    | IOpen_chest (loc, k) -> ret_succ_adding accu (base1 loc k)
+    | IEmit {loc; tag; ty; addr; k} ->
         ret_succ_adding
           (accu ++ ty_size ty)
-          (base
+          (base1 loc k
           +! Entrypoint.in_memory_size tag
           +! (word_size *? 3)
-          +! Saturation_repr.safe_int Contract_event.Hash.size)
-    | IHalt _ -> ret_succ_adding accu h1w
+          +! Contract_event.in_memory_size addr)
+    | IHalt loc -> ret_succ_adding accu (base0 loc)
     | ILog _ ->
-        (* This instruction is ignored because it is only used for testing. *)
+        (* This instruction is ignored because it is only used for testing.
+           Keep this case at the end. *)
         accu
   in
   kinstr_traverse t accu {apply}
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out
index 8a959c883f443127fe37775e6307f71908bdf702..ba0b7e01ba376265c6c057e6bf08d52cffbd7d18 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestOriginateContractFromContract::test_originate_contract_from_contract_origination
 
 Node is bootstrapped.
-Estimated gas: 1425.137 units (will add 100 for safety)
+Estimated gas: 1425.182 units (will add 100 for safety)
 Estimated storage: 350 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -41,7 +41,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 93 bytes
         Paid storage size diff: 93 bytes
-        Consumed gas: 1425.137
+        Consumed gas: 1425.182
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.02325
           storage fees ........................... +ꜩ0.02325
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
index 5c71bf08213b02410ee961f0142ed852480ea22d..a9a0757c9eaf836cd9b87a834ad742eb3f4e2dda 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestOriginateContractFromContract::test_originate_contract_from_contract_transfer
 
 Node is bootstrapped.
-Estimated gas: 3524.588 units (will add 100 for safety)
+Estimated gas: 3524.633 units (will add 100 for safety)
 Estimated storage: 295 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -26,7 +26,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 93 bytes
-      Consumed gas: 2120.521
+      Consumed gas: 2120.566
       Internal operations:
         Internal Origination:
           From: [CONTRACT_HASH]
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out
index 1261e92b40f69ae651b4005b420e1f15c88ca8aa..53dd59cc0c8eb8b0545e3affe500182afdf27a05 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestSelfAddressTransfer::test_self_address_originate_sender
 
 Node is bootstrapped.
-Estimated gas: 1419.392 units (will add 100 for safety)
+Estimated gas: 1419.437 units (will add 100 for safety)
 Estimated storage: 339 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -39,7 +39,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 82 bytes
         Paid storage size diff: 82 bytes
-        Consumed gas: 1419.392
+        Consumed gas: 1419.437
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0205
           storage fees ........................... +ꜩ0.0205
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 6a57774046eb5d22d9f871d93e6d513079ebb4bc..da8e968e8b3db8f9da03af0d8007f1a993b6ab41 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: 4692.454 units (will add 100 for safety)
+Estimated gas: 4692.499 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -27,7 +27,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 82 bytes
-      Consumed gas: 2575.276
+      Consumed gas: 2575.321
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out
index 0f42888e55f6a9cf6839c064a4b6b8633f681d64..a231e48150faec81cececa51fe8192a58f569052 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_init_proxy
 
 Node is bootstrapped.
-Estimated gas: 1413.622 units (will add 100 for safety)
+Estimated gas: 1413.667 units (will add 100 for safety)
 Estimated storage: 312 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -39,7 +39,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 55 bytes
         Paid storage size diff: 55 bytes
-        Consumed gas: 1413.622
+        Consumed gas: 1413.667
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01375
           storage fees ........................... +ꜩ0.01375
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
index 0dab79249012622f9c45418f10ad44f9622dab18..d6090e11f9b3d10838530adc61e6692f375248f8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_set_delegate
 
 Node is bootstrapped.
-Estimated gas: 1411.674 units (will add 100 for safety)
+Estimated gas: 1411.719 units (will add 100 for safety)
 Estimated storage: 308 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -33,7 +33,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 51 bytes
         Paid storage size diff: 51 bytes
-        Consumed gas: 1411.674
+        Consumed gas: 1411.719
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01275
           storage fees ........................... +ꜩ0.01275
@@ -48,7 +48,7 @@ Injected block at minimal timestamp
 Injected block at minimal timestamp
 none
 Node is bootstrapped.
-Estimated gas: 3115.285 units (will add 100 for safety)
+Estimated gas: 3115.330 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -74,7 +74,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 51 bytes
-      Consumed gas: 2115.285
+      Consumed gas: 2115.330
       Internal operations:
         Internal Delegation:
           Contract: [CONTRACT_HASH]
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out
index b8dfb40735b7a13d53c2f527811f65a492d12eec..f78a31b8b6da3a14e6b4663ae77c50d8950affcb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_slice
 
 Node is bootstrapped.
-Estimated gas: 1873.219 units (will add 100 for safety)
+Estimated gas: 1873.624 units (will add 100 for safety)
 Estimated storage: 835 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -73,7 +73,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 578 bytes
         Paid storage size diff: 578 bytes
-        Consumed gas: 1873.219
+        Consumed gas: 1873.624
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.1445
           storage fees ........................... +ꜩ0.1445
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out
index 7b5739595fe8667e70b541cf0779268d47d9b7af..e79b36fbba56231989607ac87acca14848102e25 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out	
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")]
 
 Node is bootstrapped.
-Estimated gas: 3595.024 units (will add 100 for safety)
+Estimated gas: 3595.429 units (will add 100 for safety)
 Estimated storage: 257 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -29,7 +29,7 @@ This sequence of operations was run:
       Updated storage:
         [OPERATION_HASH]48f709699019725ba
       Storage size: 578 bytes
-      Consumed gas: 2595.024
+      Consumed gas: 2595.429
       Internal operations:
         Internal Transaction:
           Amount: ꜩ1000
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 06d2f3537a5c01dfc3875f2b9d53d657e661bc20..bfa716f7af95d009f2fe5f2823693ebb27d127af 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
@@ -78,7 +78,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 3771.998 units (will add 100 for safety)
+Estimated gas: 3772.043 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: 3872
+    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: 2568.853
+      Consumed gas: 2568.898
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
index 3ffeb290898bf45b34fe56beeb51f043792294ef..60bdb32cbd6afff43f5661d9434a6d7141edbff3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_split_bytes
 
 Node is bootstrapped.
-Estimated gas: 1465.112 units (will add 100 for safety)
+Estimated gas: 1465.472 units (will add 100 for safety)
 Estimated storage: 511 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -55,7 +55,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 254 bytes
         Paid storage size diff: 254 bytes
-        Consumed gas: 1465.112
+        Consumed gas: 1465.472
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0635
           storage fees ........................... +ꜩ0.0635
@@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as split_bytes.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2151.077 units (will add 100 for safety)
+Estimated gas: 2151.437 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -95,7 +95,7 @@ This sequence of operations was run:
       Updated storage: { 0xaa ; 0xbb ; 0xcc }
       Storage size: 272 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 2151.077
+      Consumed gas: 2151.437
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
index 3fda5d2a1f9263af9cf0f0652bf9639858b22876..e918d5b4decab46e40c39134dfa9885b5a6de5f4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_split_string
 
 Node is bootstrapped.
-Estimated gas: 1465.112 units (will add 100 for safety)
+Estimated gas: 1465.472 units (will add 100 for safety)
 Estimated storage: 511 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -55,7 +55,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 254 bytes
         Paid storage size diff: 254 bytes
-        Consumed gas: 1465.112
+        Consumed gas: 1465.472
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0635
           storage fees ........................... +ꜩ0.0635
@@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as split_string.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2151.141 units (will add 100 for safety)
+Estimated gas: 2151.501 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -95,7 +95,7 @@ This sequence of operations was run:
       Updated storage: { "a" ; "b" ; "c" }
       Storage size: 272 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 2151.141
+      Consumed gas: 2151.501
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
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 c063309a355e7b15a5a8a6e42eeee5a5546bb3bc..43ffd2417a7a16ddc180d1af15f277b8d93865c5 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
@@ -87,7 +87,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as test_transfer_account2.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 1416.737 units (will add 100 for safety)
+Estimated gas: 1416.827 units (will add 100 for safety)
 Estimated storage: 323 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -127,7 +127,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 66 bytes
         Paid storage size diff: 66 bytes
-        Consumed gas: 1416.737
+        Consumed gas: 1416.827
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0165
           storage fees ........................... +ꜩ0.0165
@@ -143,7 +143,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 4679.169 units (will add 100 for safety)
+Estimated gas: 4679.259 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_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: 2570.852
+      Consumed gas: 2570.942
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out"
index 8bd4af6ecb95558a89e1376221e9d9a68e02c583..5f00454fc866291f50ef9c87d3339c63b8e68d6d 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["hello"] to 4
 trace
-  - location: 13 (remaining gas: 1039991.421 units remaining)
+  - location: 13 (remaining gas: 1039991.376 units remaining)
     [ (Pair "hello" (Some 4) {}) ]
-  - location: 13 (remaining gas: 1039991.411 units remaining)
+  - location: 13 (remaining gas: 1039991.366 units remaining)
     [ "hello"
       (Pair (Some 4) {}) ]
-  - location: 14 (remaining gas: 1039991.411 units remaining)
+  - location: 14 (remaining gas: 1039991.366 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 16 (remaining gas: 1039991.401 units remaining)
+  - location: 16 (remaining gas: 1039991.356 units remaining)
     [ (Some 4)
       {} ]
-  - location: 14 (remaining gas: 1039991.381 units remaining)
+  - location: 14 (remaining gas: 1039991.336 units remaining)
     [ "hello"
       (Some 4)
       {} ]
-  - location: 17 (remaining gas: 1039990.369 units remaining)
+  - location: 17 (remaining gas: 1039990.324 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 18 (remaining gas: 1039990.359 units remaining)
+  - location: 18 (remaining gas: 1039990.314 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 19 (remaining gas: 1039990.349 units remaining)
+  - location: 19 (remaining gas: 1039990.304 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 }) ]
-  - location: 21 (remaining gas: 1039990.339 units remaining)
+  - location: 21 (remaining gas: 1039990.294 units remaining)
     [ (Pair {} None { Elt "hello" 4 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out"
index 9e151f0ff407c2e99b66b58990ec7a24d536968c..c2b182e02f5ff9271e43f6e66bc7eec5dbfc33f9 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["hello"] to 5
 trace
-  - location: 13 (remaining gas: 1039990.166 units remaining)
+  - location: 13 (remaining gas: 1039990.121 units remaining)
     [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039990.156 units remaining)
+  - location: 13 (remaining gas: 1039990.111 units remaining)
     [ "hello"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039990.156 units remaining)
+  - location: 14 (remaining gas: 1039990.111 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039990.146 units remaining)
+  - location: 16 (remaining gas: 1039990.101 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039990.126 units remaining)
+  - location: 14 (remaining gas: 1039990.081 units remaining)
     [ "hello"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039989.109 units remaining)
+  - location: 17 (remaining gas: 1039989.064 units remaining)
     [ (Some 4)
       { Elt "hello" 5 } ]
-  - location: 18 (remaining gas: 1039989.099 units remaining)
+  - location: 18 (remaining gas: 1039989.054 units remaining)
     [ (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 19 (remaining gas: 1039989.089 units remaining)
+  - location: 19 (remaining gas: 1039989.044 units remaining)
     [ {}
       (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 21 (remaining gas: 1039989.079 units remaining)
+  - location: 21 (remaining gas: 1039989.034 units remaining)
     [ (Pair {} (Some 4) { Elt "hello" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out"
index 9e6cdde8987ba219eec534ed6aa95e046eb347d5..d163300f8b6e804fe602c9378366cfa6d47bbb22 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["hello"] to 4
   Set map(4)["hi"] to 5
 trace
-  - location: 13 (remaining gas: 1039990.196 units remaining)
+  - location: 13 (remaining gas: 1039990.151 units remaining)
     [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039990.186 units remaining)
+  - location: 13 (remaining gas: 1039990.141 units remaining)
     [ "hi"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039990.186 units remaining)
+  - location: 14 (remaining gas: 1039990.141 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039990.176 units remaining)
+  - location: 16 (remaining gas: 1039990.131 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039990.156 units remaining)
+  - location: 14 (remaining gas: 1039990.111 units remaining)
     [ "hi"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039989.241 units remaining)
+  - location: 17 (remaining gas: 1039989.196 units remaining)
     [ None
       { Elt "hello" 4 ; Elt "hi" 5 } ]
-  - location: 18 (remaining gas: 1039989.231 units remaining)
+  - location: 18 (remaining gas: 1039989.186 units remaining)
     [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 19 (remaining gas: 1039989.221 units remaining)
+  - location: 19 (remaining gas: 1039989.176 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 21 (remaining gas: 1039989.211 units remaining)
+  - location: 21 (remaining gas: 1039989.166 units remaining)
     [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out"
index a80821ac7769d004918e7b1aaecc5e776c2db6ed..bb1e191fb57fe64af48c256b6f19fef87b6f6b19 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["2"] to 2
   Unset map(4)["1"]
 trace
-  - location: 13 (remaining gas: 1039989.367 units remaining)
+  - location: 13 (remaining gas: 1039989.322 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039989.357 units remaining)
+  - location: 13 (remaining gas: 1039989.312 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039989.357 units remaining)
+  - location: 14 (remaining gas: 1039989.312 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039989.347 units remaining)
+  - location: 16 (remaining gas: 1039989.302 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039989.327 units remaining)
+  - location: 14 (remaining gas: 1039989.282 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039988.443 units remaining)
+  - location: 17 (remaining gas: 1039988.398 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039988.433 units remaining)
+  - location: 18 (remaining gas: 1039988.388 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039988.423 units remaining)
+  - location: 19 (remaining gas: 1039988.378 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039988.413 units remaining)
+  - location: 21 (remaining gas: 1039988.368 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out"
index 40121654af05095818c6fc75450127a4fd34c71a..352bb97574944ad075661c3a85b9000a82f238c6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["2"] to 2
   Unset map(4)["1"]
 trace
-  - location: 13 (remaining gas: 1039989.367 units remaining)
+  - location: 13 (remaining gas: 1039989.322 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039989.357 units remaining)
+  - location: 13 (remaining gas: 1039989.312 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039989.357 units remaining)
+  - location: 14 (remaining gas: 1039989.312 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039989.347 units remaining)
+  - location: 16 (remaining gas: 1039989.302 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039989.327 units remaining)
+  - location: 14 (remaining gas: 1039989.282 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039988.443 units remaining)
+  - location: 17 (remaining gas: 1039988.398 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039988.433 units remaining)
+  - location: 18 (remaining gas: 1039988.388 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039988.423 units remaining)
+  - location: 19 (remaining gas: 1039988.378 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039988.413 units remaining)
+  - location: 21 (remaining gas: 1039988.368 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out"
index 3484310cbcaf4573e6ad169a3337a85e363324eb..f7447e54de62c795a368ff83048fa7e6ec731408 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Unset map(4)["hello"]
 trace
-  - location: 13 (remaining gas: 1039990.266 units remaining)
+  - location: 13 (remaining gas: 1039990.221 units remaining)
     [ (Pair "hello" None { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039990.256 units remaining)
+  - location: 13 (remaining gas: 1039990.211 units remaining)
     [ "hello"
       (Pair None { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039990.256 units remaining)
+  - location: 14 (remaining gas: 1039990.211 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039990.246 units remaining)
+  - location: 16 (remaining gas: 1039990.201 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039990.226 units remaining)
+  - location: 14 (remaining gas: 1039990.181 units remaining)
     [ "hello"
       None
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039989.209 units remaining)
+  - location: 17 (remaining gas: 1039989.164 units remaining)
     [ (Some 4)
       {} ]
-  - location: 18 (remaining gas: 1039989.199 units remaining)
+  - location: 18 (remaining gas: 1039989.154 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 19 (remaining gas: 1039989.189 units remaining)
+  - location: 19 (remaining gas: 1039989.144 units remaining)
     [ {}
       (Pair (Some 4) {}) ]
-  - location: 21 (remaining gas: 1039989.179 units remaining)
+  - location: 21 (remaining gas: 1039989.134 units remaining)
     [ (Pair {} (Some 4) {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out"
index 38811eb0f8c0303e55a47a80a498a928ba720e7a..7d020d824e7375f5cdc95861d3b33870c56209c9 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Unset map(4)["hello"]
 trace
-  - location: 13 (remaining gas: 1039991.521 units remaining)
+  - location: 13 (remaining gas: 1039991.476 units remaining)
     [ (Pair "hello" None {}) ]
-  - location: 13 (remaining gas: 1039991.511 units remaining)
+  - location: 13 (remaining gas: 1039991.466 units remaining)
     [ "hello"
       (Pair None {}) ]
-  - location: 14 (remaining gas: 1039991.511 units remaining)
+  - location: 14 (remaining gas: 1039991.466 units remaining)
     [ (Pair None {}) ]
-  - location: 16 (remaining gas: 1039991.501 units remaining)
+  - location: 16 (remaining gas: 1039991.456 units remaining)
     [ None
       {} ]
-  - location: 14 (remaining gas: 1039991.481 units remaining)
+  - location: 14 (remaining gas: 1039991.436 units remaining)
     [ "hello"
       None
       {} ]
-  - location: 17 (remaining gas: 1039990.469 units remaining)
+  - location: 17 (remaining gas: 1039990.424 units remaining)
     [ None
       {} ]
-  - location: 18 (remaining gas: 1039990.459 units remaining)
+  - location: 18 (remaining gas: 1039990.414 units remaining)
     [ (Pair None {}) ]
-  - location: 19 (remaining gas: 1039990.449 units remaining)
+  - location: 19 (remaining gas: 1039990.404 units remaining)
     [ {}
       (Pair None {}) ]
-  - location: 21 (remaining gas: 1039990.439 units remaining)
+  - location: 21 (remaining gas: 1039990.394 units remaining)
     [ (Pair {} None {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out"
index d8461d423a17d5f281015b8c5f1943efe066cecc..a4c13245af69bb940473a10732aa81c2eae2f32a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out"	
@@ -9,38 +9,38 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "one"
 trace
-  - location: 12 (remaining gas: 1039986.208 units remaining)
+  - location: 12 (remaining gas: 1039986.163 units remaining)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 12 (remaining gas: 1039986.198 units remaining)
+  - location: 12 (remaining gas: 1039986.153 units remaining)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None)
       (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 13 (remaining gas: 1039986.188 units remaining)
+  - location: 13 (remaining gas: 1039986.143 units remaining)
     [ "1"
       (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 14 (remaining gas: 1039986.188 units remaining)
+  - location: 14 (remaining gas: 1039986.143 units remaining)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 17 (remaining gas: 1039986.178 units remaining)
+  - location: 17 (remaining gas: 1039986.133 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 18 (remaining gas: 1039986.168 units remaining)
+  - location: 18 (remaining gas: 1039986.123 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 19 (remaining gas: 1039986.158 units remaining)
+  - location: 19 (remaining gas: 1039986.113 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 14 (remaining gas: 1039986.138 units remaining)
+  - location: 14 (remaining gas: 1039986.093 units remaining)
     [ "1"
       { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 20 (remaining gas: 1039985.293 units remaining)
+  - location: 20 (remaining gas: 1039985.248 units remaining)
     [ (Some "one")
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 21 (remaining gas: 1039985.283 units remaining)
+  - location: 21 (remaining gas: 1039985.238 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       (Some "one") ]
-  - location: 22 (remaining gas: 1039985.273 units remaining)
+  - location: 22 (remaining gas: 1039985.228 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ]
-  - location: 23 (remaining gas: 1039985.263 units remaining)
+  - location: 23 (remaining gas: 1039985.218 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ]
-  - location: 25 (remaining gas: 1039985.253 units remaining)
+  - location: 25 (remaining gas: 1039985.208 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out"
index 253d717a8d25f3e5a31407d77de3a21dce8b3322..bb089f77bd234f6696972ebd465e5883b766edc9 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out"	
@@ -8,38 +8,38 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["hello"] to "hi"
 trace
-  - location: 12 (remaining gas: 1039987.211 units remaining)
+  - location: 12 (remaining gas: 1039987.166 units remaining)
     [ (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 12 (remaining gas: 1039987.201 units remaining)
+  - location: 12 (remaining gas: 1039987.156 units remaining)
     [ (Pair "" { Elt "hello" "hi" } None)
       (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 13 (remaining gas: 1039987.191 units remaining)
+  - location: 13 (remaining gas: 1039987.146 units remaining)
     [ ""
       (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 14 (remaining gas: 1039987.191 units remaining)
+  - location: 14 (remaining gas: 1039987.146 units remaining)
     [ (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 17 (remaining gas: 1039987.181 units remaining)
+  - location: 17 (remaining gas: 1039987.136 units remaining)
     [ (Pair { Elt "hello" "hi" } None) ]
-  - location: 18 (remaining gas: 1039987.171 units remaining)
+  - location: 18 (remaining gas: 1039987.126 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039987.161 units remaining)
+  - location: 19 (remaining gas: 1039987.116 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039987.141 units remaining)
+  - location: 14 (remaining gas: 1039987.096 units remaining)
     [ ""
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039986.331 units remaining)
+  - location: 20 (remaining gas: 1039986.286 units remaining)
     [ None
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039986.321 units remaining)
+  - location: 21 (remaining gas: 1039986.276 units remaining)
     [ { Elt "hello" "hi" }
       None ]
-  - location: 22 (remaining gas: 1039986.311 units remaining)
+  - location: 22 (remaining gas: 1039986.266 units remaining)
     [ (Pair { Elt "hello" "hi" } None) ]
-  - location: 23 (remaining gas: 1039986.301 units remaining)
+  - location: 23 (remaining gas: 1039986.256 units remaining)
     [ {}
       (Pair { Elt "hello" "hi" } None) ]
-  - location: 25 (remaining gas: 1039986.291 units remaining)
+  - location: 25 (remaining gas: 1039986.246 units remaining)
     [ (Pair {} { Elt "hello" "hi" } None) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out"
index 370ccfff90897e0da7db14ea64bcdbc8669cd698..24a2c84e870c638b44450a98f03c486a0bef34a0 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out"	
@@ -8,38 +8,38 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["hello"] to "hi"
 trace
-  - location: 12 (remaining gas: 1039987.161 units remaining)
+  - location: 12 (remaining gas: 1039987.116 units remaining)
     [ (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 12 (remaining gas: 1039987.151 units remaining)
+  - location: 12 (remaining gas: 1039987.106 units remaining)
     [ (Pair "hello" { Elt "hello" "hi" } None)
       (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 13 (remaining gas: 1039987.141 units remaining)
+  - location: 13 (remaining gas: 1039987.096 units remaining)
     [ "hello"
       (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 14 (remaining gas: 1039987.141 units remaining)
+  - location: 14 (remaining gas: 1039987.096 units remaining)
     [ (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 17 (remaining gas: 1039987.131 units remaining)
+  - location: 17 (remaining gas: 1039987.086 units remaining)
     [ (Pair { Elt "hello" "hi" } None) ]
-  - location: 18 (remaining gas: 1039987.121 units remaining)
+  - location: 18 (remaining gas: 1039987.076 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039987.111 units remaining)
+  - location: 19 (remaining gas: 1039987.066 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039987.091 units remaining)
+  - location: 14 (remaining gas: 1039987.046 units remaining)
     [ "hello"
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039986.110 units remaining)
+  - location: 20 (remaining gas: 1039986.065 units remaining)
     [ (Some "hi")
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039986.100 units remaining)
+  - location: 21 (remaining gas: 1039986.055 units remaining)
     [ { Elt "hello" "hi" }
       (Some "hi") ]
-  - location: 22 (remaining gas: 1039986.090 units remaining)
+  - location: 22 (remaining gas: 1039986.045 units remaining)
     [ (Pair { Elt "hello" "hi" } (Some "hi")) ]
-  - location: 23 (remaining gas: 1039986.080 units remaining)
+  - location: 23 (remaining gas: 1039986.035 units remaining)
     [ {}
       (Pair { Elt "hello" "hi" } (Some "hi")) ]
-  - location: 25 (remaining gas: 1039986.070 units remaining)
+  - location: 25 (remaining gas: 1039986.025 units remaining)
     [ (Pair {} { Elt "hello" "hi" } (Some "hi")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out"
index 32bdf1795c2e06c86f26de4d0648471a59bc4f5d..1a62abb1d33ee830060540ae2bc579a5d8126ff0 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039987.489 units remaining)
+  - location: 15 (remaining gas: 1039987.309 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039987.479 units remaining)
+  - location: 15 (remaining gas: 1039987.299 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039987.479 units remaining)
+  - location: 16 (remaining gas: 1039987.299 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039987.469 units remaining)
+  - location: 18 (remaining gas: 1039987.289 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039987.449 units remaining)
+  - location: 16 (remaining gas: 1039987.269 units remaining)
     [ {}
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039987.449 units remaining)
+  - location: 19 (remaining gas: 1039987.269 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039987.439 units remaining)
+  - location: 23 (remaining gas: 1039987.259 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039987.429 units remaining)
+  - location: 24 (remaining gas: 1039987.249 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039987.419 units remaining)
+  - location: 26 (remaining gas: 1039987.239 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out"
index 405b19e0828b1cf38e89472e91bce21f9ffec3bc..f9d10ac048e6a864d1727e3ac9f5d255c013d7ba 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out"	
@@ -9,40 +9,40 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "two"
 trace
-  - location: 15 (remaining gas: 1039987.039 units remaining)
+  - location: 15 (remaining gas: 1039986.859 units remaining)
     [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039987.029 units remaining)
+  - location: 15 (remaining gas: 1039986.849 units remaining)
     [ { Elt "1" (Some "two") }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039987.029 units remaining)
+  - location: 16 (remaining gas: 1039986.849 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039987.019 units remaining)
+  - location: 18 (remaining gas: 1039986.839 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039986.999 units remaining)
+  - location: 16 (remaining gas: 1039986.819 units remaining)
     [ { Elt "1" (Some "two") }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.999 units remaining)
+  - location: 19 (remaining gas: 1039986.819 units remaining)
     [ (Pair "1" (Some "two"))
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039986.989 units remaining)
+  - location: 21 (remaining gas: 1039986.809 units remaining)
     [ "1"
       (Some "two")
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039986.129 units remaining)
+  - location: 22 (remaining gas: 1039985.949 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.119 units remaining)
+  - location: 19 (remaining gas: 1039985.939 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039986.109 units remaining)
+  - location: 23 (remaining gas: 1039985.929 units remaining)
     [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039986.099 units remaining)
+  - location: 24 (remaining gas: 1039985.919 units remaining)
     [ {}
       (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039986.089 units remaining)
+  - location: 26 (remaining gas: 1039985.909 units remaining)
     [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out"
index fd25f35e29a3e6d1c897a156cfaaed0ae425d06a..8f783127e7b598fd5b7e5a09e16191d7d036bdf5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out"	
@@ -9,40 +9,40 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "two"
 trace
-  - location: 15 (remaining gas: 1039987.039 units remaining)
+  - location: 15 (remaining gas: 1039986.859 units remaining)
     [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039987.029 units remaining)
+  - location: 15 (remaining gas: 1039986.849 units remaining)
     [ { Elt "1" (Some "two") }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039987.029 units remaining)
+  - location: 16 (remaining gas: 1039986.849 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039987.019 units remaining)
+  - location: 18 (remaining gas: 1039986.839 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039986.999 units remaining)
+  - location: 16 (remaining gas: 1039986.819 units remaining)
     [ { Elt "1" (Some "two") }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.999 units remaining)
+  - location: 19 (remaining gas: 1039986.819 units remaining)
     [ (Pair "1" (Some "two"))
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039986.989 units remaining)
+  - location: 21 (remaining gas: 1039986.809 units remaining)
     [ "1"
       (Some "two")
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039986.129 units remaining)
+  - location: 22 (remaining gas: 1039985.949 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.119 units remaining)
+  - location: 19 (remaining gas: 1039985.939 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039986.109 units remaining)
+  - location: 23 (remaining gas: 1039985.929 units remaining)
     [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039986.099 units remaining)
+  - location: 24 (remaining gas: 1039985.919 units remaining)
     [ {}
       (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039986.089 units remaining)
+  - location: 26 (remaining gas: 1039985.909 units remaining)
     [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out"
index a93e6ec4c2595b2cce5b73ab1b073e0730924165..f94ff994a95148825c56b25bbe4046a468713b54 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out"	
@@ -10,40 +10,40 @@ big_map diff
   Set map(4)["3"] to "three"
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039987.019 units remaining)
+  - location: 15 (remaining gas: 1039986.839 units remaining)
     [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039987.009 units remaining)
+  - location: 15 (remaining gas: 1039986.829 units remaining)
     [ { Elt "3" (Some "three") }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039987.009 units remaining)
+  - location: 16 (remaining gas: 1039986.829 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039986.999 units remaining)
+  - location: 18 (remaining gas: 1039986.819 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039986.979 units remaining)
+  - location: 16 (remaining gas: 1039986.799 units remaining)
     [ { Elt "3" (Some "three") }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.979 units remaining)
+  - location: 19 (remaining gas: 1039986.799 units remaining)
     [ (Pair "3" (Some "three"))
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039986.969 units remaining)
+  - location: 21 (remaining gas: 1039986.789 units remaining)
     [ "3"
       (Some "three")
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039986.109 units remaining)
+  - location: 22 (remaining gas: 1039985.929 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.099 units remaining)
+  - location: 19 (remaining gas: 1039985.919 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" }
       Unit ]
-  - location: 23 (remaining gas: 1039986.089 units remaining)
+  - location: 23 (remaining gas: 1039985.909 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ]
-  - location: 24 (remaining gas: 1039986.079 units remaining)
+  - location: 24 (remaining gas: 1039985.899 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ]
-  - location: 26 (remaining gas: 1039986.069 units remaining)
+  - location: 26 (remaining gas: 1039985.889 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out"
index 2001ebc28ecb987dd06c6d6ced666045bb7f0c00..d5678f4fac0ae5d8899bb44d8fe54eb8ca5b5858 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out"	
@@ -10,40 +10,40 @@ big_map diff
   Unset map(4)["3"]
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039987.183 units remaining)
+  - location: 15 (remaining gas: 1039987.003 units remaining)
     [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039987.173 units remaining)
+  - location: 15 (remaining gas: 1039986.993 units remaining)
     [ { Elt "3" None }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039987.173 units remaining)
+  - location: 16 (remaining gas: 1039986.993 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039987.163 units remaining)
+  - location: 18 (remaining gas: 1039986.983 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039987.143 units remaining)
+  - location: 16 (remaining gas: 1039986.963 units remaining)
     [ { Elt "3" None }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039987.143 units remaining)
+  - location: 19 (remaining gas: 1039986.963 units remaining)
     [ (Pair "3" None)
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039987.133 units remaining)
+  - location: 21 (remaining gas: 1039986.953 units remaining)
     [ "3"
       None
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039986.273 units remaining)
+  - location: 22 (remaining gas: 1039986.093 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.263 units remaining)
+  - location: 19 (remaining gas: 1039986.083 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039986.253 units remaining)
+  - location: 23 (remaining gas: 1039986.073 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039986.243 units remaining)
+  - location: 24 (remaining gas: 1039986.063 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039986.233 units remaining)
+  - location: 26 (remaining gas: 1039986.053 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out"
index bc929ce4d008c9a1edb09a1bd6de95206e8a4aa3..d3b9c411fbadce986baaf093783bffc86678da55 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out"	
@@ -9,40 +9,40 @@ big_map diff
   Unset map(4)["2"]
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039987.183 units remaining)
+  - location: 15 (remaining gas: 1039987.003 units remaining)
     [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039987.173 units remaining)
+  - location: 15 (remaining gas: 1039986.993 units remaining)
     [ { Elt "2" None }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039987.173 units remaining)
+  - location: 16 (remaining gas: 1039986.993 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039987.163 units remaining)
+  - location: 18 (remaining gas: 1039986.983 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039987.143 units remaining)
+  - location: 16 (remaining gas: 1039986.963 units remaining)
     [ { Elt "2" None }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039987.143 units remaining)
+  - location: 19 (remaining gas: 1039986.963 units remaining)
     [ (Pair "2" None)
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039987.133 units remaining)
+  - location: 21 (remaining gas: 1039986.953 units remaining)
     [ "2"
       None
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039986.273 units remaining)
+  - location: 22 (remaining gas: 1039986.093 units remaining)
     [ { Elt "1" "one" }
       Unit ]
-  - location: 19 (remaining gas: 1039986.263 units remaining)
+  - location: 19 (remaining gas: 1039986.083 units remaining)
     [ { Elt "1" "one" }
       Unit ]
-  - location: 23 (remaining gas: 1039986.253 units remaining)
+  - location: 23 (remaining gas: 1039986.073 units remaining)
     [ (Pair { Elt "1" "one" } Unit) ]
-  - location: 24 (remaining gas: 1039986.243 units remaining)
+  - location: 24 (remaining gas: 1039986.063 units remaining)
     [ {}
       (Pair { Elt "1" "one" } Unit) ]
-  - location: 26 (remaining gas: 1039986.233 units remaining)
+  - location: 26 (remaining gas: 1039986.053 units remaining)
     [ (Pair {} { Elt "1" "one" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out"
index e0f7db8de7ff3310e3029ae73b4f718b920788f8..f3c482bc19c022096f9862f41ad628a6ace7ec8d 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out"	
@@ -11,80 +11,80 @@ big_map diff
   Set map(4)["3"] to "three"
   Set map(4)["1"] to "one"
 trace
-  - location: 43 (remaining gas: 1039936.248 units remaining)
+  - location: 43 (remaining gas: 1039935.033 units remaining)
     [ (Pair (Right (Right (Right (Left { Pair "3" "three" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039936.238 units remaining)
+  - location: 43 (remaining gas: 1039935.023 units remaining)
     [ (Right (Right (Right (Left { Pair "3" "three" }))))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039936.238 units remaining)
+  - location: 44 (remaining gas: 1039935.023 units remaining)
     [ (Right (Right (Left { Pair "3" "three" })))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039936.238 units remaining)
+  - location: 60 (remaining gas: 1039935.023 units remaining)
     [ (Right (Left { Pair "3" "three" }))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039936.238 units remaining)
+  - location: 65 (remaining gas: 1039935.023 units remaining)
     [ (Left { Pair "3" "three" })
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039936.238 units remaining)
+  - location: 108 (remaining gas: 1039935.023 units remaining)
     [ { Pair "3" "three" }
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 110 (remaining gas: 1039936.238 units remaining)
+  - location: 110 (remaining gas: 1039935.023 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 113 (remaining gas: 1039936.238 units remaining)
+  - location: 113 (remaining gas: 1039935.023 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 113 (remaining gas: 1039936.228 units remaining)
+  - location: 113 (remaining gas: 1039935.013 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 119 (remaining gas: 1039936.218 units remaining)
+  - location: 119 (remaining gas: 1039935.003 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 110 (remaining gas: 1039936.198 units remaining)
+  - location: 110 (remaining gas: 1039934.983 units remaining)
     [ { Pair "3" "three" }
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 120 (remaining gas: 1039936.198 units remaining)
+  - location: 120 (remaining gas: 1039934.983 units remaining)
     [ (Pair "3" "three")
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 122 (remaining gas: 1039936.188 units remaining)
+  - location: 122 (remaining gas: 1039934.973 units remaining)
     [ "3"
       "three"
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 123 (remaining gas: 1039936.188 units remaining)
+  - location: 123 (remaining gas: 1039934.973 units remaining)
     [ "three"
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 125 (remaining gas: 1039936.178 units remaining)
+  - location: 125 (remaining gas: 1039934.963 units remaining)
     [ (Some "three")
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 123 (remaining gas: 1039936.158 units remaining)
+  - location: 123 (remaining gas: 1039934.943 units remaining)
     [ "3"
       (Some "three")
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 126 (remaining gas: 1039935.301 units remaining)
+  - location: 126 (remaining gas: 1039934.086 units remaining)
     [ { Elt "1" "one" ; Elt "3" "three" }
       { Elt "2" "two" } ]
-  - location: 120 (remaining gas: 1039935.291 units remaining)
+  - location: 120 (remaining gas: 1039934.076 units remaining)
     [ { Elt "1" "one" ; Elt "3" "three" }
       { Elt "2" "two" } ]
-  - location: 127 (remaining gas: 1039935.281 units remaining)
+  - location: 127 (remaining gas: 1039934.066 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }) ]
-  - location: 128 (remaining gas: 1039935.271 units remaining)
+  - location: 128 (remaining gas: 1039934.056 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039935.261 units remaining)
+  - location: 108 (remaining gas: 1039934.046 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039935.251 units remaining)
+  - location: 65 (remaining gas: 1039934.036 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039935.241 units remaining)
+  - location: 60 (remaining gas: 1039934.026 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039935.231 units remaining)
+  - location: 44 (remaining gas: 1039934.016 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 151 (remaining gas: 1039935.221 units remaining)
+  - location: 151 (remaining gas: 1039934.006 units remaining)
     [ {}
       (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 153 (remaining gas: 1039935.211 units remaining)
+  - location: 153 (remaining gas: 1039933.996 units remaining)
     [ (Pair {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out"
index d6f9987e096298adeb9b8dcec94f2b13f6c3781f..3df95b4703bd76723b45340435ea830d678b2af4 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out"	
@@ -10,35 +10,35 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["2"] to "two"
 trace
-  - location: 43 (remaining gas: 1039937.156 units remaining)
+  - location: 43 (remaining gas: 1039935.941 units remaining)
     [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039937.146 units remaining)
+  - location: 43 (remaining gas: 1039935.931 units remaining)
     [ (Left Unit)
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039937.146 units remaining)
+  - location: 44 (remaining gas: 1039935.931 units remaining)
     [ Unit
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 46 (remaining gas: 1039937.136 units remaining)
+  - location: 46 (remaining gas: 1039935.921 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 48 (remaining gas: 1039937.136 units remaining)
+  - location: 48 (remaining gas: 1039935.921 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 48 (remaining gas: 1039937.126 units remaining)
+  - location: 48 (remaining gas: 1039935.911 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 54 (remaining gas: 1039937.116 units remaining)
+  - location: 54 (remaining gas: 1039935.901 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 55 (remaining gas: 1039937.106 units remaining)
+  - location: 55 (remaining gas: 1039935.891 units remaining)
     [ { Elt "2" "two" }
       { Elt "1" "one" } ]
-  - location: 56 (remaining gas: 1039937.096 units remaining)
+  - location: 56 (remaining gas: 1039935.881 units remaining)
     [ (Pair { Elt "2" "two" } { Elt "1" "one" }) ]
-  - location: 57 (remaining gas: 1039937.086 units remaining)
+  - location: 57 (remaining gas: 1039935.871 units remaining)
     [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ]
-  - location: 44 (remaining gas: 1039937.076 units remaining)
+  - location: 44 (remaining gas: 1039935.861 units remaining)
     [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ]
-  - location: 151 (remaining gas: 1039937.066 units remaining)
+  - location: 151 (remaining gas: 1039935.851 units remaining)
     [ {}
       (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ]
-  - location: 153 (remaining gas: 1039937.056 units remaining)
+  - location: 153 (remaining gas: 1039935.841 units remaining)
     [ (Pair {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out"
index 6a486d6a63fcb3d6f2e2cd4d237479742fd9f1f3..bc6ab2c6693fa61d8ab8d3b51c845ebf06b2c70c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out"	
@@ -10,30 +10,30 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["3"] to "three"
 trace
-  - location: 43 (remaining gas: 1039933.602 units remaining)
+  - location: 43 (remaining gas: 1039932.387 units remaining)
     [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039933.592 units remaining)
+  - location: 43 (remaining gas: 1039932.377 units remaining)
     [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039933.592 units remaining)
+  - location: 44 (remaining gas: 1039932.377 units remaining)
     [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039933.592 units remaining)
+  - location: 60 (remaining gas: 1039932.377 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 62 (remaining gas: 1039933.582 units remaining)
+  - location: 62 (remaining gas: 1039932.367 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))
       (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 63 (remaining gas: 1039933.572 units remaining)
+  - location: 63 (remaining gas: 1039932.357 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 60 (remaining gas: 1039933.562 units remaining)
+  - location: 60 (remaining gas: 1039932.347 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 44 (remaining gas: 1039933.552 units remaining)
+  - location: 44 (remaining gas: 1039932.337 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 151 (remaining gas: 1039933.542 units remaining)
+  - location: 151 (remaining gas: 1039932.327 units remaining)
     [ {}
       (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 153 (remaining gas: 1039933.532 units remaining)
+  - location: 153 (remaining gas: 1039932.317 units remaining)
     [ (Pair {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out"
index 511fdd3327175444b9671fa406e24f2d7d749fa8..84df6991a822774b94ada2f4e1f672af35f21933 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out"	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 43 (remaining gas: 1039936.516 units remaining)
+  - location: 43 (remaining gas: 1039935.301 units remaining)
     [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039936.506 units remaining)
+  - location: 43 (remaining gas: 1039935.291 units remaining)
     [ (Right (Left (Right Unit)))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039936.506 units remaining)
+  - location: 44 (remaining gas: 1039935.291 units remaining)
     [ (Left (Right Unit))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039936.506 units remaining)
+  - location: 60 (remaining gas: 1039935.291 units remaining)
     [ (Right Unit)
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 62 (remaining gas: 1039936.496 units remaining)
+  - location: 62 (remaining gas: 1039935.281 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))
       (Right Unit) ]
-  - location: 63 (remaining gas: 1039936.486 units remaining)
+  - location: 63 (remaining gas: 1039935.271 units remaining)
     [ (Right Unit) ]
-  - location: 60 (remaining gas: 1039936.476 units remaining)
+  - location: 60 (remaining gas: 1039935.261 units remaining)
     [ (Right Unit) ]
-  - location: 44 (remaining gas: 1039936.466 units remaining)
+  - location: 44 (remaining gas: 1039935.251 units remaining)
     [ (Right Unit) ]
-  - location: 151 (remaining gas: 1039936.456 units remaining)
+  - location: 151 (remaining gas: 1039935.241 units remaining)
     [ {}
       (Right Unit) ]
-  - location: 153 (remaining gas: 1039936.446 units remaining)
+  - location: 153 (remaining gas: 1039935.231 units remaining)
     [ (Pair {} (Right Unit)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out"
index 1333f66277afeedb5195f6f6b74f053ba3810b3d..9c408855bcd73b28ee8917ea2710359fd6c575e6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out"	
@@ -10,74 +10,74 @@ big_map diff
   New map(4) of type (big_map string string)
   Unset map(4)["1"]
 trace
-  - location: 43 (remaining gas: 1039936.512 units remaining)
+  - location: 43 (remaining gas: 1039935.297 units remaining)
     [ (Pair (Right (Right (Right (Right { "1" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039936.502 units remaining)
+  - location: 43 (remaining gas: 1039935.287 units remaining)
     [ (Right (Right (Right (Right { "1" }))))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039936.502 units remaining)
+  - location: 44 (remaining gas: 1039935.287 units remaining)
     [ (Right (Right (Right { "1" })))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039936.502 units remaining)
+  - location: 60 (remaining gas: 1039935.287 units remaining)
     [ (Right (Right { "1" }))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039936.502 units remaining)
+  - location: 65 (remaining gas: 1039935.287 units remaining)
     [ (Right { "1" })
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039936.502 units remaining)
+  - location: 108 (remaining gas: 1039935.287 units remaining)
     [ { "1" }
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 131 (remaining gas: 1039936.502 units remaining)
+  - location: 131 (remaining gas: 1039935.287 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 134 (remaining gas: 1039936.502 units remaining)
+  - location: 134 (remaining gas: 1039935.287 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 134 (remaining gas: 1039936.492 units remaining)
+  - location: 134 (remaining gas: 1039935.277 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 140 (remaining gas: 1039936.482 units remaining)
+  - location: 140 (remaining gas: 1039935.267 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 131 (remaining gas: 1039936.462 units remaining)
+  - location: 131 (remaining gas: 1039935.247 units remaining)
     [ { "1" }
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 141 (remaining gas: 1039936.462 units remaining)
+  - location: 141 (remaining gas: 1039935.247 units remaining)
     [ "1"
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 143 (remaining gas: 1039936.462 units remaining)
+  - location: 143 (remaining gas: 1039935.247 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 145 (remaining gas: 1039936.452 units remaining)
+  - location: 145 (remaining gas: 1039935.237 units remaining)
     [ None
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 143 (remaining gas: 1039936.432 units remaining)
+  - location: 143 (remaining gas: 1039935.217 units remaining)
     [ "1"
       None
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 147 (remaining gas: 1039935.575 units remaining)
+  - location: 147 (remaining gas: 1039934.360 units remaining)
     [ {}
       { Elt "2" "two" } ]
-  - location: 141 (remaining gas: 1039935.565 units remaining)
+  - location: 141 (remaining gas: 1039934.350 units remaining)
     [ {}
       { Elt "2" "two" } ]
-  - location: 148 (remaining gas: 1039935.555 units remaining)
+  - location: 148 (remaining gas: 1039934.340 units remaining)
     [ (Pair {} { Elt "2" "two" }) ]
-  - location: 149 (remaining gas: 1039935.545 units remaining)
+  - location: 149 (remaining gas: 1039934.330 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039935.535 units remaining)
+  - location: 108 (remaining gas: 1039934.320 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039935.525 units remaining)
+  - location: 65 (remaining gas: 1039934.310 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039935.515 units remaining)
+  - location: 60 (remaining gas: 1039934.300 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039935.505 units remaining)
+  - location: 44 (remaining gas: 1039934.290 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 151 (remaining gas: 1039935.495 units remaining)
+  - location: 151 (remaining gas: 1039934.280 units remaining)
     [ {}
       (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 153 (remaining gas: 1039935.485 units remaining)
+  - location: 153 (remaining gas: 1039934.270 units remaining)
     [ (Pair {} (Left (Pair {} { Elt "2" "two" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out"
index 75899c249ca16ef6d124801a1652beec7ece6e7a..1c2ee0a2b54be3dbb101ca83fb3cefa272ed1bd8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out"	
@@ -10,126 +10,126 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["foo"] to "bar"
 trace
-  - location: 43 (remaining gas: 1039938.644 units remaining)
+  - location: 43 (remaining gas: 1039937.429 units remaining)
     [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ]
-  - location: 43 (remaining gas: 1039938.634 units remaining)
+  - location: 43 (remaining gas: 1039937.419 units remaining)
     [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))))
       (Right Unit) ]
-  - location: 44 (remaining gas: 1039938.634 units remaining)
+  - location: 44 (remaining gas: 1039937.419 units remaining)
     [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))
       (Right Unit) ]
-  - location: 60 (remaining gas: 1039938.634 units remaining)
+  - location: 60 (remaining gas: 1039937.419 units remaining)
     [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))
       (Right Unit) ]
-  - location: 65 (remaining gas: 1039938.634 units remaining)
+  - location: 65 (remaining gas: 1039937.419 units remaining)
     [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })
       (Right Unit) ]
-  - location: 67 (remaining gas: 1039938.634 units remaining)
+  - location: 67 (remaining gas: 1039937.419 units remaining)
     [ (Right Unit) ]
-  - location: 70 (remaining gas: 1039938.634 units remaining)
+  - location: 70 (remaining gas: 1039937.419 units remaining)
     [ Unit ]
-  - location: 70 (remaining gas: 1039938.624 units remaining)
+  - location: 70 (remaining gas: 1039937.409 units remaining)
     [ Unit ]
-  - location: 76 (remaining gas: 1039938.614 units remaining)
+  - location: 76 (remaining gas: 1039937.399 units remaining)
     [  ]
-  - location: 67 (remaining gas: 1039938.594 units remaining)
+  - location: 67 (remaining gas: 1039937.379 units remaining)
     [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ]
-  - location: 77 (remaining gas: 1039938.584 units remaining)
+  - location: 77 (remaining gas: 1039937.369 units remaining)
     [ { Pair "foo" "bar" }
       { Pair "gaz" "baz" } ]
-  - location: 78 (remaining gas: 1039938.584 units remaining)
+  - location: 78 (remaining gas: 1039937.369 units remaining)
     [ { Pair "gaz" "baz" } ]
-  - location: 80 (remaining gas: 1039938.574 units remaining)
+  - location: 80 (remaining gas: 1039937.359 units remaining)
     [ {}
       { Pair "gaz" "baz" } ]
-  - location: 78 (remaining gas: 1039938.554 units remaining)
+  - location: 78 (remaining gas: 1039937.339 units remaining)
     [ { Pair "foo" "bar" }
       {}
       { Pair "gaz" "baz" } ]
-  - location: 83 (remaining gas: 1039938.554 units remaining)
+  - location: 83 (remaining gas: 1039937.339 units remaining)
     [ (Pair "foo" "bar")
       {}
       { Pair "gaz" "baz" } ]
-  - location: 85 (remaining gas: 1039938.544 units remaining)
+  - location: 85 (remaining gas: 1039937.329 units remaining)
     [ "foo"
       "bar"
       {}
       { Pair "gaz" "baz" } ]
-  - location: 86 (remaining gas: 1039938.544 units remaining)
+  - location: 86 (remaining gas: 1039937.329 units remaining)
     [ "bar"
       {}
       { Pair "gaz" "baz" } ]
-  - location: 88 (remaining gas: 1039938.534 units remaining)
+  - location: 88 (remaining gas: 1039937.319 units remaining)
     [ (Some "bar")
       {}
       { Pair "gaz" "baz" } ]
-  - location: 86 (remaining gas: 1039938.514 units remaining)
+  - location: 86 (remaining gas: 1039937.299 units remaining)
     [ "foo"
       (Some "bar")
       {}
       { Pair "gaz" "baz" } ]
-  - location: 89 (remaining gas: 1039937.591 units remaining)
+  - location: 89 (remaining gas: 1039936.376 units remaining)
     [ { Elt "foo" "bar" }
       { Pair "gaz" "baz" } ]
-  - location: 83 (remaining gas: 1039937.581 units remaining)
+  - location: 83 (remaining gas: 1039936.366 units remaining)
     [ { Elt "foo" "bar" }
       { Pair "gaz" "baz" } ]
-  - location: 90 (remaining gas: 1039937.571 units remaining)
+  - location: 90 (remaining gas: 1039936.356 units remaining)
     [ { Pair "gaz" "baz" }
       { Elt "foo" "bar" } ]
-  - location: 91 (remaining gas: 1039937.571 units remaining)
+  - location: 91 (remaining gas: 1039936.356 units remaining)
     [ { Elt "foo" "bar" } ]
-  - location: 93 (remaining gas: 1039937.561 units remaining)
+  - location: 93 (remaining gas: 1039936.346 units remaining)
     [ {}
       { Elt "foo" "bar" } ]
-  - location: 91 (remaining gas: 1039937.541 units remaining)
+  - location: 91 (remaining gas: 1039936.326 units remaining)
     [ { Pair "gaz" "baz" }
       {}
       { Elt "foo" "bar" } ]
-  - location: 96 (remaining gas: 1039937.541 units remaining)
+  - location: 96 (remaining gas: 1039936.326 units remaining)
     [ (Pair "gaz" "baz")
       {}
       { Elt "foo" "bar" } ]
-  - location: 98 (remaining gas: 1039937.531 units remaining)
+  - location: 98 (remaining gas: 1039936.316 units remaining)
     [ "gaz"
       "baz"
       {}
       { Elt "foo" "bar" } ]
-  - location: 99 (remaining gas: 1039937.531 units remaining)
+  - location: 99 (remaining gas: 1039936.316 units remaining)
     [ "baz"
       {}
       { Elt "foo" "bar" } ]
-  - location: 101 (remaining gas: 1039937.521 units remaining)
+  - location: 101 (remaining gas: 1039936.306 units remaining)
     [ (Some "baz")
       {}
       { Elt "foo" "bar" } ]
-  - location: 99 (remaining gas: 1039937.501 units remaining)
+  - location: 99 (remaining gas: 1039936.286 units remaining)
     [ "gaz"
       (Some "baz")
       {}
       { Elt "foo" "bar" } ]
-  - location: 102 (remaining gas: 1039936.578 units remaining)
+  - location: 102 (remaining gas: 1039935.363 units remaining)
     [ { Elt "gaz" "baz" }
       { Elt "foo" "bar" } ]
-  - location: 96 (remaining gas: 1039936.568 units remaining)
+  - location: 96 (remaining gas: 1039935.353 units remaining)
     [ { Elt "gaz" "baz" }
       { Elt "foo" "bar" } ]
-  - location: 103 (remaining gas: 1039936.558 units remaining)
+  - location: 103 (remaining gas: 1039935.343 units remaining)
     [ { Elt "foo" "bar" }
       { Elt "gaz" "baz" } ]
-  - location: 104 (remaining gas: 1039936.548 units remaining)
+  - location: 104 (remaining gas: 1039935.333 units remaining)
     [ (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }) ]
-  - location: 105 (remaining gas: 1039936.538 units remaining)
+  - location: 105 (remaining gas: 1039935.323 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 65 (remaining gas: 1039936.528 units remaining)
+  - location: 65 (remaining gas: 1039935.313 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 60 (remaining gas: 1039936.518 units remaining)
+  - location: 60 (remaining gas: 1039935.303 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 44 (remaining gas: 1039936.508 units remaining)
+  - location: 44 (remaining gas: 1039935.293 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 151 (remaining gas: 1039936.498 units remaining)
+  - location: 151 (remaining gas: 1039935.283 units remaining)
     [ {}
       (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 153 (remaining gas: 1039936.488 units remaining)
+  - location: 153 (remaining gas: 1039935.273 units remaining)
     [ (Pair {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out
index 659508410fefd309df01bc60e50a0eb150e613bd..7c3abd849879ab8f453396d6b48209cb0989cfdb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out
@@ -8,18 +8,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039653.720 units remaining)
+  - location: 9 (remaining gas: 1039653.450 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 9 (remaining gas: 1039653.710 units remaining)
+  - location: 9 (remaining gas: 1039653.440 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 10 (remaining gas: 1039653.700 units remaining)
+  - location: 10 (remaining gas: 1039653.430 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
@@ -29,20 +29,20 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 11 (remaining gas: 1039653.700 units remaining)
+  - location: 11 (remaining gas: 1039653.430 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 13 (remaining gas: 1039653.690 units remaining)
+  - location: 13 (remaining gas: 1039653.420 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 14 (remaining gas: 1039653.680 units remaining)
+  - location: 14 (remaining gas: 1039653.410 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
@@ -50,36 +50,36 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 15 (remaining gas: 1039653.670 units remaining)
+  - location: 15 (remaining gas: 1039653.400 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 16 (remaining gas: 1039653.670 units remaining)
+  - location: 16 (remaining gas: 1039653.400 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 18 (remaining gas: 1039653.660 units remaining)
+  - location: 18 (remaining gas: 1039653.390 units remaining)
     [ "hello"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 19 (remaining gas: 1039653.169 units remaining)
+  - location: 19 (remaining gas: 1039652.899 units remaining)
     [ 0x05010000000568656c6c6f
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 16 (remaining gas: 1039653.149 units remaining)
+  - location: 16 (remaining gas: 1039652.879 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000568656c6c6f
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 11 (remaining gas: 1039653.129 units remaining)
+  - location: 11 (remaining gas: 1039652.859 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
@@ -88,34 +88,34 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 20 (remaining gas: 1039653.119 units remaining)
+  - location: 20 (remaining gas: 1039652.849 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000568656c6c6f
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 21 (remaining gas: 1039587.307 units remaining)
+  - location: 21 (remaining gas: 1039587.037 units remaining)
     [ True
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 22 (remaining gas: 1039587.307 units remaining)
+  - location: 22 (remaining gas: 1039587.037 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 22 (remaining gas: 1039587.297 units remaining)
+  - location: 22 (remaining gas: 1039587.027 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 28 (remaining gas: 1039587.287 units remaining)
+  - location: 28 (remaining gas: 1039587.017 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 29 (remaining gas: 1039587.277 units remaining)
+  - location: 29 (remaining gas: 1039587.007 units remaining)
     [ {}
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 31 (remaining gas: 1039587.267 units remaining)
+  - location: 31 (remaining gas: 1039586.997 units remaining)
     [ (Pair {}
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
@@ -136,18 +136,18 @@ At line 8 characters 14 to 18,
 script reached FAILWITH instruction
 with Unit
 trace
-  - location: 9 (remaining gas: 1039653.730 units remaining)
+  - location: 9 (remaining gas: 1039653.460 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 9 (remaining gas: 1039653.720 units remaining)
+  - location: 9 (remaining gas: 1039653.450 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 10 (remaining gas: 1039653.710 units remaining)
+  - location: 10 (remaining gas: 1039653.440 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
@@ -157,20 +157,20 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 11 (remaining gas: 1039653.710 units remaining)
+  - location: 11 (remaining gas: 1039653.440 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 13 (remaining gas: 1039653.700 units remaining)
+  - location: 13 (remaining gas: 1039653.430 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 14 (remaining gas: 1039653.690 units remaining)
+  - location: 14 (remaining gas: 1039653.420 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
@@ -178,36 +178,36 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 15 (remaining gas: 1039653.680 units remaining)
+  - location: 15 (remaining gas: 1039653.410 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 16 (remaining gas: 1039653.680 units remaining)
+  - location: 16 (remaining gas: 1039653.410 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 18 (remaining gas: 1039653.670 units remaining)
+  - location: 18 (remaining gas: 1039653.400 units remaining)
     [ "abcd"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 19 (remaining gas: 1039653.212 units remaining)
+  - location: 19 (remaining gas: 1039652.942 units remaining)
     [ 0x05010000000461626364
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 16 (remaining gas: 1039653.192 units remaining)
+  - location: 16 (remaining gas: 1039652.922 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000461626364
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 11 (remaining gas: 1039653.172 units remaining)
+  - location: 11 (remaining gas: 1039652.902 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
@@ -216,23 +216,23 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 20 (remaining gas: 1039653.162 units remaining)
+  - location: 20 (remaining gas: 1039652.892 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000461626364
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 21 (remaining gas: 1039587.351 units remaining)
+  - location: 21 (remaining gas: 1039587.081 units remaining)
     [ False
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 22 (remaining gas: 1039587.351 units remaining)
+  - location: 22 (remaining gas: 1039587.081 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 26 (remaining gas: 1039587.341 units remaining)
+  - location: 26 (remaining gas: 1039587.071 units remaining)
     [ Unit
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out"
index 22f9fa14de28251d6e839534c3b64cc8efb154b7..a4f73b3976cbdedfe2efe92745b5fbc8fa9fed9a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.768 units remaining)
+  - location: 10 (remaining gas: 1039991.723 units remaining)
     [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ]
-  - location: 10 (remaining gas: 1039991.758 units remaining)
+  - location: 10 (remaining gas: 1039991.713 units remaining)
     [ (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 11 (remaining gas: 1039991.748 units remaining)
+  - location: 11 (remaining gas: 1039991.703 units remaining)
     [ (Pair -100 "1970-01-01T00:01:40Z")
       (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 12 (remaining gas: 1039991.738 units remaining)
+  - location: 12 (remaining gas: 1039991.693 units remaining)
     [ -100
       (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 13 (remaining gas: 1039991.738 units remaining)
+  - location: 13 (remaining gas: 1039991.693 units remaining)
     [ (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 15 (remaining gas: 1039991.728 units remaining)
+  - location: 15 (remaining gas: 1039991.683 units remaining)
     [ "1970-01-01T00:01:40Z" ]
-  - location: 13 (remaining gas: 1039991.708 units remaining)
+  - location: 13 (remaining gas: 1039991.663 units remaining)
     [ -100
       "1970-01-01T00:01:40Z" ]
-  - location: 16 (remaining gas: 1039991.673 units remaining)
+  - location: 16 (remaining gas: 1039991.628 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039991.663 units remaining)
+  - location: 17 (remaining gas: 1039991.618 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039991.653 units remaining)
+  - location: 18 (remaining gas: 1039991.608 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039991.643 units remaining)
+  - location: 20 (remaining gas: 1039991.598 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out"
index 19de5d5cbb992c6564b96e432d5b6cc3181cef18..06c26b192647cf7ae3b7e24bd0f9ee9ac7a8cd9c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.938 units remaining)
+  - location: 10 (remaining gas: 1039990.893 units remaining)
     [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ]
-  - location: 10 (remaining gas: 1039990.928 units remaining)
+  - location: 10 (remaining gas: 1039990.883 units remaining)
     [ (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039990.918 units remaining)
+  - location: 11 (remaining gas: 1039990.873 units remaining)
     [ (Pair 0 "1970-01-01T00:00:00Z")
       (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039990.908 units remaining)
+  - location: 12 (remaining gas: 1039990.863 units remaining)
     [ 0
       (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 13 (remaining gas: 1039990.908 units remaining)
+  - location: 13 (remaining gas: 1039990.863 units remaining)
     [ (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 15 (remaining gas: 1039990.898 units remaining)
+  - location: 15 (remaining gas: 1039990.853 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 13 (remaining gas: 1039990.878 units remaining)
+  - location: 13 (remaining gas: 1039990.833 units remaining)
     [ 0
       "1970-01-01T00:00:00Z" ]
-  - location: 16 (remaining gas: 1039990.843 units remaining)
+  - location: 16 (remaining gas: 1039990.798 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039990.833 units remaining)
+  - location: 17 (remaining gas: 1039990.788 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039990.823 units remaining)
+  - location: 18 (remaining gas: 1039990.778 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039990.813 units remaining)
+  - location: 20 (remaining gas: 1039990.768 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out"
index 54bd4fe5b199655144a088c650e00f5c6247f8d6..694683a2cf3d3bb7598c2d267653c28939d598da 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.768 units remaining)
+  - location: 10 (remaining gas: 1039991.723 units remaining)
     [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ]
-  - location: 10 (remaining gas: 1039991.758 units remaining)
+  - location: 10 (remaining gas: 1039991.713 units remaining)
     [ (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 11 (remaining gas: 1039991.748 units remaining)
+  - location: 11 (remaining gas: 1039991.703 units remaining)
     [ (Pair 100 "1970-01-01T00:01:40Z")
       (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 12 (remaining gas: 1039991.738 units remaining)
+  - location: 12 (remaining gas: 1039991.693 units remaining)
     [ 100
       (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 13 (remaining gas: 1039991.738 units remaining)
+  - location: 13 (remaining gas: 1039991.693 units remaining)
     [ (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 15 (remaining gas: 1039991.728 units remaining)
+  - location: 15 (remaining gas: 1039991.683 units remaining)
     [ "1970-01-01T00:01:40Z" ]
-  - location: 13 (remaining gas: 1039991.708 units remaining)
+  - location: 13 (remaining gas: 1039991.663 units remaining)
     [ 100
       "1970-01-01T00:01:40Z" ]
-  - location: 16 (remaining gas: 1039991.673 units remaining)
+  - location: 16 (remaining gas: 1039991.628 units remaining)
     [ "1970-01-01T00:03:20Z" ]
-  - location: 17 (remaining gas: 1039991.663 units remaining)
+  - location: 17 (remaining gas: 1039991.618 units remaining)
     [ (Some "1970-01-01T00:03:20Z") ]
-  - location: 18 (remaining gas: 1039991.653 units remaining)
+  - location: 18 (remaining gas: 1039991.608 units remaining)
     [ {}
       (Some "1970-01-01T00:03:20Z") ]
-  - location: 20 (remaining gas: 1039991.643 units remaining)
+  - location: 20 (remaining gas: 1039991.598 units remaining)
     [ (Pair {} (Some "1970-01-01T00:03:20Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out"
index dadc8349768e6e3950f35b11413e90dd1854bf40..529888f7e9d92ba182d802bc16af2db1254dfaec 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.938 units remaining)
+  - location: 10 (remaining gas: 1039990.893 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ]
-  - location: 10 (remaining gas: 1039990.928 units remaining)
+  - location: 10 (remaining gas: 1039990.883 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 11 (remaining gas: 1039990.918 units remaining)
+  - location: 11 (remaining gas: 1039990.873 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" 0)
       (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 12 (remaining gas: 1039990.908 units remaining)
+  - location: 12 (remaining gas: 1039990.863 units remaining)
     [ "1970-01-01T00:00:00Z"
       (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 13 (remaining gas: 1039990.908 units remaining)
+  - location: 13 (remaining gas: 1039990.863 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 15 (remaining gas: 1039990.898 units remaining)
+  - location: 15 (remaining gas: 1039990.853 units remaining)
     [ 0 ]
-  - location: 13 (remaining gas: 1039990.878 units remaining)
+  - location: 13 (remaining gas: 1039990.833 units remaining)
     [ "1970-01-01T00:00:00Z"
       0 ]
-  - location: 16 (remaining gas: 1039990.843 units remaining)
+  - location: 16 (remaining gas: 1039990.798 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039990.833 units remaining)
+  - location: 17 (remaining gas: 1039990.788 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039990.823 units remaining)
+  - location: 18 (remaining gas: 1039990.778 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039990.813 units remaining)
+  - location: 20 (remaining gas: 1039990.768 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out"
index c5063d3341b5dde350e283c84149139099e571d3..1a363801caf64e505696d403935c4d8771260348 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.768 units remaining)
+  - location: 10 (remaining gas: 1039991.723 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ]
-  - location: 10 (remaining gas: 1039991.758 units remaining)
+  - location: 10 (remaining gas: 1039991.713 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 11 (remaining gas: 1039991.748 units remaining)
+  - location: 11 (remaining gas: 1039991.703 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100)
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 12 (remaining gas: 1039991.738 units remaining)
+  - location: 12 (remaining gas: 1039991.693 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 13 (remaining gas: 1039991.738 units remaining)
+  - location: 13 (remaining gas: 1039991.693 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 15 (remaining gas: 1039991.728 units remaining)
+  - location: 15 (remaining gas: 1039991.683 units remaining)
     [ -100 ]
-  - location: 13 (remaining gas: 1039991.708 units remaining)
+  - location: 13 (remaining gas: 1039991.663 units remaining)
     [ "1970-01-01T00:01:40Z"
       -100 ]
-  - location: 16 (remaining gas: 1039991.673 units remaining)
+  - location: 16 (remaining gas: 1039991.628 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039991.663 units remaining)
+  - location: 17 (remaining gas: 1039991.618 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039991.653 units remaining)
+  - location: 18 (remaining gas: 1039991.608 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039991.643 units remaining)
+  - location: 20 (remaining gas: 1039991.598 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out"
index 6956b0f6249168c7e0abf46c7bfe8e532667f558..2cb6d5970ebb33acd9b5c21ffe1ae70f2a974283 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.768 units remaining)
+  - location: 10 (remaining gas: 1039991.723 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ]
-  - location: 10 (remaining gas: 1039991.758 units remaining)
+  - location: 10 (remaining gas: 1039991.713 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 11 (remaining gas: 1039991.748 units remaining)
+  - location: 11 (remaining gas: 1039991.703 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100)
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 12 (remaining gas: 1039991.738 units remaining)
+  - location: 12 (remaining gas: 1039991.693 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 13 (remaining gas: 1039991.738 units remaining)
+  - location: 13 (remaining gas: 1039991.693 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 15 (remaining gas: 1039991.728 units remaining)
+  - location: 15 (remaining gas: 1039991.683 units remaining)
     [ 100 ]
-  - location: 13 (remaining gas: 1039991.708 units remaining)
+  - location: 13 (remaining gas: 1039991.663 units remaining)
     [ "1970-01-01T00:01:40Z"
       100 ]
-  - location: 16 (remaining gas: 1039991.673 units remaining)
+  - location: 16 (remaining gas: 1039991.628 units remaining)
     [ "1970-01-01T00:03:20Z" ]
-  - location: 17 (remaining gas: 1039991.663 units remaining)
+  - location: 17 (remaining gas: 1039991.618 units remaining)
     [ (Some "1970-01-01T00:03:20Z") ]
-  - location: 18 (remaining gas: 1039991.653 units remaining)
+  - location: 18 (remaining gas: 1039991.608 units remaining)
     [ {}
       (Some "1970-01-01T00:03:20Z") ]
-  - location: 20 (remaining gas: 1039991.643 units remaining)
+  - location: 20 (remaining gas: 1039991.598 units remaining)
     [ (Pair {} (Some "1970-01-01T00:03:20Z")) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out
index 165a36b095dae1cdea555de775060aa791f6e741..eebe800f73ad0d76dc4cc52de65c26f1c10ee18c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[0] to 1
 trace
-  - location: 12 (remaining gas: 1039989.146 units remaining)
+  - location: 12 (remaining gas: 1039989.101 units remaining)
     [ (Pair 1 { Elt 0 1 } None) ]
-  - location: 12 (remaining gas: 1039989.136 units remaining)
+  - location: 12 (remaining gas: 1039989.091 units remaining)
     [ 1
       (Pair { Elt 0 1 } None) ]
-  - location: 13 (remaining gas: 1039989.136 units remaining)
+  - location: 13 (remaining gas: 1039989.091 units remaining)
     [ (Pair { Elt 0 1 } None) ]
-  - location: 15 (remaining gas: 1039989.126 units remaining)
+  - location: 15 (remaining gas: 1039989.081 units remaining)
     [ { Elt 0 1 } ]
-  - location: 16 (remaining gas: 1039989.116 units remaining)
+  - location: 16 (remaining gas: 1039989.071 units remaining)
     [ { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 13 (remaining gas: 1039989.096 units remaining)
+  - location: 13 (remaining gas: 1039989.051 units remaining)
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (remaining gas: 1039988.388 units remaining)
+  - location: 17 (remaining gas: 1039988.343 units remaining)
     [ False
       { Elt 0 1 } ]
-  - location: 18 (remaining gas: 1039988.378 units remaining)
+  - location: 18 (remaining gas: 1039988.333 units remaining)
     [ (Some False)
       { Elt 0 1 } ]
-  - location: 19 (remaining gas: 1039988.368 units remaining)
+  - location: 19 (remaining gas: 1039988.323 units remaining)
     [ { Elt 0 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039988.358 units remaining)
+  - location: 20 (remaining gas: 1039988.313 units remaining)
     [ (Pair { Elt 0 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039988.348 units remaining)
+  - location: 21 (remaining gas: 1039988.303 units remaining)
     [ {}
       (Pair { Elt 0 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039988.338 units remaining)
+  - location: 23 (remaining gas: 1039988.293 units remaining)
     [ (Pair {} { Elt 0 1 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out
index aa2408c323620a81aa547359818aadac2b37c06c..c12241ca3e28fe90ba6c4148e9628a9fe9372894 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[0] to 1
 trace
-  - location: 12 (remaining gas: 1039989.146 units remaining)
+  - location: 12 (remaining gas: 1039989.101 units remaining)
     [ (Pair 1 { Elt 0 1 } None) ]
-  - location: 12 (remaining gas: 1039989.136 units remaining)
+  - location: 12 (remaining gas: 1039989.091 units remaining)
     [ 1
       (Pair { Elt 0 1 } None) ]
-  - location: 13 (remaining gas: 1039989.136 units remaining)
+  - location: 13 (remaining gas: 1039989.091 units remaining)
     [ (Pair { Elt 0 1 } None) ]
-  - location: 15 (remaining gas: 1039989.126 units remaining)
+  - location: 15 (remaining gas: 1039989.081 units remaining)
     [ { Elt 0 1 } ]
-  - location: 16 (remaining gas: 1039989.116 units remaining)
+  - location: 16 (remaining gas: 1039989.071 units remaining)
     [ { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 13 (remaining gas: 1039989.096 units remaining)
+  - location: 13 (remaining gas: 1039989.051 units remaining)
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (remaining gas: 1039988.388 units remaining)
+  - location: 17 (remaining gas: 1039988.343 units remaining)
     [ False
       { Elt 0 1 } ]
-  - location: 18 (remaining gas: 1039988.378 units remaining)
+  - location: 18 (remaining gas: 1039988.333 units remaining)
     [ (Some False)
       { Elt 0 1 } ]
-  - location: 19 (remaining gas: 1039988.368 units remaining)
+  - location: 19 (remaining gas: 1039988.323 units remaining)
     [ { Elt 0 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039988.358 units remaining)
+  - location: 20 (remaining gas: 1039988.313 units remaining)
     [ (Pair { Elt 0 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039988.348 units remaining)
+  - location: 21 (remaining gas: 1039988.303 units remaining)
     [ {}
       (Pair { Elt 0 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039988.338 units remaining)
+  - location: 23 (remaining gas: 1039988.293 units remaining)
     [ (Pair {} { Elt 0 1 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out
index d67b8c4172a660d18d5105d7327f55c1aedbfeaf..56c5bc6bb2778e9e82528079a6df355435e79b20 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[1] to 0
 trace
-  - location: 12 (remaining gas: 1039989.146 units remaining)
+  - location: 12 (remaining gas: 1039989.101 units remaining)
     [ (Pair 1 { Elt 1 0 } None) ]
-  - location: 12 (remaining gas: 1039989.136 units remaining)
+  - location: 12 (remaining gas: 1039989.091 units remaining)
     [ 1
       (Pair { Elt 1 0 } None) ]
-  - location: 13 (remaining gas: 1039989.136 units remaining)
+  - location: 13 (remaining gas: 1039989.091 units remaining)
     [ (Pair { Elt 1 0 } None) ]
-  - location: 15 (remaining gas: 1039989.126 units remaining)
+  - location: 15 (remaining gas: 1039989.081 units remaining)
     [ { Elt 1 0 } ]
-  - location: 16 (remaining gas: 1039989.116 units remaining)
+  - location: 16 (remaining gas: 1039989.071 units remaining)
     [ { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 13 (remaining gas: 1039989.096 units remaining)
+  - location: 13 (remaining gas: 1039989.051 units remaining)
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (remaining gas: 1039988.388 units remaining)
+  - location: 17 (remaining gas: 1039988.343 units remaining)
     [ True
       { Elt 1 0 } ]
-  - location: 18 (remaining gas: 1039988.378 units remaining)
+  - location: 18 (remaining gas: 1039988.333 units remaining)
     [ (Some True)
       { Elt 1 0 } ]
-  - location: 19 (remaining gas: 1039988.368 units remaining)
+  - location: 19 (remaining gas: 1039988.323 units remaining)
     [ { Elt 1 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039988.358 units remaining)
+  - location: 20 (remaining gas: 1039988.313 units remaining)
     [ (Pair { Elt 1 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039988.348 units remaining)
+  - location: 21 (remaining gas: 1039988.303 units remaining)
     [ {}
       (Pair { Elt 1 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039988.338 units remaining)
+  - location: 23 (remaining gas: 1039988.293 units remaining)
     [ (Pair {} { Elt 1 0 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out
index 8a930b9b79273780f96e289ae49d399d1dbdbf67..3f3e1ddc3fd677b17aa32570e6439155405f9e40 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[1] to 0
 trace
-  - location: 12 (remaining gas: 1039989.146 units remaining)
+  - location: 12 (remaining gas: 1039989.101 units remaining)
     [ (Pair 1 { Elt 1 0 } None) ]
-  - location: 12 (remaining gas: 1039989.136 units remaining)
+  - location: 12 (remaining gas: 1039989.091 units remaining)
     [ 1
       (Pair { Elt 1 0 } None) ]
-  - location: 13 (remaining gas: 1039989.136 units remaining)
+  - location: 13 (remaining gas: 1039989.091 units remaining)
     [ (Pair { Elt 1 0 } None) ]
-  - location: 15 (remaining gas: 1039989.126 units remaining)
+  - location: 15 (remaining gas: 1039989.081 units remaining)
     [ { Elt 1 0 } ]
-  - location: 16 (remaining gas: 1039989.116 units remaining)
+  - location: 16 (remaining gas: 1039989.071 units remaining)
     [ { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 13 (remaining gas: 1039989.096 units remaining)
+  - location: 13 (remaining gas: 1039989.051 units remaining)
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (remaining gas: 1039988.388 units remaining)
+  - location: 17 (remaining gas: 1039988.343 units remaining)
     [ True
       { Elt 1 0 } ]
-  - location: 18 (remaining gas: 1039988.378 units remaining)
+  - location: 18 (remaining gas: 1039988.333 units remaining)
     [ (Some True)
       { Elt 1 0 } ]
-  - location: 19 (remaining gas: 1039988.368 units remaining)
+  - location: 19 (remaining gas: 1039988.323 units remaining)
     [ { Elt 1 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039988.358 units remaining)
+  - location: 20 (remaining gas: 1039988.313 units remaining)
     [ (Pair { Elt 1 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039988.348 units remaining)
+  - location: 21 (remaining gas: 1039988.303 units remaining)
     [ {}
       (Pair { Elt 1 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039988.338 units remaining)
+  - location: 23 (remaining gas: 1039988.293 units remaining)
     [ (Pair {} { Elt 1 0 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out
index e4795aa8d61b35b63b0bae0388c195ac81537741..0b87fcfe7096016d4e99bd6e7bf13d51b670d7b2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039988.190 units remaining)
+  - location: 12 (remaining gas: 1039988.145 units remaining)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039988.180 units remaining)
+  - location: 12 (remaining gas: 1039988.135 units remaining)
     [ 1
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039988.180 units remaining)
+  - location: 13 (remaining gas: 1039988.135 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039988.170 units remaining)
+  - location: 15 (remaining gas: 1039988.125 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039988.160 units remaining)
+  - location: 16 (remaining gas: 1039988.115 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039988.140 units remaining)
+  - location: 13 (remaining gas: 1039988.095 units remaining)
     [ 1
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.431 units remaining)
+  - location: 17 (remaining gas: 1039987.386 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.421 units remaining)
+  - location: 18 (remaining gas: 1039987.376 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.411 units remaining)
+  - location: 19 (remaining gas: 1039987.366 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.401 units remaining)
+  - location: 20 (remaining gas: 1039987.356 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.391 units remaining)
+  - location: 21 (remaining gas: 1039987.346 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.381 units remaining)
+  - location: 23 (remaining gas: 1039987.336 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out
index bf93f21b7f7a8d1eeede662bd93c85b43a773d43..f976e9117c627182e226ab6ce7f2819084508ba8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039988.190 units remaining)
+  - location: 12 (remaining gas: 1039988.145 units remaining)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039988.180 units remaining)
+  - location: 12 (remaining gas: 1039988.135 units remaining)
     [ 1
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039988.180 units remaining)
+  - location: 13 (remaining gas: 1039988.135 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039988.170 units remaining)
+  - location: 15 (remaining gas: 1039988.125 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039988.160 units remaining)
+  - location: 16 (remaining gas: 1039988.115 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039988.140 units remaining)
+  - location: 13 (remaining gas: 1039988.095 units remaining)
     [ 1
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.431 units remaining)
+  - location: 17 (remaining gas: 1039987.386 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.421 units remaining)
+  - location: 18 (remaining gas: 1039987.376 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.411 units remaining)
+  - location: 19 (remaining gas: 1039987.366 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.401 units remaining)
+  - location: 20 (remaining gas: 1039987.356 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.391 units remaining)
+  - location: 21 (remaining gas: 1039987.346 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.381 units remaining)
+  - location: 23 (remaining gas: 1039987.336 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out
index 22fc95bb84e2f8f9d5ae574b9bb2836cb9659265..5cdd1460e45ca2509de684b195b00a17b2311c88 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039988.190 units remaining)
+  - location: 12 (remaining gas: 1039988.145 units remaining)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039988.180 units remaining)
+  - location: 12 (remaining gas: 1039988.135 units remaining)
     [ 2
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039988.180 units remaining)
+  - location: 13 (remaining gas: 1039988.135 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039988.170 units remaining)
+  - location: 15 (remaining gas: 1039988.125 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039988.160 units remaining)
+  - location: 16 (remaining gas: 1039988.115 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039988.140 units remaining)
+  - location: 13 (remaining gas: 1039988.095 units remaining)
     [ 2
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.431 units remaining)
+  - location: 17 (remaining gas: 1039987.386 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.421 units remaining)
+  - location: 18 (remaining gas: 1039987.376 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.411 units remaining)
+  - location: 19 (remaining gas: 1039987.366 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.401 units remaining)
+  - location: 20 (remaining gas: 1039987.356 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.391 units remaining)
+  - location: 21 (remaining gas: 1039987.346 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.381 units remaining)
+  - location: 23 (remaining gas: 1039987.336 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out
index edf157afc58174c0a373b7e2812b8c585707e067..f2917dec6ee75d5464e589c0da7acd60ece369bb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039988.190 units remaining)
+  - location: 12 (remaining gas: 1039988.145 units remaining)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039988.180 units remaining)
+  - location: 12 (remaining gas: 1039988.135 units remaining)
     [ 2
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039988.180 units remaining)
+  - location: 13 (remaining gas: 1039988.135 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039988.170 units remaining)
+  - location: 15 (remaining gas: 1039988.125 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039988.160 units remaining)
+  - location: 16 (remaining gas: 1039988.115 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039988.140 units remaining)
+  - location: 13 (remaining gas: 1039988.095 units remaining)
     [ 2
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.431 units remaining)
+  - location: 17 (remaining gas: 1039987.386 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.421 units remaining)
+  - location: 18 (remaining gas: 1039987.376 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.411 units remaining)
+  - location: 19 (remaining gas: 1039987.366 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.401 units remaining)
+  - location: 20 (remaining gas: 1039987.356 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.391 units remaining)
+  - location: 21 (remaining gas: 1039987.346 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.381 units remaining)
+  - location: 23 (remaining gas: 1039987.336 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out
index a0d8c5f3b05b47d31fea52d212e6a5875768f093..46bf57f5002e7668cc2a6b7cd41456f83342db4c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039988.190 units remaining)
+  - location: 12 (remaining gas: 1039988.145 units remaining)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039988.180 units remaining)
+  - location: 12 (remaining gas: 1039988.135 units remaining)
     [ 3
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039988.180 units remaining)
+  - location: 13 (remaining gas: 1039988.135 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039988.170 units remaining)
+  - location: 15 (remaining gas: 1039988.125 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039988.160 units remaining)
+  - location: 16 (remaining gas: 1039988.115 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039988.140 units remaining)
+  - location: 13 (remaining gas: 1039988.095 units remaining)
     [ 3
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.431 units remaining)
+  - location: 17 (remaining gas: 1039987.386 units remaining)
     [ False
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.421 units remaining)
+  - location: 18 (remaining gas: 1039987.376 units remaining)
     [ (Some False)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.411 units remaining)
+  - location: 19 (remaining gas: 1039987.366 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.401 units remaining)
+  - location: 20 (remaining gas: 1039987.356 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039987.391 units remaining)
+  - location: 21 (remaining gas: 1039987.346 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039987.381 units remaining)
+  - location: 23 (remaining gas: 1039987.336 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out
index 3fb30cca211c4ba75d6b1f89fc632ec083daa2de..854a9ba2fdac7d664648c7ae1498f3ce83eee1c1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039988.190 units remaining)
+  - location: 12 (remaining gas: 1039988.145 units remaining)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039988.180 units remaining)
+  - location: 12 (remaining gas: 1039988.135 units remaining)
     [ 3
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039988.180 units remaining)
+  - location: 13 (remaining gas: 1039988.135 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039988.170 units remaining)
+  - location: 15 (remaining gas: 1039988.125 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039988.160 units remaining)
+  - location: 16 (remaining gas: 1039988.115 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039988.140 units remaining)
+  - location: 13 (remaining gas: 1039988.095 units remaining)
     [ 3
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.431 units remaining)
+  - location: 17 (remaining gas: 1039987.386 units remaining)
     [ False
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.421 units remaining)
+  - location: 18 (remaining gas: 1039987.376 units remaining)
     [ (Some False)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.411 units remaining)
+  - location: 19 (remaining gas: 1039987.366 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.401 units remaining)
+  - location: 20 (remaining gas: 1039987.356 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039987.391 units remaining)
+  - location: 21 (remaining gas: 1039987.346 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039987.381 units remaining)
+  - location: 23 (remaining gas: 1039987.336 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out
index 9a25be3be85b54f593749bc6287af538d9731911..99c4264ca3fcbc3b302985133e09b6ee2989b656 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   New map(4) of type (big_map nat nat)
 trace
-  - location: 12 (remaining gas: 1039990.064 units remaining)
+  - location: 12 (remaining gas: 1039990.019 units remaining)
     [ (Pair 1 {} None) ]
-  - location: 12 (remaining gas: 1039990.054 units remaining)
+  - location: 12 (remaining gas: 1039990.009 units remaining)
     [ 1
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039990.054 units remaining)
+  - location: 13 (remaining gas: 1039990.009 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039990.044 units remaining)
+  - location: 15 (remaining gas: 1039989.999 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039990.034 units remaining)
+  - location: 16 (remaining gas: 1039989.989 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039990.014 units remaining)
+  - location: 13 (remaining gas: 1039989.969 units remaining)
     [ 1
       {}
       {} ]
-  - location: 17 (remaining gas: 1039989.308 units remaining)
+  - location: 17 (remaining gas: 1039989.263 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039989.298 units remaining)
+  - location: 18 (remaining gas: 1039989.253 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039989.288 units remaining)
+  - location: 19 (remaining gas: 1039989.243 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039989.278 units remaining)
+  - location: 20 (remaining gas: 1039989.233 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039989.268 units remaining)
+  - location: 21 (remaining gas: 1039989.223 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039989.258 units remaining)
+  - location: 23 (remaining gas: 1039989.213 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out
index 8cb9532a10a8d06327ee8a75425441e6ec781763..c8a8f5e2e291eee8de8829ba1a6f3180ac6b55b0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   New map(4) of type (big_map nat nat)
 trace
-  - location: 12 (remaining gas: 1039990.064 units remaining)
+  - location: 12 (remaining gas: 1039990.019 units remaining)
     [ (Pair 1 {} None) ]
-  - location: 12 (remaining gas: 1039990.054 units remaining)
+  - location: 12 (remaining gas: 1039990.009 units remaining)
     [ 1
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039990.054 units remaining)
+  - location: 13 (remaining gas: 1039990.009 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039990.044 units remaining)
+  - location: 15 (remaining gas: 1039989.999 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039990.034 units remaining)
+  - location: 16 (remaining gas: 1039989.989 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039990.014 units remaining)
+  - location: 13 (remaining gas: 1039989.969 units remaining)
     [ 1
       {}
       {} ]
-  - location: 17 (remaining gas: 1039989.308 units remaining)
+  - location: 17 (remaining gas: 1039989.263 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039989.298 units remaining)
+  - location: 18 (remaining gas: 1039989.253 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039989.288 units remaining)
+  - location: 19 (remaining gas: 1039989.243 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039989.278 units remaining)
+  - location: 20 (remaining gas: 1039989.233 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039989.268 units remaining)
+  - location: 21 (remaining gas: 1039989.223 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039989.258 units remaining)
+  - location: 23 (remaining gas: 1039989.213 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out"
index e19fa67c77606ee0d05aeadd862e7a849c5a2863..1ab6775f8ebe23a103c0dfa640c794abdf3aa837 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out"	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (remaining gas: 1039987.648 units remaining)
+  - location: 12 (remaining gas: 1039987.603 units remaining)
     [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039987.638 units remaining)
+  - location: 12 (remaining gas: 1039987.593 units remaining)
     [ "baz"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039987.638 units remaining)
+  - location: 13 (remaining gas: 1039987.593 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039987.628 units remaining)
+  - location: 15 (remaining gas: 1039987.583 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039987.618 units remaining)
+  - location: 16 (remaining gas: 1039987.573 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039987.598 units remaining)
+  - location: 13 (remaining gas: 1039987.553 units remaining)
     [ "baz"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039986.684 units remaining)
+  - location: 17 (remaining gas: 1039986.639 units remaining)
     [ False
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039986.674 units remaining)
+  - location: 18 (remaining gas: 1039986.629 units remaining)
     [ (Some False)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039986.664 units remaining)
+  - location: 19 (remaining gas: 1039986.619 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039986.654 units remaining)
+  - location: 20 (remaining gas: 1039986.609 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039986.644 units remaining)
+  - location: 21 (remaining gas: 1039986.599 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039986.634 units remaining)
+  - location: 23 (remaining gas: 1039986.589 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out"
index a844a69a7f6ffa982fb7f06921a296c726433f71..d628acbea8ebdc738a07a4937ee998daccec6a56 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out"	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (remaining gas: 1039987.648 units remaining)
+  - location: 12 (remaining gas: 1039987.603 units remaining)
     [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039987.638 units remaining)
+  - location: 12 (remaining gas: 1039987.593 units remaining)
     [ "foo"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039987.638 units remaining)
+  - location: 13 (remaining gas: 1039987.593 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039987.628 units remaining)
+  - location: 15 (remaining gas: 1039987.583 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039987.618 units remaining)
+  - location: 16 (remaining gas: 1039987.573 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039987.598 units remaining)
+  - location: 13 (remaining gas: 1039987.553 units remaining)
     [ "foo"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039986.684 units remaining)
+  - location: 17 (remaining gas: 1039986.639 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039986.674 units remaining)
+  - location: 18 (remaining gas: 1039986.629 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039986.664 units remaining)
+  - location: 19 (remaining gas: 1039986.619 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039986.654 units remaining)
+  - location: 20 (remaining gas: 1039986.609 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039986.644 units remaining)
+  - location: 21 (remaining gas: 1039986.599 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039986.634 units remaining)
+  - location: 23 (remaining gas: 1039986.589 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out"
index 931e1a08f50260cf4bca8da6a11ab0aba157d48e..b27a35c6a148940dac63707d1d144e5405233b83 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out"	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (remaining gas: 1039987.648 units remaining)
+  - location: 12 (remaining gas: 1039987.603 units remaining)
     [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039987.638 units remaining)
+  - location: 12 (remaining gas: 1039987.593 units remaining)
     [ "bar"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039987.638 units remaining)
+  - location: 13 (remaining gas: 1039987.593 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039987.628 units remaining)
+  - location: 15 (remaining gas: 1039987.583 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039987.618 units remaining)
+  - location: 16 (remaining gas: 1039987.573 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039987.598 units remaining)
+  - location: 13 (remaining gas: 1039987.553 units remaining)
     [ "bar"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039986.684 units remaining)
+  - location: 17 (remaining gas: 1039986.639 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039986.674 units remaining)
+  - location: 18 (remaining gas: 1039986.629 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039986.664 units remaining)
+  - location: 19 (remaining gas: 1039986.619 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039986.654 units remaining)
+  - location: 20 (remaining gas: 1039986.609 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039986.644 units remaining)
+  - location: 21 (remaining gas: 1039986.599 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039986.634 units remaining)
+  - location: 23 (remaining gas: 1039986.589 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out"
index 7c4fb2f56a213e2b3cb6f8ce3810882bcec56c04..989285c34c8247925ba52b188b2244ed1f6ba6c6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out"	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["foo"] to 0
 trace
-  - location: 12 (remaining gas: 1039988.853 units remaining)
+  - location: 12 (remaining gas: 1039988.808 units remaining)
     [ (Pair "foo" { Elt "foo" 0 } None) ]
-  - location: 12 (remaining gas: 1039988.843 units remaining)
+  - location: 12 (remaining gas: 1039988.798 units remaining)
     [ "foo"
       (Pair { Elt "foo" 0 } None) ]
-  - location: 13 (remaining gas: 1039988.843 units remaining)
+  - location: 13 (remaining gas: 1039988.798 units remaining)
     [ (Pair { Elt "foo" 0 } None) ]
-  - location: 15 (remaining gas: 1039988.833 units remaining)
+  - location: 15 (remaining gas: 1039988.788 units remaining)
     [ { Elt "foo" 0 } ]
-  - location: 16 (remaining gas: 1039988.823 units remaining)
+  - location: 16 (remaining gas: 1039988.778 units remaining)
     [ { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 13 (remaining gas: 1039988.803 units remaining)
+  - location: 13 (remaining gas: 1039988.758 units remaining)
     [ "foo"
       { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 17 (remaining gas: 1039987.890 units remaining)
+  - location: 17 (remaining gas: 1039987.845 units remaining)
     [ True
       { Elt "foo" 0 } ]
-  - location: 18 (remaining gas: 1039987.880 units remaining)
+  - location: 18 (remaining gas: 1039987.835 units remaining)
     [ (Some True)
       { Elt "foo" 0 } ]
-  - location: 19 (remaining gas: 1039987.870 units remaining)
+  - location: 19 (remaining gas: 1039987.825 units remaining)
     [ { Elt "foo" 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.860 units remaining)
+  - location: 20 (remaining gas: 1039987.815 units remaining)
     [ (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.850 units remaining)
+  - location: 21 (remaining gas: 1039987.805 units remaining)
     [ {}
       (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.840 units remaining)
+  - location: 23 (remaining gas: 1039987.795 units remaining)
     [ (Pair {} { Elt "foo" 0 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out"
index 80513c7a3771b912c6e16e3d95e38d77076587c2..51ddfc7e33af673b1dd8f51dec1e79a8a6d20113 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out"	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["foo"] to 1
 trace
-  - location: 12 (remaining gas: 1039988.853 units remaining)
+  - location: 12 (remaining gas: 1039988.808 units remaining)
     [ (Pair "bar" { Elt "foo" 1 } None) ]
-  - location: 12 (remaining gas: 1039988.843 units remaining)
+  - location: 12 (remaining gas: 1039988.798 units remaining)
     [ "bar"
       (Pair { Elt "foo" 1 } None) ]
-  - location: 13 (remaining gas: 1039988.843 units remaining)
+  - location: 13 (remaining gas: 1039988.798 units remaining)
     [ (Pair { Elt "foo" 1 } None) ]
-  - location: 15 (remaining gas: 1039988.833 units remaining)
+  - location: 15 (remaining gas: 1039988.788 units remaining)
     [ { Elt "foo" 1 } ]
-  - location: 16 (remaining gas: 1039988.823 units remaining)
+  - location: 16 (remaining gas: 1039988.778 units remaining)
     [ { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 13 (remaining gas: 1039988.803 units remaining)
+  - location: 13 (remaining gas: 1039988.758 units remaining)
     [ "bar"
       { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 17 (remaining gas: 1039987.890 units remaining)
+  - location: 17 (remaining gas: 1039987.845 units remaining)
     [ False
       { Elt "foo" 1 } ]
-  - location: 18 (remaining gas: 1039987.880 units remaining)
+  - location: 18 (remaining gas: 1039987.835 units remaining)
     [ (Some False)
       { Elt "foo" 1 } ]
-  - location: 19 (remaining gas: 1039987.870 units remaining)
+  - location: 19 (remaining gas: 1039987.825 units remaining)
     [ { Elt "foo" 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.860 units remaining)
+  - location: 20 (remaining gas: 1039987.815 units remaining)
     [ (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039987.850 units remaining)
+  - location: 21 (remaining gas: 1039987.805 units remaining)
     [ {}
       (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039987.840 units remaining)
+  - location: 23 (remaining gas: 1039987.795 units remaining)
     [ (Pair {} { Elt "foo" 1 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out"
index 0b9ee76da49ec660c54ebaa90d56e64646838963..e0f143337d8c2dae5a7c4cbe05e266cca429d2e8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   New map(4) of type (big_map string nat)
 trace
-  - location: 12 (remaining gas: 1039990.020 units remaining)
+  - location: 12 (remaining gas: 1039989.975 units remaining)
     [ (Pair "bar" {} None) ]
-  - location: 12 (remaining gas: 1039990.010 units remaining)
+  - location: 12 (remaining gas: 1039989.965 units remaining)
     [ "bar"
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039990.010 units remaining)
+  - location: 13 (remaining gas: 1039989.965 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039990 units remaining)
+  - location: 15 (remaining gas: 1039989.955 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039989.990 units remaining)
+  - location: 16 (remaining gas: 1039989.945 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039989.970 units remaining)
+  - location: 13 (remaining gas: 1039989.925 units remaining)
     [ "bar"
       {}
       {} ]
-  - location: 17 (remaining gas: 1039989.059 units remaining)
+  - location: 17 (remaining gas: 1039989.014 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039989.049 units remaining)
+  - location: 18 (remaining gas: 1039989.004 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039989.039 units remaining)
+  - location: 19 (remaining gas: 1039988.994 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039989.029 units remaining)
+  - location: 20 (remaining gas: 1039988.984 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039989.019 units remaining)
+  - location: 21 (remaining gas: 1039988.974 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039989.009 units remaining)
+  - location: 23 (remaining gas: 1039988.964 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out
index 5f7201f57623fd5c1029fde593110d0aeee18655..e532e407fb385e2c84742def66f1acbe3a3b1c94 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out	
@@ -12,326 +12,326 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039969.827 units remaining)
+  - location: 10 (remaining gas: 1039969.017 units remaining)
     [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ]
-  - location: 10 (remaining gas: 1039969.817 units remaining)
+  - location: 10 (remaining gas: 1039969.007 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 11 (remaining gas: 1039969.807 units remaining)
+  - location: 11 (remaining gas: 1039968.997 units remaining)
     [ {}
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 14 (remaining gas: 1039969.807 units remaining)
+  - location: 14 (remaining gas: 1039968.997 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 16 (remaining gas: 1039969.797 units remaining)
+  - location: 16 (remaining gas: 1039968.987 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039969.797 units remaining)
+  - location: 17 (remaining gas: 1039968.987 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039969.787 units remaining)
+  - location: 19 (remaining gas: 1039968.977 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039969.777 units remaining)
+  - location: 17 (remaining gas: 1039968.967 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039969.767 units remaining)
+  - location: 19 (remaining gas: 1039968.957 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039969.757 units remaining)
+  - location: 17 (remaining gas: 1039968.947 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039969.747 units remaining)
+  - location: 19 (remaining gas: 1039968.937 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039969.737 units remaining)
+  - location: 17 (remaining gas: 1039968.927 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039969.727 units remaining)
+  - location: 19 (remaining gas: 1039968.917 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039969.717 units remaining)
+  - location: 17 (remaining gas: 1039968.907 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039969.707 units remaining)
+  - location: 19 (remaining gas: 1039968.897 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039969.697 units remaining)
+  - location: 17 (remaining gas: 1039968.887 units remaining)
     [ { False ; False ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 14 (remaining gas: 1039969.677 units remaining)
+  - location: 14 (remaining gas: 1039968.867 units remaining)
     [ {}
       { False ; False ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 20 (remaining gas: 1039969.667 units remaining)
+  - location: 20 (remaining gas: 1039968.857 units remaining)
     [ { False ; False ; True ; False ; False }
       {}
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 21 (remaining gas: 1039969.657 units remaining)
+  - location: 21 (remaining gas: 1039968.847 units remaining)
     [ { { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 22 (remaining gas: 1039969.657 units remaining)
+  - location: 22 (remaining gas: 1039968.847 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 24 (remaining gas: 1039969.647 units remaining)
+  - location: 24 (remaining gas: 1039968.837 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039969.647 units remaining)
+  - location: 25 (remaining gas: 1039968.837 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039969.637 units remaining)
+  - location: 27 (remaining gas: 1039968.827 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039969.627 units remaining)
+  - location: 25 (remaining gas: 1039968.817 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039969.617 units remaining)
+  - location: 27 (remaining gas: 1039968.807 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039969.607 units remaining)
+  - location: 25 (remaining gas: 1039968.797 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039969.597 units remaining)
+  - location: 27 (remaining gas: 1039968.787 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039969.587 units remaining)
+  - location: 25 (remaining gas: 1039968.777 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039969.577 units remaining)
+  - location: 27 (remaining gas: 1039968.767 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039969.567 units remaining)
+  - location: 25 (remaining gas: 1039968.757 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039969.557 units remaining)
+  - location: 27 (remaining gas: 1039968.747 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039969.547 units remaining)
+  - location: 25 (remaining gas: 1039968.737 units remaining)
     [ { True ; True ; False ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 22 (remaining gas: 1039969.527 units remaining)
+  - location: 22 (remaining gas: 1039968.717 units remaining)
     [ { { False ; False ; True ; False ; False } }
       { True ; True ; False ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 28 (remaining gas: 1039969.517 units remaining)
+  - location: 28 (remaining gas: 1039968.707 units remaining)
     [ { True ; True ; False ; True ; True }
       { { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 29 (remaining gas: 1039969.507 units remaining)
+  - location: 29 (remaining gas: 1039968.697 units remaining)
     [ { { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 30 (remaining gas: 1039969.507 units remaining)
+  - location: 30 (remaining gas: 1039968.697 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 32 (remaining gas: 1039969.497 units remaining)
+  - location: 32 (remaining gas: 1039968.687 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039969.497 units remaining)
+  - location: 33 (remaining gas: 1039968.687 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039969.487 units remaining)
+  - location: 35 (remaining gas: 1039968.677 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039969.477 units remaining)
+  - location: 33 (remaining gas: 1039968.667 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039969.467 units remaining)
+  - location: 35 (remaining gas: 1039968.657 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039969.457 units remaining)
+  - location: 33 (remaining gas: 1039968.647 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039969.447 units remaining)
+  - location: 35 (remaining gas: 1039968.637 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039969.437 units remaining)
+  - location: 33 (remaining gas: 1039968.627 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039969.427 units remaining)
+  - location: 35 (remaining gas: 1039968.617 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039969.417 units remaining)
+  - location: 33 (remaining gas: 1039968.607 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039969.407 units remaining)
+  - location: 35 (remaining gas: 1039968.597 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039969.397 units remaining)
+  - location: 33 (remaining gas: 1039968.587 units remaining)
     [ { True ; True ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 30 (remaining gas: 1039969.377 units remaining)
+  - location: 30 (remaining gas: 1039968.567 units remaining)
     [ { { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { True ; True ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 36 (remaining gas: 1039969.367 units remaining)
+  - location: 36 (remaining gas: 1039968.557 units remaining)
     [ { True ; True ; True ; False ; False }
       { { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 37 (remaining gas: 1039969.357 units remaining)
+  - location: 37 (remaining gas: 1039968.547 units remaining)
     [ { { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 38 (remaining gas: 1039969.357 units remaining)
+  - location: 38 (remaining gas: 1039968.547 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 40 (remaining gas: 1039969.347 units remaining)
+  - location: 40 (remaining gas: 1039968.537 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039969.347 units remaining)
+  - location: 41 (remaining gas: 1039968.537 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039969.337 units remaining)
+  - location: 43 (remaining gas: 1039968.527 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039969.327 units remaining)
+  - location: 41 (remaining gas: 1039968.517 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039969.317 units remaining)
+  - location: 43 (remaining gas: 1039968.507 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039969.307 units remaining)
+  - location: 41 (remaining gas: 1039968.497 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039969.297 units remaining)
+  - location: 43 (remaining gas: 1039968.487 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039969.287 units remaining)
+  - location: 41 (remaining gas: 1039968.477 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039969.277 units remaining)
+  - location: 43 (remaining gas: 1039968.467 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039969.267 units remaining)
+  - location: 41 (remaining gas: 1039968.457 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039969.257 units remaining)
+  - location: 43 (remaining gas: 1039968.447 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039969.247 units remaining)
+  - location: 41 (remaining gas: 1039968.437 units remaining)
     [ { True ; True ; False ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 38 (remaining gas: 1039969.227 units remaining)
+  - location: 38 (remaining gas: 1039968.417 units remaining)
     [ { { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { True ; True ; False ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 44 (remaining gas: 1039969.217 units remaining)
+  - location: 44 (remaining gas: 1039968.407 units remaining)
     [ { True ; True ; False ; False ; False }
       { { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 45 (remaining gas: 1039969.207 units remaining)
+  - location: 45 (remaining gas: 1039968.397 units remaining)
     [ { { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 46 (remaining gas: 1039969.207 units remaining)
+  - location: 46 (remaining gas: 1039968.397 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 48 (remaining gas: 1039969.197 units remaining)
+  - location: 48 (remaining gas: 1039968.387 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039969.197 units remaining)
+  - location: 49 (remaining gas: 1039968.387 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039969.187 units remaining)
+  - location: 51 (remaining gas: 1039968.377 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039969.177 units remaining)
+  - location: 49 (remaining gas: 1039968.367 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039969.167 units remaining)
+  - location: 51 (remaining gas: 1039968.357 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039969.157 units remaining)
+  - location: 49 (remaining gas: 1039968.347 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039969.147 units remaining)
+  - location: 51 (remaining gas: 1039968.337 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039969.137 units remaining)
+  - location: 49 (remaining gas: 1039968.327 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039969.127 units remaining)
+  - location: 51 (remaining gas: 1039968.317 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039969.117 units remaining)
+  - location: 49 (remaining gas: 1039968.307 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039969.107 units remaining)
+  - location: 51 (remaining gas: 1039968.297 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039969.097 units remaining)
+  - location: 49 (remaining gas: 1039968.287 units remaining)
     [ { False ; False ; True ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 46 (remaining gas: 1039969.077 units remaining)
+  - location: 46 (remaining gas: 1039968.267 units remaining)
     [ { { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { False ; False ; True ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 52 (remaining gas: 1039969.067 units remaining)
+  - location: 52 (remaining gas: 1039968.257 units remaining)
     [ { False ; False ; True ; True ; True }
       { { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 53 (remaining gas: 1039969.057 units remaining)
+  - location: 53 (remaining gas: 1039968.247 units remaining)
     [ { { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 54 (remaining gas: 1039969.057 units remaining)
+  - location: 54 (remaining gas: 1039968.247 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 56 (remaining gas: 1039969.057 units remaining)
+  - location: 56 (remaining gas: 1039968.247 units remaining)
     [ -9999999 ]
-  - location: 58 (remaining gas: 1039969.047 units remaining)
+  - location: 58 (remaining gas: 1039968.237 units remaining)
     [ False ]
-  - location: 56 (remaining gas: 1039969.037 units remaining)
+  - location: 56 (remaining gas: 1039968.227 units remaining)
     [ -1 ]
-  - location: 58 (remaining gas: 1039969.027 units remaining)
+  - location: 58 (remaining gas: 1039968.217 units remaining)
     [ False ]
-  - location: 56 (remaining gas: 1039969.017 units remaining)
+  - location: 56 (remaining gas: 1039968.207 units remaining)
     [ 0 ]
-  - location: 58 (remaining gas: 1039969.007 units remaining)
+  - location: 58 (remaining gas: 1039968.197 units remaining)
     [ False ]
-  - location: 56 (remaining gas: 1039968.997 units remaining)
+  - location: 56 (remaining gas: 1039968.187 units remaining)
     [ 1 ]
-  - location: 58 (remaining gas: 1039968.987 units remaining)
+  - location: 58 (remaining gas: 1039968.177 units remaining)
     [ True ]
-  - location: 56 (remaining gas: 1039968.977 units remaining)
+  - location: 56 (remaining gas: 1039968.167 units remaining)
     [ 9999999 ]
-  - location: 58 (remaining gas: 1039968.967 units remaining)
+  - location: 58 (remaining gas: 1039968.157 units remaining)
     [ True ]
-  - location: 56 (remaining gas: 1039968.957 units remaining)
+  - location: 56 (remaining gas: 1039968.147 units remaining)
     [ { False ; False ; False ; True ; True } ]
-  - location: 54 (remaining gas: 1039968.937 units remaining)
+  - location: 54 (remaining gas: 1039968.127 units remaining)
     [ { { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { False ; False ; False ; True ; True } ]
-  - location: 59 (remaining gas: 1039968.927 units remaining)
+  - location: 59 (remaining gas: 1039968.117 units remaining)
     [ { False ; False ; False ; True ; True }
       { { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } } ]
-  - location: 60 (remaining gas: 1039968.917 units remaining)
+  - location: 60 (remaining gas: 1039968.107 units remaining)
     [ { { False ; False ; False ; True ; True } ;
         { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } } ]
-  - location: 61 (remaining gas: 1039968.907 units remaining)
+  - location: 61 (remaining gas: 1039968.097 units remaining)
     [ {}
       { { False ; False ; False ; True ; True } ;
         { False ; False ; True ; True ; True } ;
@@ -339,7 +339,7 @@ trace
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } } ]
-  - location: 63 (remaining gas: 1039968.897 units remaining)
+  - location: 63 (remaining gas: 1039968.087 units remaining)
     [ (Pair {}
             { { False ; False ; False ; True ; True } ;
               { False ; False ; True ; True ; True } ;
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out"
index 603b1953a6b71d51f2dc8b992b78c4fc9c62eb5b..c40ddb4dfdcc9865c925512d76789c5ee88b70ac 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out"	
@@ -7,113 +7,113 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039988.887 units remaining)
+  - location: 8 (remaining gas: 1039988.842 units remaining)
     [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ]
-  - location: 8 (remaining gas: 1039988.877 units remaining)
+  - location: 8 (remaining gas: 1039988.832 units remaining)
     [ { "Hello" ; " " ; "World" ; "!" } ]
-  - location: 9 (remaining gas: 1039988.867 units remaining)
+  - location: 9 (remaining gas: 1039988.822 units remaining)
     [ ""
       { "Hello" ; " " ; "World" ; "!" } ]
-  - location: 12 (remaining gas: 1039988.857 units remaining)
+  - location: 12 (remaining gas: 1039988.812 units remaining)
     [ { "Hello" ; " " ; "World" ; "!" }
       "" ]
-  - location: 13 (remaining gas: 1039988.857 units remaining)
+  - location: 13 (remaining gas: 1039988.812 units remaining)
     [ "Hello"
       "" ]
-  - location: 15 (remaining gas: 1039988.847 units remaining)
+  - location: 15 (remaining gas: 1039988.802 units remaining)
     [ ""
       "Hello" ]
-  - location: 16 (remaining gas: 1039988.847 units remaining)
+  - location: 16 (remaining gas: 1039988.802 units remaining)
     [ "Hello" ]
-  - location: 18 (remaining gas: 1039988.837 units remaining)
+  - location: 18 (remaining gas: 1039988.792 units remaining)
     [ {}
       "Hello" ]
-  - location: 20 (remaining gas: 1039988.827 units remaining)
+  - location: 20 (remaining gas: 1039988.782 units remaining)
     [ "Hello"
       {} ]
-  - location: 21 (remaining gas: 1039988.817 units remaining)
+  - location: 21 (remaining gas: 1039988.772 units remaining)
     [ { "Hello" } ]
-  - location: 16 (remaining gas: 1039988.797 units remaining)
+  - location: 16 (remaining gas: 1039988.752 units remaining)
     [ ""
       { "Hello" } ]
-  - location: 22 (remaining gas: 1039988.787 units remaining)
+  - location: 22 (remaining gas: 1039988.742 units remaining)
     [ { "" ; "Hello" } ]
-  - location: 23 (remaining gas: 1039988.667 units remaining)
+  - location: 23 (remaining gas: 1039988.622 units remaining)
     [ "Hello" ]
-  - location: 13 (remaining gas: 1039988.657 units remaining)
+  - location: 13 (remaining gas: 1039988.612 units remaining)
     [ " "
       "Hello" ]
-  - location: 15 (remaining gas: 1039988.647 units remaining)
+  - location: 15 (remaining gas: 1039988.602 units remaining)
     [ "Hello"
       " " ]
-  - location: 16 (remaining gas: 1039988.647 units remaining)
+  - location: 16 (remaining gas: 1039988.602 units remaining)
     [ " " ]
-  - location: 18 (remaining gas: 1039988.637 units remaining)
+  - location: 18 (remaining gas: 1039988.592 units remaining)
     [ {}
       " " ]
-  - location: 20 (remaining gas: 1039988.627 units remaining)
+  - location: 20 (remaining gas: 1039988.582 units remaining)
     [ " "
       {} ]
-  - location: 21 (remaining gas: 1039988.617 units remaining)
+  - location: 21 (remaining gas: 1039988.572 units remaining)
     [ { " " } ]
-  - location: 16 (remaining gas: 1039988.597 units remaining)
+  - location: 16 (remaining gas: 1039988.552 units remaining)
     [ "Hello"
       { " " } ]
-  - location: 22 (remaining gas: 1039988.587 units remaining)
+  - location: 22 (remaining gas: 1039988.542 units remaining)
     [ { "Hello" ; " " } ]
-  - location: 23 (remaining gas: 1039988.467 units remaining)
+  - location: 23 (remaining gas: 1039988.422 units remaining)
     [ "Hello " ]
-  - location: 13 (remaining gas: 1039988.457 units remaining)
+  - location: 13 (remaining gas: 1039988.412 units remaining)
     [ "World"
       "Hello " ]
-  - location: 15 (remaining gas: 1039988.447 units remaining)
+  - location: 15 (remaining gas: 1039988.402 units remaining)
     [ "Hello "
       "World" ]
-  - location: 16 (remaining gas: 1039988.447 units remaining)
+  - location: 16 (remaining gas: 1039988.402 units remaining)
     [ "World" ]
-  - location: 18 (remaining gas: 1039988.437 units remaining)
+  - location: 18 (remaining gas: 1039988.392 units remaining)
     [ {}
       "World" ]
-  - location: 20 (remaining gas: 1039988.427 units remaining)
+  - location: 20 (remaining gas: 1039988.382 units remaining)
     [ "World"
       {} ]
-  - location: 21 (remaining gas: 1039988.417 units remaining)
+  - location: 21 (remaining gas: 1039988.372 units remaining)
     [ { "World" } ]
-  - location: 16 (remaining gas: 1039988.397 units remaining)
+  - location: 16 (remaining gas: 1039988.352 units remaining)
     [ "Hello "
       { "World" } ]
-  - location: 22 (remaining gas: 1039988.387 units remaining)
+  - location: 22 (remaining gas: 1039988.342 units remaining)
     [ { "Hello " ; "World" } ]
-  - location: 23 (remaining gas: 1039988.266 units remaining)
+  - location: 23 (remaining gas: 1039988.221 units remaining)
     [ "Hello World" ]
-  - location: 13 (remaining gas: 1039988.256 units remaining)
+  - location: 13 (remaining gas: 1039988.211 units remaining)
     [ "!"
       "Hello World" ]
-  - location: 15 (remaining gas: 1039988.246 units remaining)
+  - location: 15 (remaining gas: 1039988.201 units remaining)
     [ "Hello World"
       "!" ]
-  - location: 16 (remaining gas: 1039988.246 units remaining)
+  - location: 16 (remaining gas: 1039988.201 units remaining)
     [ "!" ]
-  - location: 18 (remaining gas: 1039988.236 units remaining)
+  - location: 18 (remaining gas: 1039988.191 units remaining)
     [ {}
       "!" ]
-  - location: 20 (remaining gas: 1039988.226 units remaining)
+  - location: 20 (remaining gas: 1039988.181 units remaining)
     [ "!"
       {} ]
-  - location: 21 (remaining gas: 1039988.216 units remaining)
+  - location: 21 (remaining gas: 1039988.171 units remaining)
     [ { "!" } ]
-  - location: 16 (remaining gas: 1039988.196 units remaining)
+  - location: 16 (remaining gas: 1039988.151 units remaining)
     [ "Hello World"
       { "!" } ]
-  - location: 22 (remaining gas: 1039988.186 units remaining)
+  - location: 22 (remaining gas: 1039988.141 units remaining)
     [ { "Hello World" ; "!" } ]
-  - location: 23 (remaining gas: 1039988.065 units remaining)
+  - location: 23 (remaining gas: 1039988.020 units remaining)
     [ "Hello World!" ]
-  - location: 13 (remaining gas: 1039988.055 units remaining)
+  - location: 13 (remaining gas: 1039988.010 units remaining)
     [ "Hello World!" ]
-  - location: 24 (remaining gas: 1039988.045 units remaining)
+  - location: 24 (remaining gas: 1039988 units remaining)
     [ {}
       "Hello World!" ]
-  - location: 26 (remaining gas: 1039988.035 units remaining)
+  - location: 26 (remaining gas: 1039987.990 units remaining)
     [ (Pair {} "Hello World!") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out"
index 46ec78f6cfa2d6e209ea15c227e6fa9ed4d10f69..6d5c6cd1f8bf3e8e5727c38fe91c4dc94467b76f 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out"	
@@ -7,90 +7,90 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039989.091 units remaining)
+  - location: 8 (remaining gas: 1039989.046 units remaining)
     [ (Pair { "a" ; "b" ; "c" } "") ]
-  - location: 8 (remaining gas: 1039989.081 units remaining)
+  - location: 8 (remaining gas: 1039989.036 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 9 (remaining gas: 1039989.071 units remaining)
+  - location: 9 (remaining gas: 1039989.026 units remaining)
     [ ""
       { "a" ; "b" ; "c" } ]
-  - location: 12 (remaining gas: 1039989.061 units remaining)
+  - location: 12 (remaining gas: 1039989.016 units remaining)
     [ { "a" ; "b" ; "c" }
       "" ]
-  - location: 13 (remaining gas: 1039989.061 units remaining)
+  - location: 13 (remaining gas: 1039989.016 units remaining)
     [ "a"
       "" ]
-  - location: 15 (remaining gas: 1039989.051 units remaining)
+  - location: 15 (remaining gas: 1039989.006 units remaining)
     [ ""
       "a" ]
-  - location: 16 (remaining gas: 1039989.051 units remaining)
+  - location: 16 (remaining gas: 1039989.006 units remaining)
     [ "a" ]
-  - location: 18 (remaining gas: 1039989.041 units remaining)
+  - location: 18 (remaining gas: 1039988.996 units remaining)
     [ {}
       "a" ]
-  - location: 20 (remaining gas: 1039989.031 units remaining)
+  - location: 20 (remaining gas: 1039988.986 units remaining)
     [ "a"
       {} ]
-  - location: 21 (remaining gas: 1039989.021 units remaining)
+  - location: 21 (remaining gas: 1039988.976 units remaining)
     [ { "a" } ]
-  - location: 16 (remaining gas: 1039989.001 units remaining)
+  - location: 16 (remaining gas: 1039988.956 units remaining)
     [ ""
       { "a" } ]
-  - location: 22 (remaining gas: 1039988.991 units remaining)
+  - location: 22 (remaining gas: 1039988.946 units remaining)
     [ { "" ; "a" } ]
-  - location: 23 (remaining gas: 1039988.871 units remaining)
+  - location: 23 (remaining gas: 1039988.826 units remaining)
     [ "a" ]
-  - location: 13 (remaining gas: 1039988.861 units remaining)
+  - location: 13 (remaining gas: 1039988.816 units remaining)
     [ "b"
       "a" ]
-  - location: 15 (remaining gas: 1039988.851 units remaining)
+  - location: 15 (remaining gas: 1039988.806 units remaining)
     [ "a"
       "b" ]
-  - location: 16 (remaining gas: 1039988.851 units remaining)
+  - location: 16 (remaining gas: 1039988.806 units remaining)
     [ "b" ]
-  - location: 18 (remaining gas: 1039988.841 units remaining)
+  - location: 18 (remaining gas: 1039988.796 units remaining)
     [ {}
       "b" ]
-  - location: 20 (remaining gas: 1039988.831 units remaining)
+  - location: 20 (remaining gas: 1039988.786 units remaining)
     [ "b"
       {} ]
-  - location: 21 (remaining gas: 1039988.821 units remaining)
+  - location: 21 (remaining gas: 1039988.776 units remaining)
     [ { "b" } ]
-  - location: 16 (remaining gas: 1039988.801 units remaining)
+  - location: 16 (remaining gas: 1039988.756 units remaining)
     [ "a"
       { "b" } ]
-  - location: 22 (remaining gas: 1039988.791 units remaining)
+  - location: 22 (remaining gas: 1039988.746 units remaining)
     [ { "a" ; "b" } ]
-  - location: 23 (remaining gas: 1039988.671 units remaining)
+  - location: 23 (remaining gas: 1039988.626 units remaining)
     [ "ab" ]
-  - location: 13 (remaining gas: 1039988.661 units remaining)
+  - location: 13 (remaining gas: 1039988.616 units remaining)
     [ "c"
       "ab" ]
-  - location: 15 (remaining gas: 1039988.651 units remaining)
+  - location: 15 (remaining gas: 1039988.606 units remaining)
     [ "ab"
       "c" ]
-  - location: 16 (remaining gas: 1039988.651 units remaining)
+  - location: 16 (remaining gas: 1039988.606 units remaining)
     [ "c" ]
-  - location: 18 (remaining gas: 1039988.641 units remaining)
+  - location: 18 (remaining gas: 1039988.596 units remaining)
     [ {}
       "c" ]
-  - location: 20 (remaining gas: 1039988.631 units remaining)
+  - location: 20 (remaining gas: 1039988.586 units remaining)
     [ "c"
       {} ]
-  - location: 21 (remaining gas: 1039988.621 units remaining)
+  - location: 21 (remaining gas: 1039988.576 units remaining)
     [ { "c" } ]
-  - location: 16 (remaining gas: 1039988.601 units remaining)
+  - location: 16 (remaining gas: 1039988.556 units remaining)
     [ "ab"
       { "c" } ]
-  - location: 22 (remaining gas: 1039988.591 units remaining)
+  - location: 22 (remaining gas: 1039988.546 units remaining)
     [ { "ab" ; "c" } ]
-  - location: 23 (remaining gas: 1039988.471 units remaining)
+  - location: 23 (remaining gas: 1039988.426 units remaining)
     [ "abc" ]
-  - location: 13 (remaining gas: 1039988.461 units remaining)
+  - location: 13 (remaining gas: 1039988.416 units remaining)
     [ "abc" ]
-  - location: 24 (remaining gas: 1039988.451 units remaining)
+  - location: 24 (remaining gas: 1039988.406 units remaining)
     [ {}
       "abc" ]
-  - location: 26 (remaining gas: 1039988.441 units remaining)
+  - location: 26 (remaining gas: 1039988.396 units remaining)
     [ (Pair {} "abc") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out"
index d4cc08e50f7d5563da461dc3f07beb3310d13a5d..8f1cf7cbe5edeece0fe34b06ad583b6a75a2a6f2 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out"
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039989.463 units remaining)
+  - location: 8 (remaining gas: 1039989.418 units remaining)
     [ (Pair {} "") ]
-  - location: 8 (remaining gas: 1039989.453 units remaining)
+  - location: 8 (remaining gas: 1039989.408 units remaining)
     [ {} ]
-  - location: 9 (remaining gas: 1039989.443 units remaining)
+  - location: 9 (remaining gas: 1039989.398 units remaining)
     [ ""
       {} ]
-  - location: 12 (remaining gas: 1039989.433 units remaining)
+  - location: 12 (remaining gas: 1039989.388 units remaining)
     [ {}
       "" ]
-  - location: 13 (remaining gas: 1039989.433 units remaining)
+  - location: 13 (remaining gas: 1039989.388 units remaining)
     [ "" ]
-  - location: 24 (remaining gas: 1039989.423 units remaining)
+  - location: 24 (remaining gas: 1039989.378 units remaining)
     [ {}
       "" ]
-  - location: 26 (remaining gas: 1039989.413 units remaining)
+  - location: 26 (remaining gas: 1039989.368 units remaining)
     [ (Pair {} "") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out"
index bbfe73c43addd828c74c6e1221af0001c25bc153..87a4f1a7080206945265d1e86b2a5bc7250f739a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out"	
@@ -7,160 +7,160 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039967.659 units remaining)
+  - location: 12 (remaining gas: 1039967.344 units remaining)
     [ (Pair (Pair { "A" } { "B" }) None) ]
-  - location: 12 (remaining gas: 1039967.649 units remaining)
+  - location: 12 (remaining gas: 1039967.334 units remaining)
     [ (Pair { "A" } { "B" }) ]
-  - location: 13 (remaining gas: 1039967.639 units remaining)
+  - location: 13 (remaining gas: 1039967.324 units remaining)
     [ (Pair { "A" } { "B" })
       (Pair { "A" } { "B" }) ]
-  - location: 14 (remaining gas: 1039967.629 units remaining)
+  - location: 14 (remaining gas: 1039967.314 units remaining)
     [ { "A" }
       (Pair { "A" } { "B" }) ]
-  - location: 15 (remaining gas: 1039967.629 units remaining)
+  - location: 15 (remaining gas: 1039967.314 units remaining)
     [ (Pair { "A" } { "B" }) ]
-  - location: 17 (remaining gas: 1039967.619 units remaining)
+  - location: 17 (remaining gas: 1039967.304 units remaining)
     [ { "B" } ]
-  - location: 15 (remaining gas: 1039967.599 units remaining)
+  - location: 15 (remaining gas: 1039967.284 units remaining)
     [ { "A" }
       { "B" } ]
-  - location: 18 (remaining gas: 1039967.379 units remaining)
+  - location: 18 (remaining gas: 1039967.064 units remaining)
     [ {}
       { "A" }
       { "B" } ]
-  - location: 20 (remaining gas: 1039967.369 units remaining)
+  - location: 20 (remaining gas: 1039967.054 units remaining)
     [ { "A" }
       {}
       { "B" } ]
-  - location: 21 (remaining gas: 1039967.369 units remaining)
+  - location: 21 (remaining gas: 1039967.054 units remaining)
     [ "A"
       {}
       { "B" } ]
-  - location: 23 (remaining gas: 1039967.359 units remaining)
+  - location: 23 (remaining gas: 1039967.044 units remaining)
     [ (Pair "A" {})
       { "B" } ]
-  - location: 24 (remaining gas: 1039967.349 units remaining)
+  - location: 24 (remaining gas: 1039967.034 units remaining)
     [ (Pair "A" {})
       (Pair "A" {})
       { "B" } ]
-  - location: 25 (remaining gas: 1039967.339 units remaining)
+  - location: 25 (remaining gas: 1039967.024 units remaining)
     [ "A"
       (Pair "A" {})
       { "B" } ]
-  - location: 26 (remaining gas: 1039967.339 units remaining)
+  - location: 26 (remaining gas: 1039967.024 units remaining)
     [ (Pair "A" {})
       { "B" } ]
-  - location: 28 (remaining gas: 1039967.329 units remaining)
+  - location: 28 (remaining gas: 1039967.014 units remaining)
     [ {}
       { "B" } ]
-  - location: 26 (remaining gas: 1039967.309 units remaining)
+  - location: 26 (remaining gas: 1039966.994 units remaining)
     [ "A"
       {}
       { "B" } ]
-  - location: 29 (remaining gas: 1039967.299 units remaining)
+  - location: 29 (remaining gas: 1039966.984 units remaining)
     [ True
       "A"
       {}
       { "B" } ]
-  - location: 32 (remaining gas: 1039967.289 units remaining)
+  - location: 32 (remaining gas: 1039966.974 units remaining)
     [ "A"
       True
       {}
       { "B" } ]
-  - location: 33 (remaining gas: 1039967.157 units remaining)
+  - location: 33 (remaining gas: 1039966.842 units remaining)
     [ { "A" }
       { "B" } ]
-  - location: 21 (remaining gas: 1039967.147 units remaining)
+  - location: 21 (remaining gas: 1039966.832 units remaining)
     [ { "A" }
       { "B" } ]
-  - location: 34 (remaining gas: 1039967.137 units remaining)
+  - location: 34 (remaining gas: 1039966.822 units remaining)
     [ True
       { "A" }
       { "B" } ]
-  - location: 37 (remaining gas: 1039967.127 units remaining)
+  - location: 37 (remaining gas: 1039966.812 units remaining)
     [ { "A" }
       True
       { "B" } ]
-  - location: 38 (remaining gas: 1039967.117 units remaining)
+  - location: 38 (remaining gas: 1039966.802 units remaining)
     [ (Pair { "A" } True)
       { "B" } ]
-  - location: 39 (remaining gas: 1039967.107 units remaining)
+  - location: 39 (remaining gas: 1039966.792 units remaining)
     [ { "B" }
       (Pair { "A" } True) ]
-  - location: 40 (remaining gas: 1039967.107 units remaining)
+  - location: 40 (remaining gas: 1039966.792 units remaining)
     [ "B"
       (Pair { "A" } True) ]
-  - location: 42 (remaining gas: 1039967.097 units remaining)
+  - location: 42 (remaining gas: 1039966.782 units remaining)
     [ (Pair "B" { "A" } True) ]
-  - location: 43 (remaining gas: 1039967.087 units remaining)
+  - location: 43 (remaining gas: 1039966.772 units remaining)
     [ (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 44 (remaining gas: 1039967.077 units remaining)
+  - location: 44 (remaining gas: 1039966.762 units remaining)
     [ (Pair "B" { "A" } True)
       (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 45 (remaining gas: 1039967.067 units remaining)
+  - location: 45 (remaining gas: 1039966.752 units remaining)
     [ "B"
       (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 46 (remaining gas: 1039967.067 units remaining)
+  - location: 46 (remaining gas: 1039966.752 units remaining)
     [ (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 49 (remaining gas: 1039967.057 units remaining)
+  - location: 49 (remaining gas: 1039966.742 units remaining)
     [ (Pair { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 50 (remaining gas: 1039967.047 units remaining)
+  - location: 50 (remaining gas: 1039966.732 units remaining)
     [ { "A" }
       (Pair "B" { "A" } True) ]
-  - location: 51 (remaining gas: 1039967.047 units remaining)
+  - location: 51 (remaining gas: 1039966.732 units remaining)
     [ (Pair "B" { "A" } True) ]
-  - location: 54 (remaining gas: 1039967.037 units remaining)
+  - location: 54 (remaining gas: 1039966.722 units remaining)
     [ (Pair { "A" } True) ]
-  - location: 55 (remaining gas: 1039967.027 units remaining)
+  - location: 55 (remaining gas: 1039966.712 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039967.007 units remaining)
+  - location: 51 (remaining gas: 1039966.692 units remaining)
     [ { "A" }
       True ]
-  - location: 56 (remaining gas: 1039966.997 units remaining)
+  - location: 56 (remaining gas: 1039966.682 units remaining)
     [ { "A" }
       { "A" }
       True ]
-  - location: 46 (remaining gas: 1039966.977 units remaining)
+  - location: 46 (remaining gas: 1039966.662 units remaining)
     [ "B"
       { "A" }
       { "A" }
       True ]
-  - location: 57 (remaining gas: 1039966.860 units remaining)
+  - location: 57 (remaining gas: 1039966.545 units remaining)
     [ False
       { "A" }
       True ]
-  - location: 58 (remaining gas: 1039966.860 units remaining)
+  - location: 58 (remaining gas: 1039966.545 units remaining)
     [ { "A" }
       True ]
-  - location: 60 (remaining gas: 1039966.850 units remaining)
+  - location: 60 (remaining gas: 1039966.535 units remaining)
     [ True
       { "A" } ]
-  - location: 58 (remaining gas: 1039966.830 units remaining)
+  - location: 58 (remaining gas: 1039966.515 units remaining)
     [ False
       True
       { "A" } ]
-  - location: 61 (remaining gas: 1039966.820 units remaining)
+  - location: 61 (remaining gas: 1039966.505 units remaining)
     [ False
       { "A" } ]
-  - location: 62 (remaining gas: 1039966.810 units remaining)
+  - location: 62 (remaining gas: 1039966.495 units remaining)
     [ { "A" }
       False ]
-  - location: 63 (remaining gas: 1039966.800 units remaining)
+  - location: 63 (remaining gas: 1039966.485 units remaining)
     [ (Pair { "A" } False) ]
-  - location: 40 (remaining gas: 1039966.790 units remaining)
+  - location: 40 (remaining gas: 1039966.475 units remaining)
     [ (Pair { "A" } False) ]
-  - location: 64 (remaining gas: 1039966.780 units remaining)
+  - location: 64 (remaining gas: 1039966.465 units remaining)
     [ False ]
-  - location: 65 (remaining gas: 1039966.770 units remaining)
+  - location: 65 (remaining gas: 1039966.455 units remaining)
     [ (Some False) ]
-  - location: 66 (remaining gas: 1039966.760 units remaining)
+  - location: 66 (remaining gas: 1039966.445 units remaining)
     [ {}
       (Some False) ]
-  - location: 68 (remaining gas: 1039966.750 units remaining)
+  - location: 68 (remaining gas: 1039966.435 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out"
index 832acec67f288d1b4e2d13e46d59e0f52f58ca76..0ced07320139a2d9e8446158ec183bbe6a463469 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out"	
@@ -7,404 +7,404 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039966.979 units remaining)
+  - location: 12 (remaining gas: 1039966.664 units remaining)
     [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ]
-  - location: 12 (remaining gas: 1039966.969 units remaining)
+  - location: 12 (remaining gas: 1039966.654 units remaining)
     [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 13 (remaining gas: 1039966.959 units remaining)
+  - location: 13 (remaining gas: 1039966.644 units remaining)
     [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" })
       (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 14 (remaining gas: 1039966.949 units remaining)
+  - location: 14 (remaining gas: 1039966.634 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 15 (remaining gas: 1039966.949 units remaining)
+  - location: 15 (remaining gas: 1039966.634 units remaining)
     [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 17 (remaining gas: 1039966.939 units remaining)
+  - location: 17 (remaining gas: 1039966.624 units remaining)
     [ { "B" ; "C" ; "asdf" } ]
-  - location: 15 (remaining gas: 1039966.919 units remaining)
+  - location: 15 (remaining gas: 1039966.604 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 18 (remaining gas: 1039966.699 units remaining)
+  - location: 18 (remaining gas: 1039966.384 units remaining)
     [ {}
       { "B" ; "B" ; "asdf" ; "C" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 20 (remaining gas: 1039966.689 units remaining)
+  - location: 20 (remaining gas: 1039966.374 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039966.689 units remaining)
+  - location: 21 (remaining gas: 1039966.374 units remaining)
     [ "B"
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039966.679 units remaining)
+  - location: 23 (remaining gas: 1039966.364 units remaining)
     [ (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039966.669 units remaining)
+  - location: 24 (remaining gas: 1039966.354 units remaining)
     [ (Pair "B" {})
       (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039966.659 units remaining)
+  - location: 25 (remaining gas: 1039966.344 units remaining)
     [ "B"
       (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039966.659 units remaining)
+  - location: 26 (remaining gas: 1039966.344 units remaining)
     [ (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039966.649 units remaining)
+  - location: 28 (remaining gas: 1039966.334 units remaining)
     [ {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039966.629 units remaining)
+  - location: 26 (remaining gas: 1039966.314 units remaining)
     [ "B"
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039966.619 units remaining)
+  - location: 29 (remaining gas: 1039966.304 units remaining)
     [ True
       "B"
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039966.609 units remaining)
+  - location: 32 (remaining gas: 1039966.294 units remaining)
     [ "B"
       True
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039966.477 units remaining)
+  - location: 33 (remaining gas: 1039966.162 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039966.467 units remaining)
+  - location: 21 (remaining gas: 1039966.152 units remaining)
     [ "B"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039966.457 units remaining)
+  - location: 23 (remaining gas: 1039966.142 units remaining)
     [ (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039966.447 units remaining)
+  - location: 24 (remaining gas: 1039966.132 units remaining)
     [ (Pair "B" { "B" })
       (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039966.437 units remaining)
+  - location: 25 (remaining gas: 1039966.122 units remaining)
     [ "B"
       (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039966.437 units remaining)
+  - location: 26 (remaining gas: 1039966.122 units remaining)
     [ (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039966.427 units remaining)
+  - location: 28 (remaining gas: 1039966.112 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039966.407 units remaining)
+  - location: 26 (remaining gas: 1039966.092 units remaining)
     [ "B"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039966.397 units remaining)
+  - location: 29 (remaining gas: 1039966.082 units remaining)
     [ True
       "B"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039966.387 units remaining)
+  - location: 32 (remaining gas: 1039966.072 units remaining)
     [ "B"
       True
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039966.253 units remaining)
+  - location: 33 (remaining gas: 1039965.938 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039966.243 units remaining)
+  - location: 21 (remaining gas: 1039965.928 units remaining)
     [ "asdf"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039966.233 units remaining)
+  - location: 23 (remaining gas: 1039965.918 units remaining)
     [ (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039966.223 units remaining)
+  - location: 24 (remaining gas: 1039965.908 units remaining)
     [ (Pair "asdf" { "B" })
       (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039966.213 units remaining)
+  - location: 25 (remaining gas: 1039965.898 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039966.213 units remaining)
+  - location: 26 (remaining gas: 1039965.898 units remaining)
     [ (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039966.203 units remaining)
+  - location: 28 (remaining gas: 1039965.888 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039966.183 units remaining)
+  - location: 26 (remaining gas: 1039965.868 units remaining)
     [ "asdf"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039966.173 units remaining)
+  - location: 29 (remaining gas: 1039965.858 units remaining)
     [ True
       "asdf"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039966.163 units remaining)
+  - location: 32 (remaining gas: 1039965.848 units remaining)
     [ "asdf"
       True
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039966.017 units remaining)
+  - location: 33 (remaining gas: 1039965.702 units remaining)
     [ { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039966.007 units remaining)
+  - location: 21 (remaining gas: 1039965.692 units remaining)
     [ "C"
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039965.997 units remaining)
+  - location: 23 (remaining gas: 1039965.682 units remaining)
     [ (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039965.987 units remaining)
+  - location: 24 (remaining gas: 1039965.672 units remaining)
     [ (Pair "C" { "B" ; "asdf" })
       (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039965.977 units remaining)
+  - location: 25 (remaining gas: 1039965.662 units remaining)
     [ "C"
       (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039965.977 units remaining)
+  - location: 26 (remaining gas: 1039965.662 units remaining)
     [ (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039965.967 units remaining)
+  - location: 28 (remaining gas: 1039965.652 units remaining)
     [ { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039965.947 units remaining)
+  - location: 26 (remaining gas: 1039965.632 units remaining)
     [ "C"
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039965.937 units remaining)
+  - location: 29 (remaining gas: 1039965.622 units remaining)
     [ True
       "C"
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039965.927 units remaining)
+  - location: 32 (remaining gas: 1039965.612 units remaining)
     [ "C"
       True
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039965.791 units remaining)
+  - location: 33 (remaining gas: 1039965.476 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039965.781 units remaining)
+  - location: 21 (remaining gas: 1039965.466 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 34 (remaining gas: 1039965.771 units remaining)
+  - location: 34 (remaining gas: 1039965.456 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 37 (remaining gas: 1039965.761 units remaining)
+  - location: 37 (remaining gas: 1039965.446 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 38 (remaining gas: 1039965.751 units remaining)
+  - location: 38 (remaining gas: 1039965.436 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       { "B" ; "C" ; "asdf" } ]
-  - location: 39 (remaining gas: 1039965.741 units remaining)
+  - location: 39 (remaining gas: 1039965.426 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039965.741 units remaining)
+  - location: 40 (remaining gas: 1039965.426 units remaining)
     [ "B"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039965.731 units remaining)
+  - location: 42 (remaining gas: 1039965.416 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039965.721 units remaining)
+  - location: 43 (remaining gas: 1039965.406 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039965.711 units remaining)
+  - location: 44 (remaining gas: 1039965.396 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039965.701 units remaining)
+  - location: 45 (remaining gas: 1039965.386 units remaining)
     [ "B"
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039965.701 units remaining)
+  - location: 46 (remaining gas: 1039965.386 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039965.691 units remaining)
+  - location: 49 (remaining gas: 1039965.376 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039965.681 units remaining)
+  - location: 50 (remaining gas: 1039965.366 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039965.681 units remaining)
+  - location: 51 (remaining gas: 1039965.366 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039965.671 units remaining)
+  - location: 54 (remaining gas: 1039965.356 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039965.661 units remaining)
+  - location: 55 (remaining gas: 1039965.346 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039965.641 units remaining)
+  - location: 51 (remaining gas: 1039965.326 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039965.631 units remaining)
+  - location: 56 (remaining gas: 1039965.316 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039965.611 units remaining)
+  - location: 46 (remaining gas: 1039965.296 units remaining)
     [ "B"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039965.493 units remaining)
+  - location: 57 (remaining gas: 1039965.178 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039965.493 units remaining)
+  - location: 58 (remaining gas: 1039965.178 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039965.483 units remaining)
+  - location: 60 (remaining gas: 1039965.168 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039965.463 units remaining)
+  - location: 58 (remaining gas: 1039965.148 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039965.453 units remaining)
+  - location: 61 (remaining gas: 1039965.138 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039965.443 units remaining)
+  - location: 62 (remaining gas: 1039965.128 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039965.433 units remaining)
+  - location: 63 (remaining gas: 1039965.118 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039965.423 units remaining)
+  - location: 40 (remaining gas: 1039965.108 units remaining)
     [ "C"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039965.413 units remaining)
+  - location: 42 (remaining gas: 1039965.098 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039965.403 units remaining)
+  - location: 43 (remaining gas: 1039965.088 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039965.393 units remaining)
+  - location: 44 (remaining gas: 1039965.078 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039965.383 units remaining)
+  - location: 45 (remaining gas: 1039965.068 units remaining)
     [ "C"
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039965.383 units remaining)
+  - location: 46 (remaining gas: 1039965.068 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039965.373 units remaining)
+  - location: 49 (remaining gas: 1039965.058 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039965.363 units remaining)
+  - location: 50 (remaining gas: 1039965.048 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039965.363 units remaining)
+  - location: 51 (remaining gas: 1039965.048 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039965.353 units remaining)
+  - location: 54 (remaining gas: 1039965.038 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039965.343 units remaining)
+  - location: 55 (remaining gas: 1039965.028 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039965.323 units remaining)
+  - location: 51 (remaining gas: 1039965.008 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039965.313 units remaining)
+  - location: 56 (remaining gas: 1039964.998 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039965.293 units remaining)
+  - location: 46 (remaining gas: 1039964.978 units remaining)
     [ "C"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039965.175 units remaining)
+  - location: 57 (remaining gas: 1039964.860 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039965.175 units remaining)
+  - location: 58 (remaining gas: 1039964.860 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039965.165 units remaining)
+  - location: 60 (remaining gas: 1039964.850 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039965.145 units remaining)
+  - location: 58 (remaining gas: 1039964.830 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039965.135 units remaining)
+  - location: 61 (remaining gas: 1039964.820 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039965.125 units remaining)
+  - location: 62 (remaining gas: 1039964.810 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039965.115 units remaining)
+  - location: 63 (remaining gas: 1039964.800 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039965.105 units remaining)
+  - location: 40 (remaining gas: 1039964.790 units remaining)
     [ "asdf"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039965.095 units remaining)
+  - location: 42 (remaining gas: 1039964.780 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039965.085 units remaining)
+  - location: 43 (remaining gas: 1039964.770 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039965.075 units remaining)
+  - location: 44 (remaining gas: 1039964.760 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039965.065 units remaining)
+  - location: 45 (remaining gas: 1039964.750 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039965.065 units remaining)
+  - location: 46 (remaining gas: 1039964.750 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039965.055 units remaining)
+  - location: 49 (remaining gas: 1039964.740 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039965.045 units remaining)
+  - location: 50 (remaining gas: 1039964.730 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039965.045 units remaining)
+  - location: 51 (remaining gas: 1039964.730 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039965.035 units remaining)
+  - location: 54 (remaining gas: 1039964.720 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039965.025 units remaining)
+  - location: 55 (remaining gas: 1039964.710 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039965.005 units remaining)
+  - location: 51 (remaining gas: 1039964.690 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039964.995 units remaining)
+  - location: 56 (remaining gas: 1039964.680 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039964.975 units remaining)
+  - location: 46 (remaining gas: 1039964.660 units remaining)
     [ "asdf"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039964.848 units remaining)
+  - location: 57 (remaining gas: 1039964.533 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039964.848 units remaining)
+  - location: 58 (remaining gas: 1039964.533 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039964.838 units remaining)
+  - location: 60 (remaining gas: 1039964.523 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039964.818 units remaining)
+  - location: 58 (remaining gas: 1039964.503 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039964.808 units remaining)
+  - location: 61 (remaining gas: 1039964.493 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039964.798 units remaining)
+  - location: 62 (remaining gas: 1039964.483 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039964.788 units remaining)
+  - location: 63 (remaining gas: 1039964.473 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039964.778 units remaining)
+  - location: 40 (remaining gas: 1039964.463 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 64 (remaining gas: 1039964.768 units remaining)
+  - location: 64 (remaining gas: 1039964.453 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039964.758 units remaining)
+  - location: 65 (remaining gas: 1039964.443 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039964.748 units remaining)
+  - location: 66 (remaining gas: 1039964.433 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039964.738 units remaining)
+  - location: 68 (remaining gas: 1039964.423 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out"
index f7b47e071df1afc61e669cf6c7ace8b6d27d6cd1..b357d66acddbcd12494f3203ea765adfa68b4291 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out"	
@@ -7,431 +7,431 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039966.979 units remaining)
+  - location: 12 (remaining gas: 1039966.664 units remaining)
     [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ]
-  - location: 12 (remaining gas: 1039966.969 units remaining)
+  - location: 12 (remaining gas: 1039966.654 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 13 (remaining gas: 1039966.959 units remaining)
+  - location: 13 (remaining gas: 1039966.644 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" })
       (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 14 (remaining gas: 1039966.949 units remaining)
+  - location: 14 (remaining gas: 1039966.634 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 15 (remaining gas: 1039966.949 units remaining)
+  - location: 15 (remaining gas: 1039966.634 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 17 (remaining gas: 1039966.939 units remaining)
+  - location: 17 (remaining gas: 1039966.624 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 15 (remaining gas: 1039966.919 units remaining)
+  - location: 15 (remaining gas: 1039966.604 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 18 (remaining gas: 1039966.699 units remaining)
+  - location: 18 (remaining gas: 1039966.384 units remaining)
     [ {}
       { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 20 (remaining gas: 1039966.689 units remaining)
+  - location: 20 (remaining gas: 1039966.374 units remaining)
     [ { "B" ; "C" ; "asdf" }
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039966.689 units remaining)
+  - location: 21 (remaining gas: 1039966.374 units remaining)
     [ "B"
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 23 (remaining gas: 1039966.679 units remaining)
+  - location: 23 (remaining gas: 1039966.364 units remaining)
     [ (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 24 (remaining gas: 1039966.669 units remaining)
+  - location: 24 (remaining gas: 1039966.354 units remaining)
     [ (Pair "B" {})
       (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 25 (remaining gas: 1039966.659 units remaining)
+  - location: 25 (remaining gas: 1039966.344 units remaining)
     [ "B"
       (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039966.659 units remaining)
+  - location: 26 (remaining gas: 1039966.344 units remaining)
     [ (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 28 (remaining gas: 1039966.649 units remaining)
+  - location: 28 (remaining gas: 1039966.334 units remaining)
     [ {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039966.629 units remaining)
+  - location: 26 (remaining gas: 1039966.314 units remaining)
     [ "B"
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 29 (remaining gas: 1039966.619 units remaining)
+  - location: 29 (remaining gas: 1039966.304 units remaining)
     [ True
       "B"
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 32 (remaining gas: 1039966.609 units remaining)
+  - location: 32 (remaining gas: 1039966.294 units remaining)
     [ "B"
       True
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (remaining gas: 1039966.477 units remaining)
+  - location: 33 (remaining gas: 1039966.162 units remaining)
     [ { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039966.467 units remaining)
+  - location: 21 (remaining gas: 1039966.152 units remaining)
     [ "C"
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 23 (remaining gas: 1039966.457 units remaining)
+  - location: 23 (remaining gas: 1039966.142 units remaining)
     [ (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 24 (remaining gas: 1039966.447 units remaining)
+  - location: 24 (remaining gas: 1039966.132 units remaining)
     [ (Pair "C" { "B" })
       (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 25 (remaining gas: 1039966.437 units remaining)
+  - location: 25 (remaining gas: 1039966.122 units remaining)
     [ "C"
       (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039966.437 units remaining)
+  - location: 26 (remaining gas: 1039966.122 units remaining)
     [ (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 28 (remaining gas: 1039966.427 units remaining)
+  - location: 28 (remaining gas: 1039966.112 units remaining)
     [ { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039966.407 units remaining)
+  - location: 26 (remaining gas: 1039966.092 units remaining)
     [ "C"
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 29 (remaining gas: 1039966.397 units remaining)
+  - location: 29 (remaining gas: 1039966.082 units remaining)
     [ True
       "C"
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 32 (remaining gas: 1039966.387 units remaining)
+  - location: 32 (remaining gas: 1039966.072 units remaining)
     [ "C"
       True
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (remaining gas: 1039966.253 units remaining)
+  - location: 33 (remaining gas: 1039965.938 units remaining)
     [ { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039966.243 units remaining)
+  - location: 21 (remaining gas: 1039965.928 units remaining)
     [ "asdf"
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 23 (remaining gas: 1039966.233 units remaining)
+  - location: 23 (remaining gas: 1039965.918 units remaining)
     [ (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 24 (remaining gas: 1039966.223 units remaining)
+  - location: 24 (remaining gas: 1039965.908 units remaining)
     [ (Pair "asdf" { "B" ; "C" })
       (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 25 (remaining gas: 1039966.213 units remaining)
+  - location: 25 (remaining gas: 1039965.898 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039966.213 units remaining)
+  - location: 26 (remaining gas: 1039965.898 units remaining)
     [ (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 28 (remaining gas: 1039966.203 units remaining)
+  - location: 28 (remaining gas: 1039965.888 units remaining)
     [ { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039966.183 units remaining)
+  - location: 26 (remaining gas: 1039965.868 units remaining)
     [ "asdf"
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 29 (remaining gas: 1039966.173 units remaining)
+  - location: 29 (remaining gas: 1039965.858 units remaining)
     [ True
       "asdf"
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 32 (remaining gas: 1039966.163 units remaining)
+  - location: 32 (remaining gas: 1039965.848 units remaining)
     [ "asdf"
       True
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (remaining gas: 1039966.009 units remaining)
+  - location: 33 (remaining gas: 1039965.694 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039965.999 units remaining)
+  - location: 21 (remaining gas: 1039965.684 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 34 (remaining gas: 1039965.989 units remaining)
+  - location: 34 (remaining gas: 1039965.674 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 37 (remaining gas: 1039965.979 units remaining)
+  - location: 37 (remaining gas: 1039965.664 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 38 (remaining gas: 1039965.969 units remaining)
+  - location: 38 (remaining gas: 1039965.654 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 39 (remaining gas: 1039965.959 units remaining)
+  - location: 39 (remaining gas: 1039965.644 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039965.959 units remaining)
+  - location: 40 (remaining gas: 1039965.644 units remaining)
     [ "B"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039965.949 units remaining)
+  - location: 42 (remaining gas: 1039965.634 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039965.939 units remaining)
+  - location: 43 (remaining gas: 1039965.624 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039965.929 units remaining)
+  - location: 44 (remaining gas: 1039965.614 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039965.919 units remaining)
+  - location: 45 (remaining gas: 1039965.604 units remaining)
     [ "B"
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039965.919 units remaining)
+  - location: 46 (remaining gas: 1039965.604 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039965.909 units remaining)
+  - location: 49 (remaining gas: 1039965.594 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039965.899 units remaining)
+  - location: 50 (remaining gas: 1039965.584 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039965.899 units remaining)
+  - location: 51 (remaining gas: 1039965.584 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039965.889 units remaining)
+  - location: 54 (remaining gas: 1039965.574 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039965.879 units remaining)
+  - location: 55 (remaining gas: 1039965.564 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039965.859 units remaining)
+  - location: 51 (remaining gas: 1039965.544 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039965.849 units remaining)
+  - location: 56 (remaining gas: 1039965.534 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039965.829 units remaining)
+  - location: 46 (remaining gas: 1039965.514 units remaining)
     [ "B"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039965.711 units remaining)
+  - location: 57 (remaining gas: 1039965.396 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039965.711 units remaining)
+  - location: 58 (remaining gas: 1039965.396 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039965.701 units remaining)
+  - location: 60 (remaining gas: 1039965.386 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039965.681 units remaining)
+  - location: 58 (remaining gas: 1039965.366 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039965.671 units remaining)
+  - location: 61 (remaining gas: 1039965.356 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039965.661 units remaining)
+  - location: 62 (remaining gas: 1039965.346 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039965.651 units remaining)
+  - location: 63 (remaining gas: 1039965.336 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039965.641 units remaining)
+  - location: 40 (remaining gas: 1039965.326 units remaining)
     [ "B"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039965.631 units remaining)
+  - location: 42 (remaining gas: 1039965.316 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039965.621 units remaining)
+  - location: 43 (remaining gas: 1039965.306 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039965.611 units remaining)
+  - location: 44 (remaining gas: 1039965.296 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039965.601 units remaining)
+  - location: 45 (remaining gas: 1039965.286 units remaining)
     [ "B"
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039965.601 units remaining)
+  - location: 46 (remaining gas: 1039965.286 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039965.591 units remaining)
+  - location: 49 (remaining gas: 1039965.276 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039965.581 units remaining)
+  - location: 50 (remaining gas: 1039965.266 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039965.581 units remaining)
+  - location: 51 (remaining gas: 1039965.266 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039965.571 units remaining)
+  - location: 54 (remaining gas: 1039965.256 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039965.561 units remaining)
+  - location: 55 (remaining gas: 1039965.246 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039965.541 units remaining)
+  - location: 51 (remaining gas: 1039965.226 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039965.531 units remaining)
+  - location: 56 (remaining gas: 1039965.216 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039965.511 units remaining)
+  - location: 46 (remaining gas: 1039965.196 units remaining)
     [ "B"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039965.393 units remaining)
+  - location: 57 (remaining gas: 1039965.078 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039965.393 units remaining)
+  - location: 58 (remaining gas: 1039965.078 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039965.383 units remaining)
+  - location: 60 (remaining gas: 1039965.068 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039965.363 units remaining)
+  - location: 58 (remaining gas: 1039965.048 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039965.353 units remaining)
+  - location: 61 (remaining gas: 1039965.038 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039965.343 units remaining)
+  - location: 62 (remaining gas: 1039965.028 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039965.333 units remaining)
+  - location: 63 (remaining gas: 1039965.018 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039965.323 units remaining)
+  - location: 40 (remaining gas: 1039965.008 units remaining)
     [ "asdf"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039965.313 units remaining)
+  - location: 42 (remaining gas: 1039964.998 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039965.303 units remaining)
+  - location: 43 (remaining gas: 1039964.988 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039965.293 units remaining)
+  - location: 44 (remaining gas: 1039964.978 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039965.283 units remaining)
+  - location: 45 (remaining gas: 1039964.968 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039965.283 units remaining)
+  - location: 46 (remaining gas: 1039964.968 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039965.273 units remaining)
+  - location: 49 (remaining gas: 1039964.958 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039965.263 units remaining)
+  - location: 50 (remaining gas: 1039964.948 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039965.263 units remaining)
+  - location: 51 (remaining gas: 1039964.948 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039965.253 units remaining)
+  - location: 54 (remaining gas: 1039964.938 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039965.243 units remaining)
+  - location: 55 (remaining gas: 1039964.928 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039965.223 units remaining)
+  - location: 51 (remaining gas: 1039964.908 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039965.213 units remaining)
+  - location: 56 (remaining gas: 1039964.898 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039965.193 units remaining)
+  - location: 46 (remaining gas: 1039964.878 units remaining)
     [ "asdf"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039965.066 units remaining)
+  - location: 57 (remaining gas: 1039964.751 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039965.066 units remaining)
+  - location: 58 (remaining gas: 1039964.751 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039965.056 units remaining)
+  - location: 60 (remaining gas: 1039964.741 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039965.036 units remaining)
+  - location: 58 (remaining gas: 1039964.721 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039965.026 units remaining)
+  - location: 61 (remaining gas: 1039964.711 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039965.016 units remaining)
+  - location: 62 (remaining gas: 1039964.701 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039965.006 units remaining)
+  - location: 63 (remaining gas: 1039964.691 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039964.996 units remaining)
+  - location: 40 (remaining gas: 1039964.681 units remaining)
     [ "C"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039964.986 units remaining)
+  - location: 42 (remaining gas: 1039964.671 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039964.976 units remaining)
+  - location: 43 (remaining gas: 1039964.661 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039964.966 units remaining)
+  - location: 44 (remaining gas: 1039964.651 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039964.956 units remaining)
+  - location: 45 (remaining gas: 1039964.641 units remaining)
     [ "C"
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039964.956 units remaining)
+  - location: 46 (remaining gas: 1039964.641 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039964.946 units remaining)
+  - location: 49 (remaining gas: 1039964.631 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039964.936 units remaining)
+  - location: 50 (remaining gas: 1039964.621 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039964.936 units remaining)
+  - location: 51 (remaining gas: 1039964.621 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039964.926 units remaining)
+  - location: 54 (remaining gas: 1039964.611 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039964.916 units remaining)
+  - location: 55 (remaining gas: 1039964.601 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039964.896 units remaining)
+  - location: 51 (remaining gas: 1039964.581 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039964.886 units remaining)
+  - location: 56 (remaining gas: 1039964.571 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039964.866 units remaining)
+  - location: 46 (remaining gas: 1039964.551 units remaining)
     [ "C"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039964.748 units remaining)
+  - location: 57 (remaining gas: 1039964.433 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039964.748 units remaining)
+  - location: 58 (remaining gas: 1039964.433 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039964.738 units remaining)
+  - location: 60 (remaining gas: 1039964.423 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039964.718 units remaining)
+  - location: 58 (remaining gas: 1039964.403 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039964.708 units remaining)
+  - location: 61 (remaining gas: 1039964.393 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039964.698 units remaining)
+  - location: 62 (remaining gas: 1039964.383 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039964.688 units remaining)
+  - location: 63 (remaining gas: 1039964.373 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039964.678 units remaining)
+  - location: 40 (remaining gas: 1039964.363 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 64 (remaining gas: 1039964.668 units remaining)
+  - location: 64 (remaining gas: 1039964.353 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039964.658 units remaining)
+  - location: 65 (remaining gas: 1039964.343 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039964.648 units remaining)
+  - location: 66 (remaining gas: 1039964.333 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039964.638 units remaining)
+  - location: 68 (remaining gas: 1039964.323 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out"
index ac348c3d72e518ceffc38efa87a5807290491c26..664fc2d0e41df5f8db262ec3a59bebfd99b7413d 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out"	
@@ -7,160 +7,160 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039967.659 units remaining)
+  - location: 12 (remaining gas: 1039967.344 units remaining)
     [ (Pair (Pair { "B" } { "B" }) None) ]
-  - location: 12 (remaining gas: 1039967.649 units remaining)
+  - location: 12 (remaining gas: 1039967.334 units remaining)
     [ (Pair { "B" } { "B" }) ]
-  - location: 13 (remaining gas: 1039967.639 units remaining)
+  - location: 13 (remaining gas: 1039967.324 units remaining)
     [ (Pair { "B" } { "B" })
       (Pair { "B" } { "B" }) ]
-  - location: 14 (remaining gas: 1039967.629 units remaining)
+  - location: 14 (remaining gas: 1039967.314 units remaining)
     [ { "B" }
       (Pair { "B" } { "B" }) ]
-  - location: 15 (remaining gas: 1039967.629 units remaining)
+  - location: 15 (remaining gas: 1039967.314 units remaining)
     [ (Pair { "B" } { "B" }) ]
-  - location: 17 (remaining gas: 1039967.619 units remaining)
+  - location: 17 (remaining gas: 1039967.304 units remaining)
     [ { "B" } ]
-  - location: 15 (remaining gas: 1039967.599 units remaining)
+  - location: 15 (remaining gas: 1039967.284 units remaining)
     [ { "B" }
       { "B" } ]
-  - location: 18 (remaining gas: 1039967.379 units remaining)
+  - location: 18 (remaining gas: 1039967.064 units remaining)
     [ {}
       { "B" }
       { "B" } ]
-  - location: 20 (remaining gas: 1039967.369 units remaining)
+  - location: 20 (remaining gas: 1039967.054 units remaining)
     [ { "B" }
       {}
       { "B" } ]
-  - location: 21 (remaining gas: 1039967.369 units remaining)
+  - location: 21 (remaining gas: 1039967.054 units remaining)
     [ "B"
       {}
       { "B" } ]
-  - location: 23 (remaining gas: 1039967.359 units remaining)
+  - location: 23 (remaining gas: 1039967.044 units remaining)
     [ (Pair "B" {})
       { "B" } ]
-  - location: 24 (remaining gas: 1039967.349 units remaining)
+  - location: 24 (remaining gas: 1039967.034 units remaining)
     [ (Pair "B" {})
       (Pair "B" {})
       { "B" } ]
-  - location: 25 (remaining gas: 1039967.339 units remaining)
+  - location: 25 (remaining gas: 1039967.024 units remaining)
     [ "B"
       (Pair "B" {})
       { "B" } ]
-  - location: 26 (remaining gas: 1039967.339 units remaining)
+  - location: 26 (remaining gas: 1039967.024 units remaining)
     [ (Pair "B" {})
       { "B" } ]
-  - location: 28 (remaining gas: 1039967.329 units remaining)
+  - location: 28 (remaining gas: 1039967.014 units remaining)
     [ {}
       { "B" } ]
-  - location: 26 (remaining gas: 1039967.309 units remaining)
+  - location: 26 (remaining gas: 1039966.994 units remaining)
     [ "B"
       {}
       { "B" } ]
-  - location: 29 (remaining gas: 1039967.299 units remaining)
+  - location: 29 (remaining gas: 1039966.984 units remaining)
     [ True
       "B"
       {}
       { "B" } ]
-  - location: 32 (remaining gas: 1039967.289 units remaining)
+  - location: 32 (remaining gas: 1039966.974 units remaining)
     [ "B"
       True
       {}
       { "B" } ]
-  - location: 33 (remaining gas: 1039967.157 units remaining)
+  - location: 33 (remaining gas: 1039966.842 units remaining)
     [ { "B" }
       { "B" } ]
-  - location: 21 (remaining gas: 1039967.147 units remaining)
+  - location: 21 (remaining gas: 1039966.832 units remaining)
     [ { "B" }
       { "B" } ]
-  - location: 34 (remaining gas: 1039967.137 units remaining)
+  - location: 34 (remaining gas: 1039966.822 units remaining)
     [ True
       { "B" }
       { "B" } ]
-  - location: 37 (remaining gas: 1039967.127 units remaining)
+  - location: 37 (remaining gas: 1039966.812 units remaining)
     [ { "B" }
       True
       { "B" } ]
-  - location: 38 (remaining gas: 1039967.117 units remaining)
+  - location: 38 (remaining gas: 1039966.802 units remaining)
     [ (Pair { "B" } True)
       { "B" } ]
-  - location: 39 (remaining gas: 1039967.107 units remaining)
+  - location: 39 (remaining gas: 1039966.792 units remaining)
     [ { "B" }
       (Pair { "B" } True) ]
-  - location: 40 (remaining gas: 1039967.107 units remaining)
+  - location: 40 (remaining gas: 1039966.792 units remaining)
     [ "B"
       (Pair { "B" } True) ]
-  - location: 42 (remaining gas: 1039967.097 units remaining)
+  - location: 42 (remaining gas: 1039966.782 units remaining)
     [ (Pair "B" { "B" } True) ]
-  - location: 43 (remaining gas: 1039967.087 units remaining)
+  - location: 43 (remaining gas: 1039966.772 units remaining)
     [ (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 44 (remaining gas: 1039967.077 units remaining)
+  - location: 44 (remaining gas: 1039966.762 units remaining)
     [ (Pair "B" { "B" } True)
       (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 45 (remaining gas: 1039967.067 units remaining)
+  - location: 45 (remaining gas: 1039966.752 units remaining)
     [ "B"
       (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 46 (remaining gas: 1039967.067 units remaining)
+  - location: 46 (remaining gas: 1039966.752 units remaining)
     [ (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 49 (remaining gas: 1039967.057 units remaining)
+  - location: 49 (remaining gas: 1039966.742 units remaining)
     [ (Pair { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 50 (remaining gas: 1039967.047 units remaining)
+  - location: 50 (remaining gas: 1039966.732 units remaining)
     [ { "B" }
       (Pair "B" { "B" } True) ]
-  - location: 51 (remaining gas: 1039967.047 units remaining)
+  - location: 51 (remaining gas: 1039966.732 units remaining)
     [ (Pair "B" { "B" } True) ]
-  - location: 54 (remaining gas: 1039967.037 units remaining)
+  - location: 54 (remaining gas: 1039966.722 units remaining)
     [ (Pair { "B" } True) ]
-  - location: 55 (remaining gas: 1039967.027 units remaining)
+  - location: 55 (remaining gas: 1039966.712 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039967.007 units remaining)
+  - location: 51 (remaining gas: 1039966.692 units remaining)
     [ { "B" }
       True ]
-  - location: 56 (remaining gas: 1039966.997 units remaining)
+  - location: 56 (remaining gas: 1039966.682 units remaining)
     [ { "B" }
       { "B" }
       True ]
-  - location: 46 (remaining gas: 1039966.977 units remaining)
+  - location: 46 (remaining gas: 1039966.662 units remaining)
     [ "B"
       { "B" }
       { "B" }
       True ]
-  - location: 57 (remaining gas: 1039966.860 units remaining)
+  - location: 57 (remaining gas: 1039966.545 units remaining)
     [ True
       { "B" }
       True ]
-  - location: 58 (remaining gas: 1039966.860 units remaining)
+  - location: 58 (remaining gas: 1039966.545 units remaining)
     [ { "B" }
       True ]
-  - location: 60 (remaining gas: 1039966.850 units remaining)
+  - location: 60 (remaining gas: 1039966.535 units remaining)
     [ True
       { "B" } ]
-  - location: 58 (remaining gas: 1039966.830 units remaining)
+  - location: 58 (remaining gas: 1039966.515 units remaining)
     [ True
       True
       { "B" } ]
-  - location: 61 (remaining gas: 1039966.820 units remaining)
+  - location: 61 (remaining gas: 1039966.505 units remaining)
     [ True
       { "B" } ]
-  - location: 62 (remaining gas: 1039966.810 units remaining)
+  - location: 62 (remaining gas: 1039966.495 units remaining)
     [ { "B" }
       True ]
-  - location: 63 (remaining gas: 1039966.800 units remaining)
+  - location: 63 (remaining gas: 1039966.485 units remaining)
     [ (Pair { "B" } True) ]
-  - location: 40 (remaining gas: 1039966.790 units remaining)
+  - location: 40 (remaining gas: 1039966.475 units remaining)
     [ (Pair { "B" } True) ]
-  - location: 64 (remaining gas: 1039966.780 units remaining)
+  - location: 64 (remaining gas: 1039966.465 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039966.770 units remaining)
+  - location: 65 (remaining gas: 1039966.455 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039966.760 units remaining)
+  - location: 66 (remaining gas: 1039966.445 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039966.750 units remaining)
+  - location: 68 (remaining gas: 1039966.435 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out"
index a8029fcf201042602707c83dffee6e1cf393fcc0..d9072895d0df31d76c9a2f8686e0080d1bacfc5a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out"	
@@ -7,160 +7,160 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039967.659 units remaining)
+  - location: 12 (remaining gas: 1039967.344 units remaining)
     [ (Pair (Pair { "c" } { "B" }) None) ]
-  - location: 12 (remaining gas: 1039967.649 units remaining)
+  - location: 12 (remaining gas: 1039967.334 units remaining)
     [ (Pair { "c" } { "B" }) ]
-  - location: 13 (remaining gas: 1039967.639 units remaining)
+  - location: 13 (remaining gas: 1039967.324 units remaining)
     [ (Pair { "c" } { "B" })
       (Pair { "c" } { "B" }) ]
-  - location: 14 (remaining gas: 1039967.629 units remaining)
+  - location: 14 (remaining gas: 1039967.314 units remaining)
     [ { "c" }
       (Pair { "c" } { "B" }) ]
-  - location: 15 (remaining gas: 1039967.629 units remaining)
+  - location: 15 (remaining gas: 1039967.314 units remaining)
     [ (Pair { "c" } { "B" }) ]
-  - location: 17 (remaining gas: 1039967.619 units remaining)
+  - location: 17 (remaining gas: 1039967.304 units remaining)
     [ { "B" } ]
-  - location: 15 (remaining gas: 1039967.599 units remaining)
+  - location: 15 (remaining gas: 1039967.284 units remaining)
     [ { "c" }
       { "B" } ]
-  - location: 18 (remaining gas: 1039967.379 units remaining)
+  - location: 18 (remaining gas: 1039967.064 units remaining)
     [ {}
       { "c" }
       { "B" } ]
-  - location: 20 (remaining gas: 1039967.369 units remaining)
+  - location: 20 (remaining gas: 1039967.054 units remaining)
     [ { "c" }
       {}
       { "B" } ]
-  - location: 21 (remaining gas: 1039967.369 units remaining)
+  - location: 21 (remaining gas: 1039967.054 units remaining)
     [ "c"
       {}
       { "B" } ]
-  - location: 23 (remaining gas: 1039967.359 units remaining)
+  - location: 23 (remaining gas: 1039967.044 units remaining)
     [ (Pair "c" {})
       { "B" } ]
-  - location: 24 (remaining gas: 1039967.349 units remaining)
+  - location: 24 (remaining gas: 1039967.034 units remaining)
     [ (Pair "c" {})
       (Pair "c" {})
       { "B" } ]
-  - location: 25 (remaining gas: 1039967.339 units remaining)
+  - location: 25 (remaining gas: 1039967.024 units remaining)
     [ "c"
       (Pair "c" {})
       { "B" } ]
-  - location: 26 (remaining gas: 1039967.339 units remaining)
+  - location: 26 (remaining gas: 1039967.024 units remaining)
     [ (Pair "c" {})
       { "B" } ]
-  - location: 28 (remaining gas: 1039967.329 units remaining)
+  - location: 28 (remaining gas: 1039967.014 units remaining)
     [ {}
       { "B" } ]
-  - location: 26 (remaining gas: 1039967.309 units remaining)
+  - location: 26 (remaining gas: 1039966.994 units remaining)
     [ "c"
       {}
       { "B" } ]
-  - location: 29 (remaining gas: 1039967.299 units remaining)
+  - location: 29 (remaining gas: 1039966.984 units remaining)
     [ True
       "c"
       {}
       { "B" } ]
-  - location: 32 (remaining gas: 1039967.289 units remaining)
+  - location: 32 (remaining gas: 1039966.974 units remaining)
     [ "c"
       True
       {}
       { "B" } ]
-  - location: 33 (remaining gas: 1039967.157 units remaining)
+  - location: 33 (remaining gas: 1039966.842 units remaining)
     [ { "c" }
       { "B" } ]
-  - location: 21 (remaining gas: 1039967.147 units remaining)
+  - location: 21 (remaining gas: 1039966.832 units remaining)
     [ { "c" }
       { "B" } ]
-  - location: 34 (remaining gas: 1039967.137 units remaining)
+  - location: 34 (remaining gas: 1039966.822 units remaining)
     [ True
       { "c" }
       { "B" } ]
-  - location: 37 (remaining gas: 1039967.127 units remaining)
+  - location: 37 (remaining gas: 1039966.812 units remaining)
     [ { "c" }
       True
       { "B" } ]
-  - location: 38 (remaining gas: 1039967.117 units remaining)
+  - location: 38 (remaining gas: 1039966.802 units remaining)
     [ (Pair { "c" } True)
       { "B" } ]
-  - location: 39 (remaining gas: 1039967.107 units remaining)
+  - location: 39 (remaining gas: 1039966.792 units remaining)
     [ { "B" }
       (Pair { "c" } True) ]
-  - location: 40 (remaining gas: 1039967.107 units remaining)
+  - location: 40 (remaining gas: 1039966.792 units remaining)
     [ "B"
       (Pair { "c" } True) ]
-  - location: 42 (remaining gas: 1039967.097 units remaining)
+  - location: 42 (remaining gas: 1039966.782 units remaining)
     [ (Pair "B" { "c" } True) ]
-  - location: 43 (remaining gas: 1039967.087 units remaining)
+  - location: 43 (remaining gas: 1039966.772 units remaining)
     [ (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 44 (remaining gas: 1039967.077 units remaining)
+  - location: 44 (remaining gas: 1039966.762 units remaining)
     [ (Pair "B" { "c" } True)
       (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 45 (remaining gas: 1039967.067 units remaining)
+  - location: 45 (remaining gas: 1039966.752 units remaining)
     [ "B"
       (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 46 (remaining gas: 1039967.067 units remaining)
+  - location: 46 (remaining gas: 1039966.752 units remaining)
     [ (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 49 (remaining gas: 1039967.057 units remaining)
+  - location: 49 (remaining gas: 1039966.742 units remaining)
     [ (Pair { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 50 (remaining gas: 1039967.047 units remaining)
+  - location: 50 (remaining gas: 1039966.732 units remaining)
     [ { "c" }
       (Pair "B" { "c" } True) ]
-  - location: 51 (remaining gas: 1039967.047 units remaining)
+  - location: 51 (remaining gas: 1039966.732 units remaining)
     [ (Pair "B" { "c" } True) ]
-  - location: 54 (remaining gas: 1039967.037 units remaining)
+  - location: 54 (remaining gas: 1039966.722 units remaining)
     [ (Pair { "c" } True) ]
-  - location: 55 (remaining gas: 1039967.027 units remaining)
+  - location: 55 (remaining gas: 1039966.712 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039967.007 units remaining)
+  - location: 51 (remaining gas: 1039966.692 units remaining)
     [ { "c" }
       True ]
-  - location: 56 (remaining gas: 1039966.997 units remaining)
+  - location: 56 (remaining gas: 1039966.682 units remaining)
     [ { "c" }
       { "c" }
       True ]
-  - location: 46 (remaining gas: 1039966.977 units remaining)
+  - location: 46 (remaining gas: 1039966.662 units remaining)
     [ "B"
       { "c" }
       { "c" }
       True ]
-  - location: 57 (remaining gas: 1039966.860 units remaining)
+  - location: 57 (remaining gas: 1039966.545 units remaining)
     [ False
       { "c" }
       True ]
-  - location: 58 (remaining gas: 1039966.860 units remaining)
+  - location: 58 (remaining gas: 1039966.545 units remaining)
     [ { "c" }
       True ]
-  - location: 60 (remaining gas: 1039966.850 units remaining)
+  - location: 60 (remaining gas: 1039966.535 units remaining)
     [ True
       { "c" } ]
-  - location: 58 (remaining gas: 1039966.830 units remaining)
+  - location: 58 (remaining gas: 1039966.515 units remaining)
     [ False
       True
       { "c" } ]
-  - location: 61 (remaining gas: 1039966.820 units remaining)
+  - location: 61 (remaining gas: 1039966.505 units remaining)
     [ False
       { "c" } ]
-  - location: 62 (remaining gas: 1039966.810 units remaining)
+  - location: 62 (remaining gas: 1039966.495 units remaining)
     [ { "c" }
       False ]
-  - location: 63 (remaining gas: 1039966.800 units remaining)
+  - location: 63 (remaining gas: 1039966.485 units remaining)
     [ (Pair { "c" } False) ]
-  - location: 40 (remaining gas: 1039966.790 units remaining)
+  - location: 40 (remaining gas: 1039966.475 units remaining)
     [ (Pair { "c" } False) ]
-  - location: 64 (remaining gas: 1039966.780 units remaining)
+  - location: 64 (remaining gas: 1039966.465 units remaining)
     [ False ]
-  - location: 65 (remaining gas: 1039966.770 units remaining)
+  - location: 65 (remaining gas: 1039966.455 units remaining)
     [ (Some False) ]
-  - location: 66 (remaining gas: 1039966.760 units remaining)
+  - location: 66 (remaining gas: 1039966.445 units remaining)
     [ {}
       (Some False) ]
-  - location: 68 (remaining gas: 1039966.750 units remaining)
+  - location: 68 (remaining gas: 1039966.435 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out
index ce79f8d68e831851141c80a0fe7c6802d6611a3c..3ceed792f9c9096476bc854db4717a9e0823c7bf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out	
@@ -7,57 +7,57 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039967.907 units remaining)
+  - location: 12 (remaining gas: 1039967.592 units remaining)
     [ (Pair (Pair {} {}) None) ]
-  - location: 12 (remaining gas: 1039967.897 units remaining)
+  - location: 12 (remaining gas: 1039967.582 units remaining)
     [ (Pair {} {}) ]
-  - location: 13 (remaining gas: 1039967.887 units remaining)
+  - location: 13 (remaining gas: 1039967.572 units remaining)
     [ (Pair {} {})
       (Pair {} {}) ]
-  - location: 14 (remaining gas: 1039967.877 units remaining)
+  - location: 14 (remaining gas: 1039967.562 units remaining)
     [ {}
       (Pair {} {}) ]
-  - location: 15 (remaining gas: 1039967.877 units remaining)
+  - location: 15 (remaining gas: 1039967.562 units remaining)
     [ (Pair {} {}) ]
-  - location: 17 (remaining gas: 1039967.867 units remaining)
+  - location: 17 (remaining gas: 1039967.552 units remaining)
     [ {} ]
-  - location: 15 (remaining gas: 1039967.847 units remaining)
+  - location: 15 (remaining gas: 1039967.532 units remaining)
     [ {}
       {} ]
-  - location: 18 (remaining gas: 1039967.627 units remaining)
+  - location: 18 (remaining gas: 1039967.312 units remaining)
     [ {}
       {}
       {} ]
-  - location: 20 (remaining gas: 1039967.617 units remaining)
+  - location: 20 (remaining gas: 1039967.302 units remaining)
     [ {}
       {}
       {} ]
-  - location: 21 (remaining gas: 1039967.617 units remaining)
+  - location: 21 (remaining gas: 1039967.302 units remaining)
     [ {}
       {} ]
-  - location: 34 (remaining gas: 1039967.607 units remaining)
+  - location: 34 (remaining gas: 1039967.292 units remaining)
     [ True
       {}
       {} ]
-  - location: 37 (remaining gas: 1039967.597 units remaining)
+  - location: 37 (remaining gas: 1039967.282 units remaining)
     [ {}
       True
       {} ]
-  - location: 38 (remaining gas: 1039967.587 units remaining)
+  - location: 38 (remaining gas: 1039967.272 units remaining)
     [ (Pair {} True)
       {} ]
-  - location: 39 (remaining gas: 1039967.577 units remaining)
+  - location: 39 (remaining gas: 1039967.262 units remaining)
     [ {}
       (Pair {} True) ]
-  - location: 40 (remaining gas: 1039967.577 units remaining)
+  - location: 40 (remaining gas: 1039967.262 units remaining)
     [ (Pair {} True) ]
-  - location: 64 (remaining gas: 1039967.567 units remaining)
+  - location: 64 (remaining gas: 1039967.252 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039967.557 units remaining)
+  - location: 65 (remaining gas: 1039967.242 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039967.547 units remaining)
+  - location: 66 (remaining gas: 1039967.232 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039967.537 units remaining)
+  - location: 68 (remaining gas: 1039967.222 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out"
index d3b3caea5d7737561784639829d8aa57039d3045..b67ee35f7ee4fe7213200947ef2f73275cd298df 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out"	
@@ -13,37 +13,37 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039987.939 units remaining)
+  - location: 8 (remaining gas: 1039987.894 units remaining)
     [ (Pair Unit None) ]
-  - location: 8 (remaining gas: 1039987.929 units remaining)
+  - location: 8 (remaining gas: 1039987.884 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039987.919 units remaining)
+  - location: 9 (remaining gas: 1039987.874 units remaining)
     [ Unit ]
-  - location: 10 (remaining gas: 1039987.909 units remaining)
+  - location: 10 (remaining gas: 1039987.864 units remaining)
     [ 50000
       Unit ]
-  - location: 11 (remaining gas: 1039987.899 units remaining)
+  - location: 11 (remaining gas: 1039987.854 units remaining)
     [ None
       50000
       Unit ]
-  - location: 13 (remaining gas: 1039987.333 units remaining)
+  - location: 13 (remaining gas: 1039987.288 units remaining)
     [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b
       "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ]
-  - location: 25 (remaining gas: 1039987.333 units remaining)
+  - location: 25 (remaining gas: 1039987.288 units remaining)
     [ "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ]
-  - location: 27 (remaining gas: 1039987.323 units remaining)
+  - location: 27 (remaining gas: 1039987.278 units remaining)
     [ (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-  - location: 28 (remaining gas: 1039987.313 units remaining)
+  - location: 28 (remaining gas: 1039987.268 units remaining)
     [ {}
       (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-  - location: 25 (remaining gas: 1039987.293 units remaining)
+  - location: 25 (remaining gas: 1039987.248 units remaining)
     [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b
       {}
       (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-  - location: 30 (remaining gas: 1039987.283 units remaining)
+  - location: 30 (remaining gas: 1039987.238 units remaining)
     [ { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b }
       (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-  - location: 31 (remaining gas: 1039987.273 units remaining)
+  - location: 31 (remaining gas: 1039987.228 units remaining)
     [ (Pair { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b }
             (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out"
index 153f9530bc60a74bac5a677a4ca4e31c33be8640..dd71c2a7f03265bbbef722cc493e9b335ad03e8d 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039990.903 units remaining)
+  - location: 9 (remaining gas: 1039990.858 units remaining)
     [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ]
-  - location: 9 (remaining gas: 1039990.893 units remaining)
+  - location: 9 (remaining gas: 1039990.848 units remaining)
     [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 10 (remaining gas: 1039990.883 units remaining)
+  - location: 10 (remaining gas: 1039990.838 units remaining)
     [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z")
       (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039990.873 units remaining)
+  - location: 11 (remaining gas: 1039990.828 units remaining)
     [ "1970-01-01T00:03:20Z"
       (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039990.873 units remaining)
+  - location: 12 (remaining gas: 1039990.828 units remaining)
     [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 14 (remaining gas: 1039990.863 units remaining)
+  - location: 14 (remaining gas: 1039990.818 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 12 (remaining gas: 1039990.843 units remaining)
+  - location: 12 (remaining gas: 1039990.798 units remaining)
     [ "1970-01-01T00:03:20Z"
       "1970-01-01T00:00:00Z" ]
-  - location: 15 (remaining gas: 1039990.808 units remaining)
+  - location: 15 (remaining gas: 1039990.763 units remaining)
     [ 200 ]
-  - location: 16 (remaining gas: 1039990.798 units remaining)
+  - location: 16 (remaining gas: 1039990.753 units remaining)
     [ {}
       200 ]
-  - location: 18 (remaining gas: 1039990.788 units remaining)
+  - location: 18 (remaining gas: 1039990.743 units remaining)
     [ (Pair {} 200) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out
index c57929004e2d4194ae151cdb888546e9ceedde95..0b8823e6dbda1595ff3d81c387944d7aca18766a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.563 units remaining)
+  - location: 9 (remaining gas: 1039992.518 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ]
-  - location: 9 (remaining gas: 1039992.553 units remaining)
+  - location: 9 (remaining gas: 1039992.508 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 10 (remaining gas: 1039992.543 units remaining)
+  - location: 10 (remaining gas: 1039992.498 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z")
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039992.533 units remaining)
+  - location: 11 (remaining gas: 1039992.488 units remaining)
     [ "1970-01-01T00:00:00Z"
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039992.533 units remaining)
+  - location: 12 (remaining gas: 1039992.488 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 14 (remaining gas: 1039992.523 units remaining)
+  - location: 14 (remaining gas: 1039992.478 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 12 (remaining gas: 1039992.503 units remaining)
+  - location: 12 (remaining gas: 1039992.458 units remaining)
     [ "1970-01-01T00:00:00Z"
       "1970-01-01T00:00:00Z" ]
-  - location: 15 (remaining gas: 1039992.468 units remaining)
+  - location: 15 (remaining gas: 1039992.423 units remaining)
     [ 0 ]
-  - location: 16 (remaining gas: 1039992.458 units remaining)
+  - location: 16 (remaining gas: 1039992.413 units remaining)
     [ {}
       0 ]
-  - location: 18 (remaining gas: 1039992.448 units remaining)
+  - location: 18 (remaining gas: 1039992.403 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out
index 1f21483761101f3359b0a8a5f726d67067e2c489..517f6e408cd5b8349464a161a8e638664d15175c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.563 units remaining)
+  - location: 9 (remaining gas: 1039992.518 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ]
-  - location: 9 (remaining gas: 1039992.553 units remaining)
+  - location: 9 (remaining gas: 1039992.508 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 10 (remaining gas: 1039992.543 units remaining)
+  - location: 10 (remaining gas: 1039992.498 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z")
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 11 (remaining gas: 1039992.533 units remaining)
+  - location: 11 (remaining gas: 1039992.488 units remaining)
     [ "1970-01-01T00:00:00Z"
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 12 (remaining gas: 1039992.533 units remaining)
+  - location: 12 (remaining gas: 1039992.488 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 14 (remaining gas: 1039992.523 units remaining)
+  - location: 14 (remaining gas: 1039992.478 units remaining)
     [ "1970-01-01T00:00:01Z" ]
-  - location: 12 (remaining gas: 1039992.503 units remaining)
+  - location: 12 (remaining gas: 1039992.458 units remaining)
     [ "1970-01-01T00:00:00Z"
       "1970-01-01T00:00:01Z" ]
-  - location: 15 (remaining gas: 1039992.468 units remaining)
+  - location: 15 (remaining gas: 1039992.423 units remaining)
     [ -1 ]
-  - location: 16 (remaining gas: 1039992.458 units remaining)
+  - location: 16 (remaining gas: 1039992.413 units remaining)
     [ {}
       -1 ]
-  - location: 18 (remaining gas: 1039992.448 units remaining)
+  - location: 18 (remaining gas: 1039992.403 units remaining)
     [ (Pair {} -1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out
index 2aa6ba0402b667538898ae36a757a8d0992ee955..c8838b042f87942057fba0d44e4c1f491a0a9234 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.563 units remaining)
+  - location: 9 (remaining gas: 1039992.518 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ]
-  - location: 9 (remaining gas: 1039992.553 units remaining)
+  - location: 9 (remaining gas: 1039992.508 units remaining)
     [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 10 (remaining gas: 1039992.543 units remaining)
+  - location: 10 (remaining gas: 1039992.498 units remaining)
     [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z")
       (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039992.533 units remaining)
+  - location: 11 (remaining gas: 1039992.488 units remaining)
     [ "1970-01-01T00:00:01Z"
       (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039992.533 units remaining)
+  - location: 12 (remaining gas: 1039992.488 units remaining)
     [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 14 (remaining gas: 1039992.523 units remaining)
+  - location: 14 (remaining gas: 1039992.478 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 12 (remaining gas: 1039992.503 units remaining)
+  - location: 12 (remaining gas: 1039992.458 units remaining)
     [ "1970-01-01T00:00:01Z"
       "1970-01-01T00:00:00Z" ]
-  - location: 15 (remaining gas: 1039992.468 units remaining)
+  - location: 15 (remaining gas: 1039992.423 units remaining)
     [ 1 ]
-  - location: 16 (remaining gas: 1039992.458 units remaining)
+  - location: 16 (remaining gas: 1039992.413 units remaining)
     [ {}
       1 ]
-  - location: 18 (remaining gas: 1039992.448 units remaining)
+  - location: 18 (remaining gas: 1039992.403 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out
index 1134d533eb23a847e988f724e122e3144cd4d714..5b3d1c1e1045182507e5cd92d29b42cadd91f69d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out	
@@ -7,111 +7,111 @@ emitted operations
 big_map diff
   
 trace
-  - location: 24 (remaining gas: 1039840.257 units remaining)
+  - location: 24 (remaining gas: 1039840.167 units remaining)
     [ (Pair (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) Unit) ]
-  - location: 24 (remaining gas: 1039840.247 units remaining)
+  - location: 24 (remaining gas: 1039840.157 units remaining)
     [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 25 (remaining gas: 1039840.237 units remaining)
+  - location: 25 (remaining gas: 1039840.147 units remaining)
     [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 27 (remaining gas: 1039840.227 units remaining)
+  - location: 27 (remaining gas: 1039840.137 units remaining)
     [ 17
       (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 28 (remaining gas: 1039840.227 units remaining)
+  - location: 28 (remaining gas: 1039840.137 units remaining)
     [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 30 (remaining gas: 1039840.217 units remaining)
+  - location: 30 (remaining gas: 1039840.127 units remaining)
     [ 16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 28 (remaining gas: 1039840.197 units remaining)
+  - location: 28 (remaining gas: 1039840.107 units remaining)
     [ 17
       16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039840.197 units remaining)
+  - location: 31 (remaining gas: 1039840.107 units remaining)
     [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 34 (remaining gas: 1039840.187 units remaining)
+  - location: 34 (remaining gas: 1039840.097 units remaining)
     [ 15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039840.167 units remaining)
+  - location: 31 (remaining gas: 1039840.077 units remaining)
     [ 16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039840.157 units remaining)
+  - location: 31 (remaining gas: 1039840.067 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039840.157 units remaining)
+  - location: 31 (remaining gas: 1039840.067 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039840.157 units remaining)
+  - location: 35 (remaining gas: 1039840.067 units remaining)
     [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 38 (remaining gas: 1039840.147 units remaining)
+  - location: 38 (remaining gas: 1039840.057 units remaining)
     [ 14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039840.127 units remaining)
+  - location: 35 (remaining gas: 1039840.037 units remaining)
     [ 15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039840.117 units remaining)
+  - location: 35 (remaining gas: 1039840.027 units remaining)
     [ 16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039840.107 units remaining)
+  - location: 35 (remaining gas: 1039840.017 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039840.107 units remaining)
+  - location: 35 (remaining gas: 1039840.017 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039840.107 units remaining)
+  - location: 39 (remaining gas: 1039840.017 units remaining)
     [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 42 (remaining gas: 1039840.097 units remaining)
+  - location: 42 (remaining gas: 1039840.007 units remaining)
     [ 13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039840.077 units remaining)
+  - location: 39 (remaining gas: 1039839.987 units remaining)
     [ 14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039840.067 units remaining)
+  - location: 39 (remaining gas: 1039839.977 units remaining)
     [ 15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039840.057 units remaining)
+  - location: 39 (remaining gas: 1039839.967 units remaining)
     [ 16
       15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039840.047 units remaining)
+  - location: 39 (remaining gas: 1039839.957 units remaining)
     [ 17
       16
       15
@@ -119,7 +119,7 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039840.047 units remaining)
+  - location: 39 (remaining gas: 1039839.957 units remaining)
     [ 17
       16
       15
@@ -127,32 +127,32 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039840.047 units remaining)
+  - location: 43 (remaining gas: 1039839.957 units remaining)
     [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 46 (remaining gas: 1039840.037 units remaining)
+  - location: 46 (remaining gas: 1039839.947 units remaining)
     [ 12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039840.017 units remaining)
+  - location: 43 (remaining gas: 1039839.927 units remaining)
     [ 13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039840.007 units remaining)
+  - location: 43 (remaining gas: 1039839.917 units remaining)
     [ 14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039839.997 units remaining)
+  - location: 43 (remaining gas: 1039839.907 units remaining)
     [ 15
       14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039839.987 units remaining)
+  - location: 43 (remaining gas: 1039839.897 units remaining)
     [ 16
       15
       14
@@ -160,7 +160,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039839.977 units remaining)
+  - location: 43 (remaining gas: 1039839.887 units remaining)
     [ 17
       16
       15
@@ -169,7 +169,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039839.977 units remaining)
+  - location: 43 (remaining gas: 1039839.887 units remaining)
     [ 17
       16
       15
@@ -178,32 +178,32 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.977 units remaining)
+  - location: 47 (remaining gas: 1039839.887 units remaining)
     [ (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 50 (remaining gas: 1039839.967 units remaining)
+  - location: 50 (remaining gas: 1039839.877 units remaining)
     [ 11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.947 units remaining)
+  - location: 47 (remaining gas: 1039839.857 units remaining)
     [ 12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.937 units remaining)
+  - location: 47 (remaining gas: 1039839.847 units remaining)
     [ 13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.927 units remaining)
+  - location: 47 (remaining gas: 1039839.837 units remaining)
     [ 14
       13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.917 units remaining)
+  - location: 47 (remaining gas: 1039839.827 units remaining)
     [ 15
       14
       13
@@ -211,7 +211,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.907 units remaining)
+  - location: 47 (remaining gas: 1039839.817 units remaining)
     [ 16
       15
       14
@@ -220,7 +220,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.897 units remaining)
+  - location: 47 (remaining gas: 1039839.807 units remaining)
     [ 17
       16
       15
@@ -230,7 +230,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039839.897 units remaining)
+  - location: 47 (remaining gas: 1039839.807 units remaining)
     [ 17
       16
       15
@@ -240,32 +240,32 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.897 units remaining)
+  - location: 51 (remaining gas: 1039839.807 units remaining)
     [ (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 54 (remaining gas: 1039839.887 units remaining)
+  - location: 54 (remaining gas: 1039839.797 units remaining)
     [ 10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.867 units remaining)
+  - location: 51 (remaining gas: 1039839.777 units remaining)
     [ 11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.857 units remaining)
+  - location: 51 (remaining gas: 1039839.767 units remaining)
     [ 12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.847 units remaining)
+  - location: 51 (remaining gas: 1039839.757 units remaining)
     [ 13
       12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.837 units remaining)
+  - location: 51 (remaining gas: 1039839.747 units remaining)
     [ 14
       13
       12
@@ -273,7 +273,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.827 units remaining)
+  - location: 51 (remaining gas: 1039839.737 units remaining)
     [ 15
       14
       13
@@ -282,7 +282,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.817 units remaining)
+  - location: 51 (remaining gas: 1039839.727 units remaining)
     [ 16
       15
       14
@@ -292,7 +292,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.807 units remaining)
+  - location: 51 (remaining gas: 1039839.717 units remaining)
     [ 17
       16
       15
@@ -303,7 +303,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039839.807 units remaining)
+  - location: 51 (remaining gas: 1039839.717 units remaining)
     [ 17
       16
       15
@@ -314,32 +314,32 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.807 units remaining)
+  - location: 55 (remaining gas: 1039839.717 units remaining)
     [ (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 58 (remaining gas: 1039839.797 units remaining)
+  - location: 58 (remaining gas: 1039839.707 units remaining)
     [ 9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.777 units remaining)
+  - location: 55 (remaining gas: 1039839.687 units remaining)
     [ 10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.767 units remaining)
+  - location: 55 (remaining gas: 1039839.677 units remaining)
     [ 11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.757 units remaining)
+  - location: 55 (remaining gas: 1039839.667 units remaining)
     [ 12
       11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.747 units remaining)
+  - location: 55 (remaining gas: 1039839.657 units remaining)
     [ 13
       12
       11
@@ -347,7 +347,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.737 units remaining)
+  - location: 55 (remaining gas: 1039839.647 units remaining)
     [ 14
       13
       12
@@ -356,7 +356,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.727 units remaining)
+  - location: 55 (remaining gas: 1039839.637 units remaining)
     [ 15
       14
       13
@@ -366,7 +366,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.717 units remaining)
+  - location: 55 (remaining gas: 1039839.627 units remaining)
     [ 16
       15
       14
@@ -377,7 +377,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.707 units remaining)
+  - location: 55 (remaining gas: 1039839.617 units remaining)
     [ 17
       16
       15
@@ -389,7 +389,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039839.707 units remaining)
+  - location: 55 (remaining gas: 1039839.617 units remaining)
     [ 17
       16
       15
@@ -401,32 +401,32 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.707 units remaining)
+  - location: 59 (remaining gas: 1039839.617 units remaining)
     [ (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 62 (remaining gas: 1039839.697 units remaining)
+  - location: 62 (remaining gas: 1039839.607 units remaining)
     [ 8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.677 units remaining)
+  - location: 59 (remaining gas: 1039839.587 units remaining)
     [ 9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.667 units remaining)
+  - location: 59 (remaining gas: 1039839.577 units remaining)
     [ 10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.657 units remaining)
+  - location: 59 (remaining gas: 1039839.567 units remaining)
     [ 11
       10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.647 units remaining)
+  - location: 59 (remaining gas: 1039839.557 units remaining)
     [ 12
       11
       10
@@ -434,7 +434,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.637 units remaining)
+  - location: 59 (remaining gas: 1039839.547 units remaining)
     [ 13
       12
       11
@@ -443,7 +443,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.627 units remaining)
+  - location: 59 (remaining gas: 1039839.537 units remaining)
     [ 14
       13
       12
@@ -453,7 +453,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.617 units remaining)
+  - location: 59 (remaining gas: 1039839.527 units remaining)
     [ 15
       14
       13
@@ -464,7 +464,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.607 units remaining)
+  - location: 59 (remaining gas: 1039839.517 units remaining)
     [ 16
       15
       14
@@ -476,7 +476,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.597 units remaining)
+  - location: 59 (remaining gas: 1039839.507 units remaining)
     [ 17
       16
       15
@@ -489,7 +489,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039839.597 units remaining)
+  - location: 59 (remaining gas: 1039839.507 units remaining)
     [ 17
       16
       15
@@ -502,32 +502,32 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.597 units remaining)
+  - location: 63 (remaining gas: 1039839.507 units remaining)
     [ (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 66 (remaining gas: 1039839.587 units remaining)
+  - location: 66 (remaining gas: 1039839.497 units remaining)
     [ 7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.567 units remaining)
+  - location: 63 (remaining gas: 1039839.477 units remaining)
     [ 8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.557 units remaining)
+  - location: 63 (remaining gas: 1039839.467 units remaining)
     [ 9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.547 units remaining)
+  - location: 63 (remaining gas: 1039839.457 units remaining)
     [ 10
       9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.537 units remaining)
+  - location: 63 (remaining gas: 1039839.447 units remaining)
     [ 11
       10
       9
@@ -535,7 +535,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.527 units remaining)
+  - location: 63 (remaining gas: 1039839.437 units remaining)
     [ 12
       11
       10
@@ -544,7 +544,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.517 units remaining)
+  - location: 63 (remaining gas: 1039839.427 units remaining)
     [ 13
       12
       11
@@ -554,7 +554,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.507 units remaining)
+  - location: 63 (remaining gas: 1039839.417 units remaining)
     [ 14
       13
       12
@@ -565,7 +565,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.497 units remaining)
+  - location: 63 (remaining gas: 1039839.407 units remaining)
     [ 15
       14
       13
@@ -577,7 +577,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.487 units remaining)
+  - location: 63 (remaining gas: 1039839.397 units remaining)
     [ 16
       15
       14
@@ -590,7 +590,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.477 units remaining)
+  - location: 63 (remaining gas: 1039839.387 units remaining)
     [ 17
       16
       15
@@ -604,7 +604,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039839.477 units remaining)
+  - location: 63 (remaining gas: 1039839.387 units remaining)
     [ 17
       16
       15
@@ -618,32 +618,32 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.477 units remaining)
+  - location: 67 (remaining gas: 1039839.387 units remaining)
     [ (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 70 (remaining gas: 1039839.467 units remaining)
+  - location: 70 (remaining gas: 1039839.377 units remaining)
     [ 6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.447 units remaining)
+  - location: 67 (remaining gas: 1039839.357 units remaining)
     [ 7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.437 units remaining)
+  - location: 67 (remaining gas: 1039839.347 units remaining)
     [ 8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.427 units remaining)
+  - location: 67 (remaining gas: 1039839.337 units remaining)
     [ 9
       8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.417 units remaining)
+  - location: 67 (remaining gas: 1039839.327 units remaining)
     [ 10
       9
       8
@@ -651,7 +651,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.407 units remaining)
+  - location: 67 (remaining gas: 1039839.317 units remaining)
     [ 11
       10
       9
@@ -660,7 +660,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.397 units remaining)
+  - location: 67 (remaining gas: 1039839.307 units remaining)
     [ 12
       11
       10
@@ -670,7 +670,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.387 units remaining)
+  - location: 67 (remaining gas: 1039839.297 units remaining)
     [ 13
       12
       11
@@ -681,7 +681,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.377 units remaining)
+  - location: 67 (remaining gas: 1039839.287 units remaining)
     [ 14
       13
       12
@@ -693,7 +693,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.367 units remaining)
+  - location: 67 (remaining gas: 1039839.277 units remaining)
     [ 15
       14
       13
@@ -706,7 +706,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.357 units remaining)
+  - location: 67 (remaining gas: 1039839.267 units remaining)
     [ 16
       15
       14
@@ -720,7 +720,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.347 units remaining)
+  - location: 67 (remaining gas: 1039839.257 units remaining)
     [ 17
       16
       15
@@ -735,7 +735,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039839.347 units remaining)
+  - location: 67 (remaining gas: 1039839.257 units remaining)
     [ 17
       16
       15
@@ -750,32 +750,32 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.347 units remaining)
+  - location: 71 (remaining gas: 1039839.257 units remaining)
     [ (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 74 (remaining gas: 1039839.337 units remaining)
+  - location: 74 (remaining gas: 1039839.247 units remaining)
     [ 5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.317 units remaining)
+  - location: 71 (remaining gas: 1039839.227 units remaining)
     [ 6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.307 units remaining)
+  - location: 71 (remaining gas: 1039839.217 units remaining)
     [ 7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.297 units remaining)
+  - location: 71 (remaining gas: 1039839.207 units remaining)
     [ 8
       7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.287 units remaining)
+  - location: 71 (remaining gas: 1039839.197 units remaining)
     [ 9
       8
       7
@@ -783,7 +783,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.277 units remaining)
+  - location: 71 (remaining gas: 1039839.187 units remaining)
     [ 10
       9
       8
@@ -792,7 +792,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.267 units remaining)
+  - location: 71 (remaining gas: 1039839.177 units remaining)
     [ 11
       10
       9
@@ -802,7 +802,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.257 units remaining)
+  - location: 71 (remaining gas: 1039839.167 units remaining)
     [ 12
       11
       10
@@ -813,7 +813,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.247 units remaining)
+  - location: 71 (remaining gas: 1039839.157 units remaining)
     [ 13
       12
       11
@@ -825,7 +825,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.237 units remaining)
+  - location: 71 (remaining gas: 1039839.147 units remaining)
     [ 14
       13
       12
@@ -838,7 +838,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.227 units remaining)
+  - location: 71 (remaining gas: 1039839.137 units remaining)
     [ 15
       14
       13
@@ -852,7 +852,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.217 units remaining)
+  - location: 71 (remaining gas: 1039839.127 units remaining)
     [ 16
       15
       14
@@ -867,7 +867,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.207 units remaining)
+  - location: 71 (remaining gas: 1039839.117 units remaining)
     [ 17
       16
       15
@@ -883,7 +883,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039839.207 units remaining)
+  - location: 71 (remaining gas: 1039839.117 units remaining)
     [ 17
       16
       15
@@ -899,32 +899,32 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.207 units remaining)
+  - location: 75 (remaining gas: 1039839.117 units remaining)
     [ (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 78 (remaining gas: 1039839.197 units remaining)
+  - location: 78 (remaining gas: 1039839.107 units remaining)
     [ 4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.177 units remaining)
+  - location: 75 (remaining gas: 1039839.087 units remaining)
     [ 5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.167 units remaining)
+  - location: 75 (remaining gas: 1039839.077 units remaining)
     [ 6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.157 units remaining)
+  - location: 75 (remaining gas: 1039839.067 units remaining)
     [ 7
       6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.147 units remaining)
+  - location: 75 (remaining gas: 1039839.057 units remaining)
     [ 8
       7
       6
@@ -932,7 +932,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.137 units remaining)
+  - location: 75 (remaining gas: 1039839.047 units remaining)
     [ 9
       8
       7
@@ -941,7 +941,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.127 units remaining)
+  - location: 75 (remaining gas: 1039839.037 units remaining)
     [ 10
       9
       8
@@ -951,7 +951,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.117 units remaining)
+  - location: 75 (remaining gas: 1039839.027 units remaining)
     [ 11
       10
       9
@@ -962,7 +962,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.107 units remaining)
+  - location: 75 (remaining gas: 1039839.017 units remaining)
     [ 12
       11
       10
@@ -974,7 +974,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.097 units remaining)
+  - location: 75 (remaining gas: 1039839.007 units remaining)
     [ 13
       12
       11
@@ -987,7 +987,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.087 units remaining)
+  - location: 75 (remaining gas: 1039838.997 units remaining)
     [ 14
       13
       12
@@ -1001,7 +1001,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.077 units remaining)
+  - location: 75 (remaining gas: 1039838.987 units remaining)
     [ 15
       14
       13
@@ -1016,7 +1016,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.067 units remaining)
+  - location: 75 (remaining gas: 1039838.977 units remaining)
     [ 16
       15
       14
@@ -1032,7 +1032,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.057 units remaining)
+  - location: 75 (remaining gas: 1039838.967 units remaining)
     [ 17
       16
       15
@@ -1049,7 +1049,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039839.057 units remaining)
+  - location: 75 (remaining gas: 1039838.967 units remaining)
     [ 17
       16
       15
@@ -1066,32 +1066,32 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039839.057 units remaining)
+  - location: 79 (remaining gas: 1039838.967 units remaining)
     [ (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 82 (remaining gas: 1039839.047 units remaining)
+  - location: 82 (remaining gas: 1039838.957 units remaining)
     [ 3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039839.027 units remaining)
+  - location: 79 (remaining gas: 1039838.937 units remaining)
     [ 4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039839.017 units remaining)
+  - location: 79 (remaining gas: 1039838.927 units remaining)
     [ 5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039839.007 units remaining)
+  - location: 79 (remaining gas: 1039838.917 units remaining)
     [ 6
       5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.997 units remaining)
+  - location: 79 (remaining gas: 1039838.907 units remaining)
     [ 7
       6
       5
@@ -1099,7 +1099,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.987 units remaining)
+  - location: 79 (remaining gas: 1039838.897 units remaining)
     [ 8
       7
       6
@@ -1108,7 +1108,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.977 units remaining)
+  - location: 79 (remaining gas: 1039838.887 units remaining)
     [ 9
       8
       7
@@ -1118,7 +1118,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.967 units remaining)
+  - location: 79 (remaining gas: 1039838.877 units remaining)
     [ 10
       9
       8
@@ -1129,7 +1129,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.957 units remaining)
+  - location: 79 (remaining gas: 1039838.867 units remaining)
     [ 11
       10
       9
@@ -1141,7 +1141,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.947 units remaining)
+  - location: 79 (remaining gas: 1039838.857 units remaining)
     [ 12
       11
       10
@@ -1154,7 +1154,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.937 units remaining)
+  - location: 79 (remaining gas: 1039838.847 units remaining)
     [ 13
       12
       11
@@ -1168,7 +1168,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.927 units remaining)
+  - location: 79 (remaining gas: 1039838.837 units remaining)
     [ 14
       13
       12
@@ -1183,7 +1183,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.917 units remaining)
+  - location: 79 (remaining gas: 1039838.827 units remaining)
     [ 15
       14
       13
@@ -1199,7 +1199,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.907 units remaining)
+  - location: 79 (remaining gas: 1039838.817 units remaining)
     [ 16
       15
       14
@@ -1216,7 +1216,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.897 units remaining)
+  - location: 79 (remaining gas: 1039838.807 units remaining)
     [ 17
       16
       15
@@ -1234,7 +1234,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039838.897 units remaining)
+  - location: 79 (remaining gas: 1039838.807 units remaining)
     [ 17
       16
       15
@@ -1252,32 +1252,32 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.897 units remaining)
+  - location: 83 (remaining gas: 1039838.807 units remaining)
     [ (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 86 (remaining gas: 1039838.887 units remaining)
+  - location: 86 (remaining gas: 1039838.797 units remaining)
     [ 2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.867 units remaining)
+  - location: 83 (remaining gas: 1039838.777 units remaining)
     [ 3
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.857 units remaining)
+  - location: 83 (remaining gas: 1039838.767 units remaining)
     [ 4
       3
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.847 units remaining)
+  - location: 83 (remaining gas: 1039838.757 units remaining)
     [ 5
       4
       3
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.837 units remaining)
+  - location: 83 (remaining gas: 1039838.747 units remaining)
     [ 6
       5
       4
@@ -1285,7 +1285,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.827 units remaining)
+  - location: 83 (remaining gas: 1039838.737 units remaining)
     [ 7
       6
       5
@@ -1294,7 +1294,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.817 units remaining)
+  - location: 83 (remaining gas: 1039838.727 units remaining)
     [ 8
       7
       6
@@ -1304,7 +1304,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.807 units remaining)
+  - location: 83 (remaining gas: 1039838.717 units remaining)
     [ 9
       8
       7
@@ -1315,7 +1315,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.797 units remaining)
+  - location: 83 (remaining gas: 1039838.707 units remaining)
     [ 10
       9
       8
@@ -1327,7 +1327,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.787 units remaining)
+  - location: 83 (remaining gas: 1039838.697 units remaining)
     [ 11
       10
       9
@@ -1340,7 +1340,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.777 units remaining)
+  - location: 83 (remaining gas: 1039838.687 units remaining)
     [ 12
       11
       10
@@ -1354,7 +1354,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.767 units remaining)
+  - location: 83 (remaining gas: 1039838.677 units remaining)
     [ 13
       12
       11
@@ -1369,7 +1369,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.757 units remaining)
+  - location: 83 (remaining gas: 1039838.667 units remaining)
     [ 14
       13
       12
@@ -1385,7 +1385,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.747 units remaining)
+  - location: 83 (remaining gas: 1039838.657 units remaining)
     [ 15
       14
       13
@@ -1402,7 +1402,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.737 units remaining)
+  - location: 83 (remaining gas: 1039838.647 units remaining)
     [ 16
       15
       14
@@ -1420,7 +1420,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.727 units remaining)
+  - location: 83 (remaining gas: 1039838.637 units remaining)
     [ 17
       16
       15
@@ -1439,7 +1439,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039838.727 units remaining)
+  - location: 83 (remaining gas: 1039838.637 units remaining)
     [ 17
       16
       15
@@ -1458,7 +1458,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 87 (remaining gas: 1039838.697 units remaining)
+  - location: 87 (remaining gas: 1039838.607 units remaining)
     [ 17
       16
       15
@@ -1477,7 +1477,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 89 (remaining gas: 1039838.661 units remaining)
+  - location: 89 (remaining gas: 1039838.571 units remaining)
     [ 16
       17
       15
@@ -1496,7 +1496,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 91 (remaining gas: 1039838.618 units remaining)
+  - location: 91 (remaining gas: 1039838.528 units remaining)
     [ 15
       16
       17
@@ -1515,7 +1515,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 93 (remaining gas: 1039838.569 units remaining)
+  - location: 93 (remaining gas: 1039838.479 units remaining)
     [ 14
       15
       16
@@ -1534,7 +1534,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 95 (remaining gas: 1039838.512 units remaining)
+  - location: 95 (remaining gas: 1039838.422 units remaining)
     [ 13
       14
       15
@@ -1553,7 +1553,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 97 (remaining gas: 1039838.449 units remaining)
+  - location: 97 (remaining gas: 1039838.359 units remaining)
     [ 12
       13
       14
@@ -1572,7 +1572,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 99 (remaining gas: 1039838.379 units remaining)
+  - location: 99 (remaining gas: 1039838.289 units remaining)
     [ 11
       12
       13
@@ -1591,7 +1591,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 101 (remaining gas: 1039838.303 units remaining)
+  - location: 101 (remaining gas: 1039838.213 units remaining)
     [ 10
       11
       12
@@ -1610,7 +1610,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 103 (remaining gas: 1039838.219 units remaining)
+  - location: 103 (remaining gas: 1039838.129 units remaining)
     [ 9
       10
       11
@@ -1629,7 +1629,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 105 (remaining gas: 1039838.129 units remaining)
+  - location: 105 (remaining gas: 1039838.039 units remaining)
     [ 8
       9
       10
@@ -1648,7 +1648,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 107 (remaining gas: 1039838.032 units remaining)
+  - location: 107 (remaining gas: 1039837.942 units remaining)
     [ 7
       8
       9
@@ -1667,7 +1667,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 109 (remaining gas: 1039837.929 units remaining)
+  - location: 109 (remaining gas: 1039837.839 units remaining)
     [ 6
       7
       8
@@ -1686,7 +1686,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 111 (remaining gas: 1039837.818 units remaining)
+  - location: 111 (remaining gas: 1039837.728 units remaining)
     [ 5
       6
       7
@@ -1705,7 +1705,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 113 (remaining gas: 1039837.701 units remaining)
+  - location: 113 (remaining gas: 1039837.611 units remaining)
     [ 4
       5
       6
@@ -1724,7 +1724,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 115 (remaining gas: 1039837.577 units remaining)
+  - location: 115 (remaining gas: 1039837.487 units remaining)
     [ 3
       4
       5
@@ -1743,7 +1743,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 117 (remaining gas: 1039837.447 units remaining)
+  - location: 117 (remaining gas: 1039837.357 units remaining)
     [ 2
       3
       4
@@ -1762,7 +1762,7 @@ trace
       17
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 119 (remaining gas: 1039837.309 units remaining)
+  - location: 119 (remaining gas: 1039837.219 units remaining)
     [ 1
       2
       3
@@ -1781,7 +1781,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 121 (remaining gas: 1039837.279 units remaining)
+  - location: 121 (remaining gas: 1039837.189 units remaining)
     [ 1
       2
       3
@@ -1800,7 +1800,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 123 (remaining gas: 1039837.243 units remaining)
+  - location: 123 (remaining gas: 1039837.153 units remaining)
     [ 2
       1
       3
@@ -1819,7 +1819,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 125 (remaining gas: 1039837.200 units remaining)
+  - location: 125 (remaining gas: 1039837.110 units remaining)
     [ 3
       2
       1
@@ -1838,7 +1838,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 127 (remaining gas: 1039837.151 units remaining)
+  - location: 127 (remaining gas: 1039837.061 units remaining)
     [ 4
       3
       2
@@ -1857,7 +1857,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 129 (remaining gas: 1039837.094 units remaining)
+  - location: 129 (remaining gas: 1039837.004 units remaining)
     [ 5
       4
       3
@@ -1876,7 +1876,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 131 (remaining gas: 1039837.031 units remaining)
+  - location: 131 (remaining gas: 1039836.941 units remaining)
     [ 6
       5
       4
@@ -1895,7 +1895,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 133 (remaining gas: 1039836.961 units remaining)
+  - location: 133 (remaining gas: 1039836.871 units remaining)
     [ 7
       6
       5
@@ -1914,7 +1914,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 135 (remaining gas: 1039836.885 units remaining)
+  - location: 135 (remaining gas: 1039836.795 units remaining)
     [ 8
       7
       6
@@ -1933,7 +1933,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 137 (remaining gas: 1039836.801 units remaining)
+  - location: 137 (remaining gas: 1039836.711 units remaining)
     [ 9
       8
       7
@@ -1952,7 +1952,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 139 (remaining gas: 1039836.711 units remaining)
+  - location: 139 (remaining gas: 1039836.621 units remaining)
     [ 10
       9
       8
@@ -1971,7 +1971,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 141 (remaining gas: 1039836.614 units remaining)
+  - location: 141 (remaining gas: 1039836.524 units remaining)
     [ 11
       10
       9
@@ -1990,7 +1990,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 143 (remaining gas: 1039836.511 units remaining)
+  - location: 143 (remaining gas: 1039836.421 units remaining)
     [ 12
       11
       10
@@ -2009,7 +2009,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 145 (remaining gas: 1039836.400 units remaining)
+  - location: 145 (remaining gas: 1039836.310 units remaining)
     [ 13
       12
       11
@@ -2028,7 +2028,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 147 (remaining gas: 1039836.283 units remaining)
+  - location: 147 (remaining gas: 1039836.193 units remaining)
     [ 14
       13
       12
@@ -2047,7 +2047,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 149 (remaining gas: 1039836.159 units remaining)
+  - location: 149 (remaining gas: 1039836.069 units remaining)
     [ 15
       14
       13
@@ -2066,7 +2066,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 151 (remaining gas: 1039836.029 units remaining)
+  - location: 151 (remaining gas: 1039835.939 units remaining)
     [ 16
       15
       14
@@ -2085,7 +2085,7 @@ trace
       1
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 153 (remaining gas: 1039835.891 units remaining)
+  - location: 153 (remaining gas: 1039835.801 units remaining)
     [ 17
       16
       15
@@ -2104,36 +2104,36 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.891 units remaining)
+  - location: 156 (remaining gas: 1039835.801 units remaining)
     [ 2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 159 (remaining gas: 1039835.881 units remaining)
+  - location: 159 (remaining gas: 1039835.791 units remaining)
     [ (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.861 units remaining)
+  - location: 156 (remaining gas: 1039835.771 units remaining)
     [ 3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.851 units remaining)
+  - location: 156 (remaining gas: 1039835.761 units remaining)
     [ 4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.841 units remaining)
+  - location: 156 (remaining gas: 1039835.751 units remaining)
     [ 5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.831 units remaining)
+  - location: 156 (remaining gas: 1039835.741 units remaining)
     [ 6
       5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.821 units remaining)
+  - location: 156 (remaining gas: 1039835.731 units remaining)
     [ 7
       6
       5
@@ -2141,7 +2141,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.811 units remaining)
+  - location: 156 (remaining gas: 1039835.721 units remaining)
     [ 8
       7
       6
@@ -2150,7 +2150,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.801 units remaining)
+  - location: 156 (remaining gas: 1039835.711 units remaining)
     [ 9
       8
       7
@@ -2160,7 +2160,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.791 units remaining)
+  - location: 156 (remaining gas: 1039835.701 units remaining)
     [ 10
       9
       8
@@ -2171,7 +2171,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.781 units remaining)
+  - location: 156 (remaining gas: 1039835.691 units remaining)
     [ 11
       10
       9
@@ -2183,7 +2183,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.771 units remaining)
+  - location: 156 (remaining gas: 1039835.681 units remaining)
     [ 12
       11
       10
@@ -2196,7 +2196,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.761 units remaining)
+  - location: 156 (remaining gas: 1039835.671 units remaining)
     [ 13
       12
       11
@@ -2210,7 +2210,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.751 units remaining)
+  - location: 156 (remaining gas: 1039835.661 units remaining)
     [ 14
       13
       12
@@ -2225,7 +2225,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.741 units remaining)
+  - location: 156 (remaining gas: 1039835.651 units remaining)
     [ 15
       14
       13
@@ -2241,7 +2241,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.731 units remaining)
+  - location: 156 (remaining gas: 1039835.641 units remaining)
     [ 16
       15
       14
@@ -2258,7 +2258,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.721 units remaining)
+  - location: 156 (remaining gas: 1039835.631 units remaining)
     [ 17
       16
       15
@@ -2276,7 +2276,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039835.721 units remaining)
+  - location: 156 (remaining gas: 1039835.631 units remaining)
     [ 17
       16
       15
@@ -2294,36 +2294,36 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.721 units remaining)
+  - location: 160 (remaining gas: 1039835.631 units remaining)
     [ 3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 163 (remaining gas: 1039835.711 units remaining)
+  - location: 163 (remaining gas: 1039835.621 units remaining)
     [ (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.691 units remaining)
+  - location: 160 (remaining gas: 1039835.601 units remaining)
     [ 4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.681 units remaining)
+  - location: 160 (remaining gas: 1039835.591 units remaining)
     [ 5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.671 units remaining)
+  - location: 160 (remaining gas: 1039835.581 units remaining)
     [ 6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.661 units remaining)
+  - location: 160 (remaining gas: 1039835.571 units remaining)
     [ 7
       6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.651 units remaining)
+  - location: 160 (remaining gas: 1039835.561 units remaining)
     [ 8
       7
       6
@@ -2331,7 +2331,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.641 units remaining)
+  - location: 160 (remaining gas: 1039835.551 units remaining)
     [ 9
       8
       7
@@ -2340,7 +2340,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.631 units remaining)
+  - location: 160 (remaining gas: 1039835.541 units remaining)
     [ 10
       9
       8
@@ -2350,7 +2350,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.621 units remaining)
+  - location: 160 (remaining gas: 1039835.531 units remaining)
     [ 11
       10
       9
@@ -2361,7 +2361,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.611 units remaining)
+  - location: 160 (remaining gas: 1039835.521 units remaining)
     [ 12
       11
       10
@@ -2373,7 +2373,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.601 units remaining)
+  - location: 160 (remaining gas: 1039835.511 units remaining)
     [ 13
       12
       11
@@ -2386,7 +2386,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.591 units remaining)
+  - location: 160 (remaining gas: 1039835.501 units remaining)
     [ 14
       13
       12
@@ -2400,7 +2400,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.581 units remaining)
+  - location: 160 (remaining gas: 1039835.491 units remaining)
     [ 15
       14
       13
@@ -2415,7 +2415,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.571 units remaining)
+  - location: 160 (remaining gas: 1039835.481 units remaining)
     [ 16
       15
       14
@@ -2431,7 +2431,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.561 units remaining)
+  - location: 160 (remaining gas: 1039835.471 units remaining)
     [ 17
       16
       15
@@ -2448,7 +2448,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039835.561 units remaining)
+  - location: 160 (remaining gas: 1039835.471 units remaining)
     [ 17
       16
       15
@@ -2465,36 +2465,36 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.561 units remaining)
+  - location: 164 (remaining gas: 1039835.471 units remaining)
     [ 4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 167 (remaining gas: 1039835.551 units remaining)
+  - location: 167 (remaining gas: 1039835.461 units remaining)
     [ (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.531 units remaining)
+  - location: 164 (remaining gas: 1039835.441 units remaining)
     [ 5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.521 units remaining)
+  - location: 164 (remaining gas: 1039835.431 units remaining)
     [ 6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.511 units remaining)
+  - location: 164 (remaining gas: 1039835.421 units remaining)
     [ 7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.501 units remaining)
+  - location: 164 (remaining gas: 1039835.411 units remaining)
     [ 8
       7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.491 units remaining)
+  - location: 164 (remaining gas: 1039835.401 units remaining)
     [ 9
       8
       7
@@ -2502,7 +2502,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.481 units remaining)
+  - location: 164 (remaining gas: 1039835.391 units remaining)
     [ 10
       9
       8
@@ -2511,7 +2511,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.471 units remaining)
+  - location: 164 (remaining gas: 1039835.381 units remaining)
     [ 11
       10
       9
@@ -2521,7 +2521,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.461 units remaining)
+  - location: 164 (remaining gas: 1039835.371 units remaining)
     [ 12
       11
       10
@@ -2532,7 +2532,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.451 units remaining)
+  - location: 164 (remaining gas: 1039835.361 units remaining)
     [ 13
       12
       11
@@ -2544,7 +2544,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.441 units remaining)
+  - location: 164 (remaining gas: 1039835.351 units remaining)
     [ 14
       13
       12
@@ -2557,7 +2557,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.431 units remaining)
+  - location: 164 (remaining gas: 1039835.341 units remaining)
     [ 15
       14
       13
@@ -2571,7 +2571,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.421 units remaining)
+  - location: 164 (remaining gas: 1039835.331 units remaining)
     [ 16
       15
       14
@@ -2586,7 +2586,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.411 units remaining)
+  - location: 164 (remaining gas: 1039835.321 units remaining)
     [ 17
       16
       15
@@ -2602,7 +2602,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039835.411 units remaining)
+  - location: 164 (remaining gas: 1039835.321 units remaining)
     [ 17
       16
       15
@@ -2618,36 +2618,36 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.411 units remaining)
+  - location: 168 (remaining gas: 1039835.321 units remaining)
     [ 5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 171 (remaining gas: 1039835.401 units remaining)
+  - location: 171 (remaining gas: 1039835.311 units remaining)
     [ (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.381 units remaining)
+  - location: 168 (remaining gas: 1039835.291 units remaining)
     [ 6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.371 units remaining)
+  - location: 168 (remaining gas: 1039835.281 units remaining)
     [ 7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.361 units remaining)
+  - location: 168 (remaining gas: 1039835.271 units remaining)
     [ 8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.351 units remaining)
+  - location: 168 (remaining gas: 1039835.261 units remaining)
     [ 9
       8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.341 units remaining)
+  - location: 168 (remaining gas: 1039835.251 units remaining)
     [ 10
       9
       8
@@ -2655,7 +2655,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.331 units remaining)
+  - location: 168 (remaining gas: 1039835.241 units remaining)
     [ 11
       10
       9
@@ -2664,7 +2664,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.321 units remaining)
+  - location: 168 (remaining gas: 1039835.231 units remaining)
     [ 12
       11
       10
@@ -2674,7 +2674,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.311 units remaining)
+  - location: 168 (remaining gas: 1039835.221 units remaining)
     [ 13
       12
       11
@@ -2685,7 +2685,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.301 units remaining)
+  - location: 168 (remaining gas: 1039835.211 units remaining)
     [ 14
       13
       12
@@ -2697,7 +2697,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.291 units remaining)
+  - location: 168 (remaining gas: 1039835.201 units remaining)
     [ 15
       14
       13
@@ -2710,7 +2710,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.281 units remaining)
+  - location: 168 (remaining gas: 1039835.191 units remaining)
     [ 16
       15
       14
@@ -2724,7 +2724,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.271 units remaining)
+  - location: 168 (remaining gas: 1039835.181 units remaining)
     [ 17
       16
       15
@@ -2739,7 +2739,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039835.271 units remaining)
+  - location: 168 (remaining gas: 1039835.181 units remaining)
     [ 17
       16
       15
@@ -2754,36 +2754,36 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.271 units remaining)
+  - location: 172 (remaining gas: 1039835.181 units remaining)
     [ 6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 175 (remaining gas: 1039835.261 units remaining)
+  - location: 175 (remaining gas: 1039835.171 units remaining)
     [ (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.241 units remaining)
+  - location: 172 (remaining gas: 1039835.151 units remaining)
     [ 7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.231 units remaining)
+  - location: 172 (remaining gas: 1039835.141 units remaining)
     [ 8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.221 units remaining)
+  - location: 172 (remaining gas: 1039835.131 units remaining)
     [ 9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.211 units remaining)
+  - location: 172 (remaining gas: 1039835.121 units remaining)
     [ 10
       9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.201 units remaining)
+  - location: 172 (remaining gas: 1039835.111 units remaining)
     [ 11
       10
       9
@@ -2791,7 +2791,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.191 units remaining)
+  - location: 172 (remaining gas: 1039835.101 units remaining)
     [ 12
       11
       10
@@ -2800,7 +2800,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.181 units remaining)
+  - location: 172 (remaining gas: 1039835.091 units remaining)
     [ 13
       12
       11
@@ -2810,7 +2810,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.171 units remaining)
+  - location: 172 (remaining gas: 1039835.081 units remaining)
     [ 14
       13
       12
@@ -2821,7 +2821,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.161 units remaining)
+  - location: 172 (remaining gas: 1039835.071 units remaining)
     [ 15
       14
       13
@@ -2833,7 +2833,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.151 units remaining)
+  - location: 172 (remaining gas: 1039835.061 units remaining)
     [ 16
       15
       14
@@ -2846,7 +2846,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.141 units remaining)
+  - location: 172 (remaining gas: 1039835.051 units remaining)
     [ 17
       16
       15
@@ -2860,7 +2860,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039835.141 units remaining)
+  - location: 172 (remaining gas: 1039835.051 units remaining)
     [ 17
       16
       15
@@ -2874,36 +2874,36 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.141 units remaining)
+  - location: 176 (remaining gas: 1039835.051 units remaining)
     [ 7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 179 (remaining gas: 1039835.131 units remaining)
+  - location: 179 (remaining gas: 1039835.041 units remaining)
     [ (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.111 units remaining)
+  - location: 176 (remaining gas: 1039835.021 units remaining)
     [ 8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.101 units remaining)
+  - location: 176 (remaining gas: 1039835.011 units remaining)
     [ 9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.091 units remaining)
+  - location: 176 (remaining gas: 1039835.001 units remaining)
     [ 10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.081 units remaining)
+  - location: 176 (remaining gas: 1039834.991 units remaining)
     [ 11
       10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.071 units remaining)
+  - location: 176 (remaining gas: 1039834.981 units remaining)
     [ 12
       11
       10
@@ -2911,7 +2911,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.061 units remaining)
+  - location: 176 (remaining gas: 1039834.971 units remaining)
     [ 13
       12
       11
@@ -2920,7 +2920,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.051 units remaining)
+  - location: 176 (remaining gas: 1039834.961 units remaining)
     [ 14
       13
       12
@@ -2930,7 +2930,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.041 units remaining)
+  - location: 176 (remaining gas: 1039834.951 units remaining)
     [ 15
       14
       13
@@ -2941,7 +2941,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.031 units remaining)
+  - location: 176 (remaining gas: 1039834.941 units remaining)
     [ 16
       15
       14
@@ -2953,7 +2953,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.021 units remaining)
+  - location: 176 (remaining gas: 1039834.931 units remaining)
     [ 17
       16
       15
@@ -2966,7 +2966,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039835.021 units remaining)
+  - location: 176 (remaining gas: 1039834.931 units remaining)
     [ 17
       16
       15
@@ -2979,36 +2979,36 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039835.021 units remaining)
+  - location: 180 (remaining gas: 1039834.931 units remaining)
     [ 8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 183 (remaining gas: 1039835.011 units remaining)
+  - location: 183 (remaining gas: 1039834.921 units remaining)
     [ (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.991 units remaining)
+  - location: 180 (remaining gas: 1039834.901 units remaining)
     [ 9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.981 units remaining)
+  - location: 180 (remaining gas: 1039834.891 units remaining)
     [ 10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.971 units remaining)
+  - location: 180 (remaining gas: 1039834.881 units remaining)
     [ 11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.961 units remaining)
+  - location: 180 (remaining gas: 1039834.871 units remaining)
     [ 12
       11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.951 units remaining)
+  - location: 180 (remaining gas: 1039834.861 units remaining)
     [ 13
       12
       11
@@ -3016,7 +3016,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.941 units remaining)
+  - location: 180 (remaining gas: 1039834.851 units remaining)
     [ 14
       13
       12
@@ -3025,7 +3025,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.931 units remaining)
+  - location: 180 (remaining gas: 1039834.841 units remaining)
     [ 15
       14
       13
@@ -3035,7 +3035,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.921 units remaining)
+  - location: 180 (remaining gas: 1039834.831 units remaining)
     [ 16
       15
       14
@@ -3046,7 +3046,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.911 units remaining)
+  - location: 180 (remaining gas: 1039834.821 units remaining)
     [ 17
       16
       15
@@ -3058,7 +3058,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039834.911 units remaining)
+  - location: 180 (remaining gas: 1039834.821 units remaining)
     [ 17
       16
       15
@@ -3070,36 +3070,36 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.911 units remaining)
+  - location: 184 (remaining gas: 1039834.821 units remaining)
     [ 9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 187 (remaining gas: 1039834.901 units remaining)
+  - location: 187 (remaining gas: 1039834.811 units remaining)
     [ (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.881 units remaining)
+  - location: 184 (remaining gas: 1039834.791 units remaining)
     [ 10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.871 units remaining)
+  - location: 184 (remaining gas: 1039834.781 units remaining)
     [ 11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.861 units remaining)
+  - location: 184 (remaining gas: 1039834.771 units remaining)
     [ 12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.851 units remaining)
+  - location: 184 (remaining gas: 1039834.761 units remaining)
     [ 13
       12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.841 units remaining)
+  - location: 184 (remaining gas: 1039834.751 units remaining)
     [ 14
       13
       12
@@ -3107,7 +3107,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.831 units remaining)
+  - location: 184 (remaining gas: 1039834.741 units remaining)
     [ 15
       14
       13
@@ -3116,7 +3116,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.821 units remaining)
+  - location: 184 (remaining gas: 1039834.731 units remaining)
     [ 16
       15
       14
@@ -3126,7 +3126,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.811 units remaining)
+  - location: 184 (remaining gas: 1039834.721 units remaining)
     [ 17
       16
       15
@@ -3137,7 +3137,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039834.811 units remaining)
+  - location: 184 (remaining gas: 1039834.721 units remaining)
     [ 17
       16
       15
@@ -3148,36 +3148,36 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.811 units remaining)
+  - location: 188 (remaining gas: 1039834.721 units remaining)
     [ 10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 191 (remaining gas: 1039834.801 units remaining)
+  - location: 191 (remaining gas: 1039834.711 units remaining)
     [ (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.781 units remaining)
+  - location: 188 (remaining gas: 1039834.691 units remaining)
     [ 11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.771 units remaining)
+  - location: 188 (remaining gas: 1039834.681 units remaining)
     [ 12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.761 units remaining)
+  - location: 188 (remaining gas: 1039834.671 units remaining)
     [ 13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.751 units remaining)
+  - location: 188 (remaining gas: 1039834.661 units remaining)
     [ 14
       13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.741 units remaining)
+  - location: 188 (remaining gas: 1039834.651 units remaining)
     [ 15
       14
       13
@@ -3185,7 +3185,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.731 units remaining)
+  - location: 188 (remaining gas: 1039834.641 units remaining)
     [ 16
       15
       14
@@ -3194,7 +3194,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.721 units remaining)
+  - location: 188 (remaining gas: 1039834.631 units remaining)
     [ 17
       16
       15
@@ -3204,7 +3204,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039834.721 units remaining)
+  - location: 188 (remaining gas: 1039834.631 units remaining)
     [ 17
       16
       15
@@ -3214,36 +3214,36 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.721 units remaining)
+  - location: 192 (remaining gas: 1039834.631 units remaining)
     [ 11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 195 (remaining gas: 1039834.711 units remaining)
+  - location: 195 (remaining gas: 1039834.621 units remaining)
     [ (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.691 units remaining)
+  - location: 192 (remaining gas: 1039834.601 units remaining)
     [ 12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.681 units remaining)
+  - location: 192 (remaining gas: 1039834.591 units remaining)
     [ 13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.671 units remaining)
+  - location: 192 (remaining gas: 1039834.581 units remaining)
     [ 14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.661 units remaining)
+  - location: 192 (remaining gas: 1039834.571 units remaining)
     [ 15
       14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.651 units remaining)
+  - location: 192 (remaining gas: 1039834.561 units remaining)
     [ 16
       15
       14
@@ -3251,7 +3251,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.641 units remaining)
+  - location: 192 (remaining gas: 1039834.551 units remaining)
     [ 17
       16
       15
@@ -3260,7 +3260,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039834.641 units remaining)
+  - location: 192 (remaining gas: 1039834.551 units remaining)
     [ 17
       16
       15
@@ -3269,36 +3269,36 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039834.641 units remaining)
+  - location: 196 (remaining gas: 1039834.551 units remaining)
     [ 12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 199 (remaining gas: 1039834.631 units remaining)
+  - location: 199 (remaining gas: 1039834.541 units remaining)
     [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039834.611 units remaining)
+  - location: 196 (remaining gas: 1039834.521 units remaining)
     [ 13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039834.601 units remaining)
+  - location: 196 (remaining gas: 1039834.511 units remaining)
     [ 14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039834.591 units remaining)
+  - location: 196 (remaining gas: 1039834.501 units remaining)
     [ 15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039834.581 units remaining)
+  - location: 196 (remaining gas: 1039834.491 units remaining)
     [ 16
       15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039834.571 units remaining)
+  - location: 196 (remaining gas: 1039834.481 units remaining)
     [ 17
       16
       15
@@ -3306,7 +3306,7 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039834.571 units remaining)
+  - location: 196 (remaining gas: 1039834.481 units remaining)
     [ 17
       16
       15
@@ -3314,118 +3314,118 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039834.571 units remaining)
+  - location: 200 (remaining gas: 1039834.481 units remaining)
     [ 13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 203 (remaining gas: 1039834.561 units remaining)
+  - location: 203 (remaining gas: 1039834.471 units remaining)
     [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039834.541 units remaining)
+  - location: 200 (remaining gas: 1039834.451 units remaining)
     [ 14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039834.531 units remaining)
+  - location: 200 (remaining gas: 1039834.441 units remaining)
     [ 15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039834.521 units remaining)
+  - location: 200 (remaining gas: 1039834.431 units remaining)
     [ 16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039834.511 units remaining)
+  - location: 200 (remaining gas: 1039834.421 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039834.511 units remaining)
+  - location: 200 (remaining gas: 1039834.421 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039834.511 units remaining)
+  - location: 204 (remaining gas: 1039834.421 units remaining)
     [ 14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 207 (remaining gas: 1039834.501 units remaining)
+  - location: 207 (remaining gas: 1039834.411 units remaining)
     [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039834.481 units remaining)
+  - location: 204 (remaining gas: 1039834.391 units remaining)
     [ 15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039834.471 units remaining)
+  - location: 204 (remaining gas: 1039834.381 units remaining)
     [ 16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039834.461 units remaining)
+  - location: 204 (remaining gas: 1039834.371 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039834.461 units remaining)
+  - location: 204 (remaining gas: 1039834.371 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039834.461 units remaining)
+  - location: 208 (remaining gas: 1039834.371 units remaining)
     [ 15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 211 (remaining gas: 1039834.451 units remaining)
+  - location: 211 (remaining gas: 1039834.361 units remaining)
     [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039834.431 units remaining)
+  - location: 208 (remaining gas: 1039834.341 units remaining)
     [ 16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039834.421 units remaining)
+  - location: 208 (remaining gas: 1039834.331 units remaining)
     [ 17
       16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039834.421 units remaining)
+  - location: 208 (remaining gas: 1039834.331 units remaining)
     [ 17
       16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 212 (remaining gas: 1039834.421 units remaining)
+  - location: 212 (remaining gas: 1039834.331 units remaining)
     [ 16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 214 (remaining gas: 1039834.411 units remaining)
+  - location: 214 (remaining gas: 1039834.321 units remaining)
     [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 212 (remaining gas: 1039834.391 units remaining)
+  - location: 212 (remaining gas: 1039834.301 units remaining)
     [ 17
       (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 215 (remaining gas: 1039834.381 units remaining)
+  - location: 215 (remaining gas: 1039834.291 units remaining)
     [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 218 (remaining gas: 1039833.626 units remaining)
+  - location: 218 (remaining gas: 1039833.536 units remaining)
     [ 0 ]
-  - location: 219 (remaining gas: 1039833.616 units remaining)
+  - location: 219 (remaining gas: 1039833.526 units remaining)
     [ True ]
-  - location: 220 (remaining gas: 1039833.616 units remaining)
+  - location: 220 (remaining gas: 1039833.526 units remaining)
     [  ]
-  - location: 220 (remaining gas: 1039833.606 units remaining)
+  - location: 220 (remaining gas: 1039833.516 units remaining)
     [  ]
-  - location: 226 (remaining gas: 1039833.596 units remaining)
+  - location: 226 (remaining gas: 1039833.506 units remaining)
     [ Unit ]
-  - location: 227 (remaining gas: 1039833.586 units remaining)
+  - location: 227 (remaining gas: 1039833.496 units remaining)
     [ {}
       Unit ]
-  - location: 229 (remaining gas: 1039833.576 units remaining)
+  - location: 229 (remaining gas: 1039833.486 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out
index 8463150768029e98ce7c7ad87ff4bbfec7f22994..34bc9ca6e4c1edaeb7961a4fac42cb03a3a19634 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out	
@@ -7,111 +7,111 @@ emitted operations
 big_map diff
   
 trace
-  - location: 24 (remaining gas: 1039840.257 units remaining)
+  - location: 24 (remaining gas: 1039840.167 units remaining)
     [ (Pair (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) Unit) ]
-  - location: 24 (remaining gas: 1039840.247 units remaining)
+  - location: 24 (remaining gas: 1039840.157 units remaining)
     [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 25 (remaining gas: 1039840.237 units remaining)
+  - location: 25 (remaining gas: 1039840.147 units remaining)
     [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 27 (remaining gas: 1039840.227 units remaining)
+  - location: 27 (remaining gas: 1039840.137 units remaining)
     [ 2
       (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 28 (remaining gas: 1039840.227 units remaining)
+  - location: 28 (remaining gas: 1039840.137 units remaining)
     [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 30 (remaining gas: 1039840.217 units remaining)
+  - location: 30 (remaining gas: 1039840.127 units remaining)
     [ 3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 28 (remaining gas: 1039840.197 units remaining)
+  - location: 28 (remaining gas: 1039840.107 units remaining)
     [ 2
       3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039840.197 units remaining)
+  - location: 31 (remaining gas: 1039840.107 units remaining)
     [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 34 (remaining gas: 1039840.187 units remaining)
+  - location: 34 (remaining gas: 1039840.097 units remaining)
     [ 12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039840.167 units remaining)
+  - location: 31 (remaining gas: 1039840.077 units remaining)
     [ 3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039840.157 units remaining)
+  - location: 31 (remaining gas: 1039840.067 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039840.157 units remaining)
+  - location: 31 (remaining gas: 1039840.067 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039840.157 units remaining)
+  - location: 35 (remaining gas: 1039840.067 units remaining)
     [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 38 (remaining gas: 1039840.147 units remaining)
+  - location: 38 (remaining gas: 1039840.057 units remaining)
     [ 16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039840.127 units remaining)
+  - location: 35 (remaining gas: 1039840.037 units remaining)
     [ 12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039840.117 units remaining)
+  - location: 35 (remaining gas: 1039840.027 units remaining)
     [ 3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039840.107 units remaining)
+  - location: 35 (remaining gas: 1039840.017 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039840.107 units remaining)
+  - location: 35 (remaining gas: 1039840.017 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039840.107 units remaining)
+  - location: 39 (remaining gas: 1039840.017 units remaining)
     [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 42 (remaining gas: 1039840.097 units remaining)
+  - location: 42 (remaining gas: 1039840.007 units remaining)
     [ 10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039840.077 units remaining)
+  - location: 39 (remaining gas: 1039839.987 units remaining)
     [ 16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039840.067 units remaining)
+  - location: 39 (remaining gas: 1039839.977 units remaining)
     [ 12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039840.057 units remaining)
+  - location: 39 (remaining gas: 1039839.967 units remaining)
     [ 3
       12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039840.047 units remaining)
+  - location: 39 (remaining gas: 1039839.957 units remaining)
     [ 2
       3
       12
@@ -119,7 +119,7 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039840.047 units remaining)
+  - location: 39 (remaining gas: 1039839.957 units remaining)
     [ 2
       3
       12
@@ -127,32 +127,32 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039840.047 units remaining)
+  - location: 43 (remaining gas: 1039839.957 units remaining)
     [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 46 (remaining gas: 1039840.037 units remaining)
+  - location: 46 (remaining gas: 1039839.947 units remaining)
     [ 14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039840.017 units remaining)
+  - location: 43 (remaining gas: 1039839.927 units remaining)
     [ 10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039840.007 units remaining)
+  - location: 43 (remaining gas: 1039839.917 units remaining)
     [ 16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039839.997 units remaining)
+  - location: 43 (remaining gas: 1039839.907 units remaining)
     [ 12
       16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039839.987 units remaining)
+  - location: 43 (remaining gas: 1039839.897 units remaining)
     [ 3
       12
       16
@@ -160,7 +160,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039839.977 units remaining)
+  - location: 43 (remaining gas: 1039839.887 units remaining)
     [ 2
       3
       12
@@ -169,7 +169,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039839.977 units remaining)
+  - location: 43 (remaining gas: 1039839.887 units remaining)
     [ 2
       3
       12
@@ -178,32 +178,32 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.977 units remaining)
+  - location: 47 (remaining gas: 1039839.887 units remaining)
     [ (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 50 (remaining gas: 1039839.967 units remaining)
+  - location: 50 (remaining gas: 1039839.877 units remaining)
     [ 19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.947 units remaining)
+  - location: 47 (remaining gas: 1039839.857 units remaining)
     [ 14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.937 units remaining)
+  - location: 47 (remaining gas: 1039839.847 units remaining)
     [ 10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.927 units remaining)
+  - location: 47 (remaining gas: 1039839.837 units remaining)
     [ 16
       10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.917 units remaining)
+  - location: 47 (remaining gas: 1039839.827 units remaining)
     [ 12
       16
       10
@@ -211,7 +211,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.907 units remaining)
+  - location: 47 (remaining gas: 1039839.817 units remaining)
     [ 3
       12
       16
@@ -220,7 +220,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.897 units remaining)
+  - location: 47 (remaining gas: 1039839.807 units remaining)
     [ 2
       3
       12
@@ -230,7 +230,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039839.897 units remaining)
+  - location: 47 (remaining gas: 1039839.807 units remaining)
     [ 2
       3
       12
@@ -240,32 +240,32 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.897 units remaining)
+  - location: 51 (remaining gas: 1039839.807 units remaining)
     [ (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 54 (remaining gas: 1039839.887 units remaining)
+  - location: 54 (remaining gas: 1039839.797 units remaining)
     [ 9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.867 units remaining)
+  - location: 51 (remaining gas: 1039839.777 units remaining)
     [ 19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.857 units remaining)
+  - location: 51 (remaining gas: 1039839.767 units remaining)
     [ 14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.847 units remaining)
+  - location: 51 (remaining gas: 1039839.757 units remaining)
     [ 10
       14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.837 units remaining)
+  - location: 51 (remaining gas: 1039839.747 units remaining)
     [ 16
       10
       14
@@ -273,7 +273,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.827 units remaining)
+  - location: 51 (remaining gas: 1039839.737 units remaining)
     [ 12
       16
       10
@@ -282,7 +282,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.817 units remaining)
+  - location: 51 (remaining gas: 1039839.727 units remaining)
     [ 3
       12
       16
@@ -292,7 +292,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.807 units remaining)
+  - location: 51 (remaining gas: 1039839.717 units remaining)
     [ 2
       3
       12
@@ -303,7 +303,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039839.807 units remaining)
+  - location: 51 (remaining gas: 1039839.717 units remaining)
     [ 2
       3
       12
@@ -314,32 +314,32 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.807 units remaining)
+  - location: 55 (remaining gas: 1039839.717 units remaining)
     [ (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 58 (remaining gas: 1039839.797 units remaining)
+  - location: 58 (remaining gas: 1039839.707 units remaining)
     [ 18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.777 units remaining)
+  - location: 55 (remaining gas: 1039839.687 units remaining)
     [ 9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.767 units remaining)
+  - location: 55 (remaining gas: 1039839.677 units remaining)
     [ 19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.757 units remaining)
+  - location: 55 (remaining gas: 1039839.667 units remaining)
     [ 14
       19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.747 units remaining)
+  - location: 55 (remaining gas: 1039839.657 units remaining)
     [ 10
       14
       19
@@ -347,7 +347,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.737 units remaining)
+  - location: 55 (remaining gas: 1039839.647 units remaining)
     [ 16
       10
       14
@@ -356,7 +356,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.727 units remaining)
+  - location: 55 (remaining gas: 1039839.637 units remaining)
     [ 12
       16
       10
@@ -366,7 +366,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.717 units remaining)
+  - location: 55 (remaining gas: 1039839.627 units remaining)
     [ 3
       12
       16
@@ -377,7 +377,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.707 units remaining)
+  - location: 55 (remaining gas: 1039839.617 units remaining)
     [ 2
       3
       12
@@ -389,7 +389,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039839.707 units remaining)
+  - location: 55 (remaining gas: 1039839.617 units remaining)
     [ 2
       3
       12
@@ -401,32 +401,32 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.707 units remaining)
+  - location: 59 (remaining gas: 1039839.617 units remaining)
     [ (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 62 (remaining gas: 1039839.697 units remaining)
+  - location: 62 (remaining gas: 1039839.607 units remaining)
     [ 6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.677 units remaining)
+  - location: 59 (remaining gas: 1039839.587 units remaining)
     [ 18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.667 units remaining)
+  - location: 59 (remaining gas: 1039839.577 units remaining)
     [ 9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.657 units remaining)
+  - location: 59 (remaining gas: 1039839.567 units remaining)
     [ 19
       9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.647 units remaining)
+  - location: 59 (remaining gas: 1039839.557 units remaining)
     [ 14
       19
       9
@@ -434,7 +434,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.637 units remaining)
+  - location: 59 (remaining gas: 1039839.547 units remaining)
     [ 10
       14
       19
@@ -443,7 +443,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.627 units remaining)
+  - location: 59 (remaining gas: 1039839.537 units remaining)
     [ 16
       10
       14
@@ -453,7 +453,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.617 units remaining)
+  - location: 59 (remaining gas: 1039839.527 units remaining)
     [ 12
       16
       10
@@ -464,7 +464,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.607 units remaining)
+  - location: 59 (remaining gas: 1039839.517 units remaining)
     [ 3
       12
       16
@@ -476,7 +476,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.597 units remaining)
+  - location: 59 (remaining gas: 1039839.507 units remaining)
     [ 2
       3
       12
@@ -489,7 +489,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039839.597 units remaining)
+  - location: 59 (remaining gas: 1039839.507 units remaining)
     [ 2
       3
       12
@@ -502,32 +502,32 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.597 units remaining)
+  - location: 63 (remaining gas: 1039839.507 units remaining)
     [ (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 66 (remaining gas: 1039839.587 units remaining)
+  - location: 66 (remaining gas: 1039839.497 units remaining)
     [ 8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.567 units remaining)
+  - location: 63 (remaining gas: 1039839.477 units remaining)
     [ 6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.557 units remaining)
+  - location: 63 (remaining gas: 1039839.467 units remaining)
     [ 18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.547 units remaining)
+  - location: 63 (remaining gas: 1039839.457 units remaining)
     [ 9
       18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.537 units remaining)
+  - location: 63 (remaining gas: 1039839.447 units remaining)
     [ 19
       9
       18
@@ -535,7 +535,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.527 units remaining)
+  - location: 63 (remaining gas: 1039839.437 units remaining)
     [ 14
       19
       9
@@ -544,7 +544,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.517 units remaining)
+  - location: 63 (remaining gas: 1039839.427 units remaining)
     [ 10
       14
       19
@@ -554,7 +554,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.507 units remaining)
+  - location: 63 (remaining gas: 1039839.417 units remaining)
     [ 16
       10
       14
@@ -565,7 +565,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.497 units remaining)
+  - location: 63 (remaining gas: 1039839.407 units remaining)
     [ 12
       16
       10
@@ -577,7 +577,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.487 units remaining)
+  - location: 63 (remaining gas: 1039839.397 units remaining)
     [ 3
       12
       16
@@ -590,7 +590,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.477 units remaining)
+  - location: 63 (remaining gas: 1039839.387 units remaining)
     [ 2
       3
       12
@@ -604,7 +604,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039839.477 units remaining)
+  - location: 63 (remaining gas: 1039839.387 units remaining)
     [ 2
       3
       12
@@ -618,32 +618,32 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.477 units remaining)
+  - location: 67 (remaining gas: 1039839.387 units remaining)
     [ (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 70 (remaining gas: 1039839.467 units remaining)
+  - location: 70 (remaining gas: 1039839.377 units remaining)
     [ 11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.447 units remaining)
+  - location: 67 (remaining gas: 1039839.357 units remaining)
     [ 8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.437 units remaining)
+  - location: 67 (remaining gas: 1039839.347 units remaining)
     [ 6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.427 units remaining)
+  - location: 67 (remaining gas: 1039839.337 units remaining)
     [ 18
       6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.417 units remaining)
+  - location: 67 (remaining gas: 1039839.327 units remaining)
     [ 9
       18
       6
@@ -651,7 +651,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.407 units remaining)
+  - location: 67 (remaining gas: 1039839.317 units remaining)
     [ 19
       9
       18
@@ -660,7 +660,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.397 units remaining)
+  - location: 67 (remaining gas: 1039839.307 units remaining)
     [ 14
       19
       9
@@ -670,7 +670,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.387 units remaining)
+  - location: 67 (remaining gas: 1039839.297 units remaining)
     [ 10
       14
       19
@@ -681,7 +681,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.377 units remaining)
+  - location: 67 (remaining gas: 1039839.287 units remaining)
     [ 16
       10
       14
@@ -693,7 +693,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.367 units remaining)
+  - location: 67 (remaining gas: 1039839.277 units remaining)
     [ 12
       16
       10
@@ -706,7 +706,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.357 units remaining)
+  - location: 67 (remaining gas: 1039839.267 units remaining)
     [ 3
       12
       16
@@ -720,7 +720,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.347 units remaining)
+  - location: 67 (remaining gas: 1039839.257 units remaining)
     [ 2
       3
       12
@@ -735,7 +735,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039839.347 units remaining)
+  - location: 67 (remaining gas: 1039839.257 units remaining)
     [ 2
       3
       12
@@ -750,32 +750,32 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.347 units remaining)
+  - location: 71 (remaining gas: 1039839.257 units remaining)
     [ (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 74 (remaining gas: 1039839.337 units remaining)
+  - location: 74 (remaining gas: 1039839.247 units remaining)
     [ 4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.317 units remaining)
+  - location: 71 (remaining gas: 1039839.227 units remaining)
     [ 11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.307 units remaining)
+  - location: 71 (remaining gas: 1039839.217 units remaining)
     [ 8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.297 units remaining)
+  - location: 71 (remaining gas: 1039839.207 units remaining)
     [ 6
       8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.287 units remaining)
+  - location: 71 (remaining gas: 1039839.197 units remaining)
     [ 18
       6
       8
@@ -783,7 +783,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.277 units remaining)
+  - location: 71 (remaining gas: 1039839.187 units remaining)
     [ 9
       18
       6
@@ -792,7 +792,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.267 units remaining)
+  - location: 71 (remaining gas: 1039839.177 units remaining)
     [ 19
       9
       18
@@ -802,7 +802,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.257 units remaining)
+  - location: 71 (remaining gas: 1039839.167 units remaining)
     [ 14
       19
       9
@@ -813,7 +813,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.247 units remaining)
+  - location: 71 (remaining gas: 1039839.157 units remaining)
     [ 10
       14
       19
@@ -825,7 +825,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.237 units remaining)
+  - location: 71 (remaining gas: 1039839.147 units remaining)
     [ 16
       10
       14
@@ -838,7 +838,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.227 units remaining)
+  - location: 71 (remaining gas: 1039839.137 units remaining)
     [ 12
       16
       10
@@ -852,7 +852,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.217 units remaining)
+  - location: 71 (remaining gas: 1039839.127 units remaining)
     [ 3
       12
       16
@@ -867,7 +867,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.207 units remaining)
+  - location: 71 (remaining gas: 1039839.117 units remaining)
     [ 2
       3
       12
@@ -883,7 +883,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039839.207 units remaining)
+  - location: 71 (remaining gas: 1039839.117 units remaining)
     [ 2
       3
       12
@@ -899,32 +899,32 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.207 units remaining)
+  - location: 75 (remaining gas: 1039839.117 units remaining)
     [ (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 78 (remaining gas: 1039839.197 units remaining)
+  - location: 78 (remaining gas: 1039839.107 units remaining)
     [ 13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.177 units remaining)
+  - location: 75 (remaining gas: 1039839.087 units remaining)
     [ 4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.167 units remaining)
+  - location: 75 (remaining gas: 1039839.077 units remaining)
     [ 11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.157 units remaining)
+  - location: 75 (remaining gas: 1039839.067 units remaining)
     [ 8
       11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.147 units remaining)
+  - location: 75 (remaining gas: 1039839.057 units remaining)
     [ 6
       8
       11
@@ -932,7 +932,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.137 units remaining)
+  - location: 75 (remaining gas: 1039839.047 units remaining)
     [ 18
       6
       8
@@ -941,7 +941,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.127 units remaining)
+  - location: 75 (remaining gas: 1039839.037 units remaining)
     [ 9
       18
       6
@@ -951,7 +951,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.117 units remaining)
+  - location: 75 (remaining gas: 1039839.027 units remaining)
     [ 19
       9
       18
@@ -962,7 +962,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.107 units remaining)
+  - location: 75 (remaining gas: 1039839.017 units remaining)
     [ 14
       19
       9
@@ -974,7 +974,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.097 units remaining)
+  - location: 75 (remaining gas: 1039839.007 units remaining)
     [ 10
       14
       19
@@ -987,7 +987,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.087 units remaining)
+  - location: 75 (remaining gas: 1039838.997 units remaining)
     [ 16
       10
       14
@@ -1001,7 +1001,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.077 units remaining)
+  - location: 75 (remaining gas: 1039838.987 units remaining)
     [ 12
       16
       10
@@ -1016,7 +1016,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.067 units remaining)
+  - location: 75 (remaining gas: 1039838.977 units remaining)
     [ 3
       12
       16
@@ -1032,7 +1032,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.057 units remaining)
+  - location: 75 (remaining gas: 1039838.967 units remaining)
     [ 2
       3
       12
@@ -1049,7 +1049,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039839.057 units remaining)
+  - location: 75 (remaining gas: 1039838.967 units remaining)
     [ 2
       3
       12
@@ -1066,32 +1066,32 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039839.057 units remaining)
+  - location: 79 (remaining gas: 1039838.967 units remaining)
     [ (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 82 (remaining gas: 1039839.047 units remaining)
+  - location: 82 (remaining gas: 1039838.957 units remaining)
     [ 15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039839.027 units remaining)
+  - location: 79 (remaining gas: 1039838.937 units remaining)
     [ 13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039839.017 units remaining)
+  - location: 79 (remaining gas: 1039838.927 units remaining)
     [ 4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039839.007 units remaining)
+  - location: 79 (remaining gas: 1039838.917 units remaining)
     [ 11
       4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.997 units remaining)
+  - location: 79 (remaining gas: 1039838.907 units remaining)
     [ 8
       11
       4
@@ -1099,7 +1099,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.987 units remaining)
+  - location: 79 (remaining gas: 1039838.897 units remaining)
     [ 6
       8
       11
@@ -1108,7 +1108,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.977 units remaining)
+  - location: 79 (remaining gas: 1039838.887 units remaining)
     [ 18
       6
       8
@@ -1118,7 +1118,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.967 units remaining)
+  - location: 79 (remaining gas: 1039838.877 units remaining)
     [ 9
       18
       6
@@ -1129,7 +1129,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.957 units remaining)
+  - location: 79 (remaining gas: 1039838.867 units remaining)
     [ 19
       9
       18
@@ -1141,7 +1141,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.947 units remaining)
+  - location: 79 (remaining gas: 1039838.857 units remaining)
     [ 14
       19
       9
@@ -1154,7 +1154,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.937 units remaining)
+  - location: 79 (remaining gas: 1039838.847 units remaining)
     [ 10
       14
       19
@@ -1168,7 +1168,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.927 units remaining)
+  - location: 79 (remaining gas: 1039838.837 units remaining)
     [ 16
       10
       14
@@ -1183,7 +1183,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.917 units remaining)
+  - location: 79 (remaining gas: 1039838.827 units remaining)
     [ 12
       16
       10
@@ -1199,7 +1199,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.907 units remaining)
+  - location: 79 (remaining gas: 1039838.817 units remaining)
     [ 3
       12
       16
@@ -1216,7 +1216,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.897 units remaining)
+  - location: 79 (remaining gas: 1039838.807 units remaining)
     [ 2
       3
       12
@@ -1234,7 +1234,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039838.897 units remaining)
+  - location: 79 (remaining gas: 1039838.807 units remaining)
     [ 2
       3
       12
@@ -1252,32 +1252,32 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.897 units remaining)
+  - location: 83 (remaining gas: 1039838.807 units remaining)
     [ (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 86 (remaining gas: 1039838.887 units remaining)
+  - location: 86 (remaining gas: 1039838.797 units remaining)
     [ 5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.867 units remaining)
+  - location: 83 (remaining gas: 1039838.777 units remaining)
     [ 15
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.857 units remaining)
+  - location: 83 (remaining gas: 1039838.767 units remaining)
     [ 13
       15
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.847 units remaining)
+  - location: 83 (remaining gas: 1039838.757 units remaining)
     [ 4
       13
       15
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.837 units remaining)
+  - location: 83 (remaining gas: 1039838.747 units remaining)
     [ 11
       4
       13
@@ -1285,7 +1285,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.827 units remaining)
+  - location: 83 (remaining gas: 1039838.737 units remaining)
     [ 8
       11
       4
@@ -1294,7 +1294,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.817 units remaining)
+  - location: 83 (remaining gas: 1039838.727 units remaining)
     [ 6
       8
       11
@@ -1304,7 +1304,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.807 units remaining)
+  - location: 83 (remaining gas: 1039838.717 units remaining)
     [ 18
       6
       8
@@ -1315,7 +1315,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.797 units remaining)
+  - location: 83 (remaining gas: 1039838.707 units remaining)
     [ 9
       18
       6
@@ -1327,7 +1327,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.787 units remaining)
+  - location: 83 (remaining gas: 1039838.697 units remaining)
     [ 19
       9
       18
@@ -1340,7 +1340,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.777 units remaining)
+  - location: 83 (remaining gas: 1039838.687 units remaining)
     [ 14
       19
       9
@@ -1354,7 +1354,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.767 units remaining)
+  - location: 83 (remaining gas: 1039838.677 units remaining)
     [ 10
       14
       19
@@ -1369,7 +1369,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.757 units remaining)
+  - location: 83 (remaining gas: 1039838.667 units remaining)
     [ 16
       10
       14
@@ -1385,7 +1385,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.747 units remaining)
+  - location: 83 (remaining gas: 1039838.657 units remaining)
     [ 12
       16
       10
@@ -1402,7 +1402,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.737 units remaining)
+  - location: 83 (remaining gas: 1039838.647 units remaining)
     [ 3
       12
       16
@@ -1420,7 +1420,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.727 units remaining)
+  - location: 83 (remaining gas: 1039838.637 units remaining)
     [ 2
       3
       12
@@ -1439,7 +1439,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039838.727 units remaining)
+  - location: 83 (remaining gas: 1039838.637 units remaining)
     [ 2
       3
       12
@@ -1458,7 +1458,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 87 (remaining gas: 1039838.697 units remaining)
+  - location: 87 (remaining gas: 1039838.607 units remaining)
     [ 2
       3
       12
@@ -1477,7 +1477,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 89 (remaining gas: 1039838.661 units remaining)
+  - location: 89 (remaining gas: 1039838.571 units remaining)
     [ 3
       2
       12
@@ -1496,7 +1496,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 91 (remaining gas: 1039838.618 units remaining)
+  - location: 91 (remaining gas: 1039838.528 units remaining)
     [ 12
       3
       2
@@ -1515,7 +1515,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 93 (remaining gas: 1039838.569 units remaining)
+  - location: 93 (remaining gas: 1039838.479 units remaining)
     [ 16
       12
       3
@@ -1534,7 +1534,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 95 (remaining gas: 1039838.512 units remaining)
+  - location: 95 (remaining gas: 1039838.422 units remaining)
     [ 10
       16
       12
@@ -1553,7 +1553,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 97 (remaining gas: 1039838.449 units remaining)
+  - location: 97 (remaining gas: 1039838.359 units remaining)
     [ 14
       10
       16
@@ -1572,7 +1572,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 99 (remaining gas: 1039838.379 units remaining)
+  - location: 99 (remaining gas: 1039838.289 units remaining)
     [ 19
       14
       10
@@ -1591,7 +1591,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 101 (remaining gas: 1039838.303 units remaining)
+  - location: 101 (remaining gas: 1039838.213 units remaining)
     [ 9
       19
       14
@@ -1610,7 +1610,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 103 (remaining gas: 1039838.219 units remaining)
+  - location: 103 (remaining gas: 1039838.129 units remaining)
     [ 18
       9
       19
@@ -1629,7 +1629,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 105 (remaining gas: 1039838.129 units remaining)
+  - location: 105 (remaining gas: 1039838.039 units remaining)
     [ 6
       18
       9
@@ -1648,7 +1648,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 107 (remaining gas: 1039838.032 units remaining)
+  - location: 107 (remaining gas: 1039837.942 units remaining)
     [ 8
       6
       18
@@ -1667,7 +1667,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 109 (remaining gas: 1039837.929 units remaining)
+  - location: 109 (remaining gas: 1039837.839 units remaining)
     [ 11
       8
       6
@@ -1686,7 +1686,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 111 (remaining gas: 1039837.818 units remaining)
+  - location: 111 (remaining gas: 1039837.728 units remaining)
     [ 4
       11
       8
@@ -1705,7 +1705,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 113 (remaining gas: 1039837.701 units remaining)
+  - location: 113 (remaining gas: 1039837.611 units remaining)
     [ 13
       4
       11
@@ -1724,7 +1724,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 115 (remaining gas: 1039837.577 units remaining)
+  - location: 115 (remaining gas: 1039837.487 units remaining)
     [ 15
       13
       4
@@ -1743,7 +1743,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 117 (remaining gas: 1039837.447 units remaining)
+  - location: 117 (remaining gas: 1039837.357 units remaining)
     [ 5
       15
       13
@@ -1762,7 +1762,7 @@ trace
       2
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 119 (remaining gas: 1039837.309 units remaining)
+  - location: 119 (remaining gas: 1039837.219 units remaining)
     [ 1
       5
       15
@@ -1781,7 +1781,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 121 (remaining gas: 1039837.279 units remaining)
+  - location: 121 (remaining gas: 1039837.189 units remaining)
     [ 1
       5
       15
@@ -1800,7 +1800,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 123 (remaining gas: 1039837.243 units remaining)
+  - location: 123 (remaining gas: 1039837.153 units remaining)
     [ 5
       1
       15
@@ -1819,7 +1819,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 125 (remaining gas: 1039837.200 units remaining)
+  - location: 125 (remaining gas: 1039837.110 units remaining)
     [ 15
       5
       1
@@ -1838,7 +1838,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 127 (remaining gas: 1039837.151 units remaining)
+  - location: 127 (remaining gas: 1039837.061 units remaining)
     [ 13
       15
       5
@@ -1857,7 +1857,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 129 (remaining gas: 1039837.094 units remaining)
+  - location: 129 (remaining gas: 1039837.004 units remaining)
     [ 4
       13
       15
@@ -1876,7 +1876,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 131 (remaining gas: 1039837.031 units remaining)
+  - location: 131 (remaining gas: 1039836.941 units remaining)
     [ 11
       4
       13
@@ -1895,7 +1895,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 133 (remaining gas: 1039836.961 units remaining)
+  - location: 133 (remaining gas: 1039836.871 units remaining)
     [ 8
       11
       4
@@ -1914,7 +1914,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 135 (remaining gas: 1039836.885 units remaining)
+  - location: 135 (remaining gas: 1039836.795 units remaining)
     [ 6
       8
       11
@@ -1933,7 +1933,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 137 (remaining gas: 1039836.801 units remaining)
+  - location: 137 (remaining gas: 1039836.711 units remaining)
     [ 18
       6
       8
@@ -1952,7 +1952,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 139 (remaining gas: 1039836.711 units remaining)
+  - location: 139 (remaining gas: 1039836.621 units remaining)
     [ 9
       18
       6
@@ -1971,7 +1971,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 141 (remaining gas: 1039836.614 units remaining)
+  - location: 141 (remaining gas: 1039836.524 units remaining)
     [ 19
       9
       18
@@ -1990,7 +1990,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 143 (remaining gas: 1039836.511 units remaining)
+  - location: 143 (remaining gas: 1039836.421 units remaining)
     [ 14
       19
       9
@@ -2009,7 +2009,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 145 (remaining gas: 1039836.400 units remaining)
+  - location: 145 (remaining gas: 1039836.310 units remaining)
     [ 10
       14
       19
@@ -2028,7 +2028,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 147 (remaining gas: 1039836.283 units remaining)
+  - location: 147 (remaining gas: 1039836.193 units remaining)
     [ 16
       10
       14
@@ -2047,7 +2047,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 149 (remaining gas: 1039836.159 units remaining)
+  - location: 149 (remaining gas: 1039836.069 units remaining)
     [ 12
       16
       10
@@ -2066,7 +2066,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 151 (remaining gas: 1039836.029 units remaining)
+  - location: 151 (remaining gas: 1039835.939 units remaining)
     [ 3
       12
       16
@@ -2085,7 +2085,7 @@ trace
       1
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 153 (remaining gas: 1039835.891 units remaining)
+  - location: 153 (remaining gas: 1039835.801 units remaining)
     [ 2
       3
       12
@@ -2104,36 +2104,36 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.891 units remaining)
+  - location: 156 (remaining gas: 1039835.801 units remaining)
     [ 5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 159 (remaining gas: 1039835.881 units remaining)
+  - location: 159 (remaining gas: 1039835.791 units remaining)
     [ (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.861 units remaining)
+  - location: 156 (remaining gas: 1039835.771 units remaining)
     [ 15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.851 units remaining)
+  - location: 156 (remaining gas: 1039835.761 units remaining)
     [ 13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.841 units remaining)
+  - location: 156 (remaining gas: 1039835.751 units remaining)
     [ 4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.831 units remaining)
+  - location: 156 (remaining gas: 1039835.741 units remaining)
     [ 11
       4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.821 units remaining)
+  - location: 156 (remaining gas: 1039835.731 units remaining)
     [ 8
       11
       4
@@ -2141,7 +2141,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.811 units remaining)
+  - location: 156 (remaining gas: 1039835.721 units remaining)
     [ 6
       8
       11
@@ -2150,7 +2150,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.801 units remaining)
+  - location: 156 (remaining gas: 1039835.711 units remaining)
     [ 18
       6
       8
@@ -2160,7 +2160,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.791 units remaining)
+  - location: 156 (remaining gas: 1039835.701 units remaining)
     [ 9
       18
       6
@@ -2171,7 +2171,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.781 units remaining)
+  - location: 156 (remaining gas: 1039835.691 units remaining)
     [ 19
       9
       18
@@ -2183,7 +2183,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.771 units remaining)
+  - location: 156 (remaining gas: 1039835.681 units remaining)
     [ 14
       19
       9
@@ -2196,7 +2196,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.761 units remaining)
+  - location: 156 (remaining gas: 1039835.671 units remaining)
     [ 10
       14
       19
@@ -2210,7 +2210,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.751 units remaining)
+  - location: 156 (remaining gas: 1039835.661 units remaining)
     [ 16
       10
       14
@@ -2225,7 +2225,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.741 units remaining)
+  - location: 156 (remaining gas: 1039835.651 units remaining)
     [ 12
       16
       10
@@ -2241,7 +2241,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.731 units remaining)
+  - location: 156 (remaining gas: 1039835.641 units remaining)
     [ 3
       12
       16
@@ -2258,7 +2258,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.721 units remaining)
+  - location: 156 (remaining gas: 1039835.631 units remaining)
     [ 2
       3
       12
@@ -2276,7 +2276,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039835.721 units remaining)
+  - location: 156 (remaining gas: 1039835.631 units remaining)
     [ 2
       3
       12
@@ -2294,36 +2294,36 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.721 units remaining)
+  - location: 160 (remaining gas: 1039835.631 units remaining)
     [ 15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 163 (remaining gas: 1039835.711 units remaining)
+  - location: 163 (remaining gas: 1039835.621 units remaining)
     [ (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.691 units remaining)
+  - location: 160 (remaining gas: 1039835.601 units remaining)
     [ 13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.681 units remaining)
+  - location: 160 (remaining gas: 1039835.591 units remaining)
     [ 4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.671 units remaining)
+  - location: 160 (remaining gas: 1039835.581 units remaining)
     [ 11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.661 units remaining)
+  - location: 160 (remaining gas: 1039835.571 units remaining)
     [ 8
       11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.651 units remaining)
+  - location: 160 (remaining gas: 1039835.561 units remaining)
     [ 6
       8
       11
@@ -2331,7 +2331,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.641 units remaining)
+  - location: 160 (remaining gas: 1039835.551 units remaining)
     [ 18
       6
       8
@@ -2340,7 +2340,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.631 units remaining)
+  - location: 160 (remaining gas: 1039835.541 units remaining)
     [ 9
       18
       6
@@ -2350,7 +2350,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.621 units remaining)
+  - location: 160 (remaining gas: 1039835.531 units remaining)
     [ 19
       9
       18
@@ -2361,7 +2361,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.611 units remaining)
+  - location: 160 (remaining gas: 1039835.521 units remaining)
     [ 14
       19
       9
@@ -2373,7 +2373,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.601 units remaining)
+  - location: 160 (remaining gas: 1039835.511 units remaining)
     [ 10
       14
       19
@@ -2386,7 +2386,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.591 units remaining)
+  - location: 160 (remaining gas: 1039835.501 units remaining)
     [ 16
       10
       14
@@ -2400,7 +2400,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.581 units remaining)
+  - location: 160 (remaining gas: 1039835.491 units remaining)
     [ 12
       16
       10
@@ -2415,7 +2415,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.571 units remaining)
+  - location: 160 (remaining gas: 1039835.481 units remaining)
     [ 3
       12
       16
@@ -2431,7 +2431,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.561 units remaining)
+  - location: 160 (remaining gas: 1039835.471 units remaining)
     [ 2
       3
       12
@@ -2448,7 +2448,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039835.561 units remaining)
+  - location: 160 (remaining gas: 1039835.471 units remaining)
     [ 2
       3
       12
@@ -2465,36 +2465,36 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.561 units remaining)
+  - location: 164 (remaining gas: 1039835.471 units remaining)
     [ 13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 167 (remaining gas: 1039835.551 units remaining)
+  - location: 167 (remaining gas: 1039835.461 units remaining)
     [ (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.531 units remaining)
+  - location: 164 (remaining gas: 1039835.441 units remaining)
     [ 4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.521 units remaining)
+  - location: 164 (remaining gas: 1039835.431 units remaining)
     [ 11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.511 units remaining)
+  - location: 164 (remaining gas: 1039835.421 units remaining)
     [ 8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.501 units remaining)
+  - location: 164 (remaining gas: 1039835.411 units remaining)
     [ 6
       8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.491 units remaining)
+  - location: 164 (remaining gas: 1039835.401 units remaining)
     [ 18
       6
       8
@@ -2502,7 +2502,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.481 units remaining)
+  - location: 164 (remaining gas: 1039835.391 units remaining)
     [ 9
       18
       6
@@ -2511,7 +2511,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.471 units remaining)
+  - location: 164 (remaining gas: 1039835.381 units remaining)
     [ 19
       9
       18
@@ -2521,7 +2521,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.461 units remaining)
+  - location: 164 (remaining gas: 1039835.371 units remaining)
     [ 14
       19
       9
@@ -2532,7 +2532,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.451 units remaining)
+  - location: 164 (remaining gas: 1039835.361 units remaining)
     [ 10
       14
       19
@@ -2544,7 +2544,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.441 units remaining)
+  - location: 164 (remaining gas: 1039835.351 units remaining)
     [ 16
       10
       14
@@ -2557,7 +2557,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.431 units remaining)
+  - location: 164 (remaining gas: 1039835.341 units remaining)
     [ 12
       16
       10
@@ -2571,7 +2571,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.421 units remaining)
+  - location: 164 (remaining gas: 1039835.331 units remaining)
     [ 3
       12
       16
@@ -2586,7 +2586,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.411 units remaining)
+  - location: 164 (remaining gas: 1039835.321 units remaining)
     [ 2
       3
       12
@@ -2602,7 +2602,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039835.411 units remaining)
+  - location: 164 (remaining gas: 1039835.321 units remaining)
     [ 2
       3
       12
@@ -2618,36 +2618,36 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.411 units remaining)
+  - location: 168 (remaining gas: 1039835.321 units remaining)
     [ 4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 171 (remaining gas: 1039835.401 units remaining)
+  - location: 171 (remaining gas: 1039835.311 units remaining)
     [ (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.381 units remaining)
+  - location: 168 (remaining gas: 1039835.291 units remaining)
     [ 11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.371 units remaining)
+  - location: 168 (remaining gas: 1039835.281 units remaining)
     [ 8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.361 units remaining)
+  - location: 168 (remaining gas: 1039835.271 units remaining)
     [ 6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.351 units remaining)
+  - location: 168 (remaining gas: 1039835.261 units remaining)
     [ 18
       6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.341 units remaining)
+  - location: 168 (remaining gas: 1039835.251 units remaining)
     [ 9
       18
       6
@@ -2655,7 +2655,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.331 units remaining)
+  - location: 168 (remaining gas: 1039835.241 units remaining)
     [ 19
       9
       18
@@ -2664,7 +2664,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.321 units remaining)
+  - location: 168 (remaining gas: 1039835.231 units remaining)
     [ 14
       19
       9
@@ -2674,7 +2674,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.311 units remaining)
+  - location: 168 (remaining gas: 1039835.221 units remaining)
     [ 10
       14
       19
@@ -2685,7 +2685,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.301 units remaining)
+  - location: 168 (remaining gas: 1039835.211 units remaining)
     [ 16
       10
       14
@@ -2697,7 +2697,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.291 units remaining)
+  - location: 168 (remaining gas: 1039835.201 units remaining)
     [ 12
       16
       10
@@ -2710,7 +2710,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.281 units remaining)
+  - location: 168 (remaining gas: 1039835.191 units remaining)
     [ 3
       12
       16
@@ -2724,7 +2724,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.271 units remaining)
+  - location: 168 (remaining gas: 1039835.181 units remaining)
     [ 2
       3
       12
@@ -2739,7 +2739,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039835.271 units remaining)
+  - location: 168 (remaining gas: 1039835.181 units remaining)
     [ 2
       3
       12
@@ -2754,36 +2754,36 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.271 units remaining)
+  - location: 172 (remaining gas: 1039835.181 units remaining)
     [ 11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 175 (remaining gas: 1039835.261 units remaining)
+  - location: 175 (remaining gas: 1039835.171 units remaining)
     [ (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.241 units remaining)
+  - location: 172 (remaining gas: 1039835.151 units remaining)
     [ 8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.231 units remaining)
+  - location: 172 (remaining gas: 1039835.141 units remaining)
     [ 6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.221 units remaining)
+  - location: 172 (remaining gas: 1039835.131 units remaining)
     [ 18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.211 units remaining)
+  - location: 172 (remaining gas: 1039835.121 units remaining)
     [ 9
       18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.201 units remaining)
+  - location: 172 (remaining gas: 1039835.111 units remaining)
     [ 19
       9
       18
@@ -2791,7 +2791,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.191 units remaining)
+  - location: 172 (remaining gas: 1039835.101 units remaining)
     [ 14
       19
       9
@@ -2800,7 +2800,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.181 units remaining)
+  - location: 172 (remaining gas: 1039835.091 units remaining)
     [ 10
       14
       19
@@ -2810,7 +2810,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.171 units remaining)
+  - location: 172 (remaining gas: 1039835.081 units remaining)
     [ 16
       10
       14
@@ -2821,7 +2821,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.161 units remaining)
+  - location: 172 (remaining gas: 1039835.071 units remaining)
     [ 12
       16
       10
@@ -2833,7 +2833,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.151 units remaining)
+  - location: 172 (remaining gas: 1039835.061 units remaining)
     [ 3
       12
       16
@@ -2846,7 +2846,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.141 units remaining)
+  - location: 172 (remaining gas: 1039835.051 units remaining)
     [ 2
       3
       12
@@ -2860,7 +2860,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039835.141 units remaining)
+  - location: 172 (remaining gas: 1039835.051 units remaining)
     [ 2
       3
       12
@@ -2874,36 +2874,36 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.141 units remaining)
+  - location: 176 (remaining gas: 1039835.051 units remaining)
     [ 8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 179 (remaining gas: 1039835.131 units remaining)
+  - location: 179 (remaining gas: 1039835.041 units remaining)
     [ (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.111 units remaining)
+  - location: 176 (remaining gas: 1039835.021 units remaining)
     [ 6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.101 units remaining)
+  - location: 176 (remaining gas: 1039835.011 units remaining)
     [ 18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.091 units remaining)
+  - location: 176 (remaining gas: 1039835.001 units remaining)
     [ 9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.081 units remaining)
+  - location: 176 (remaining gas: 1039834.991 units remaining)
     [ 19
       9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.071 units remaining)
+  - location: 176 (remaining gas: 1039834.981 units remaining)
     [ 14
       19
       9
@@ -2911,7 +2911,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.061 units remaining)
+  - location: 176 (remaining gas: 1039834.971 units remaining)
     [ 10
       14
       19
@@ -2920,7 +2920,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.051 units remaining)
+  - location: 176 (remaining gas: 1039834.961 units remaining)
     [ 16
       10
       14
@@ -2930,7 +2930,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.041 units remaining)
+  - location: 176 (remaining gas: 1039834.951 units remaining)
     [ 12
       16
       10
@@ -2941,7 +2941,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.031 units remaining)
+  - location: 176 (remaining gas: 1039834.941 units remaining)
     [ 3
       12
       16
@@ -2953,7 +2953,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.021 units remaining)
+  - location: 176 (remaining gas: 1039834.931 units remaining)
     [ 2
       3
       12
@@ -2966,7 +2966,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039835.021 units remaining)
+  - location: 176 (remaining gas: 1039834.931 units remaining)
     [ 2
       3
       12
@@ -2979,36 +2979,36 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039835.021 units remaining)
+  - location: 180 (remaining gas: 1039834.931 units remaining)
     [ 6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 183 (remaining gas: 1039835.011 units remaining)
+  - location: 183 (remaining gas: 1039834.921 units remaining)
     [ (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.991 units remaining)
+  - location: 180 (remaining gas: 1039834.901 units remaining)
     [ 18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.981 units remaining)
+  - location: 180 (remaining gas: 1039834.891 units remaining)
     [ 9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.971 units remaining)
+  - location: 180 (remaining gas: 1039834.881 units remaining)
     [ 19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.961 units remaining)
+  - location: 180 (remaining gas: 1039834.871 units remaining)
     [ 14
       19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.951 units remaining)
+  - location: 180 (remaining gas: 1039834.861 units remaining)
     [ 10
       14
       19
@@ -3016,7 +3016,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.941 units remaining)
+  - location: 180 (remaining gas: 1039834.851 units remaining)
     [ 16
       10
       14
@@ -3025,7 +3025,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.931 units remaining)
+  - location: 180 (remaining gas: 1039834.841 units remaining)
     [ 12
       16
       10
@@ -3035,7 +3035,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.921 units remaining)
+  - location: 180 (remaining gas: 1039834.831 units remaining)
     [ 3
       12
       16
@@ -3046,7 +3046,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.911 units remaining)
+  - location: 180 (remaining gas: 1039834.821 units remaining)
     [ 2
       3
       12
@@ -3058,7 +3058,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039834.911 units remaining)
+  - location: 180 (remaining gas: 1039834.821 units remaining)
     [ 2
       3
       12
@@ -3070,36 +3070,36 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.911 units remaining)
+  - location: 184 (remaining gas: 1039834.821 units remaining)
     [ 18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 187 (remaining gas: 1039834.901 units remaining)
+  - location: 187 (remaining gas: 1039834.811 units remaining)
     [ (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.881 units remaining)
+  - location: 184 (remaining gas: 1039834.791 units remaining)
     [ 9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.871 units remaining)
+  - location: 184 (remaining gas: 1039834.781 units remaining)
     [ 19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.861 units remaining)
+  - location: 184 (remaining gas: 1039834.771 units remaining)
     [ 14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.851 units remaining)
+  - location: 184 (remaining gas: 1039834.761 units remaining)
     [ 10
       14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.841 units remaining)
+  - location: 184 (remaining gas: 1039834.751 units remaining)
     [ 16
       10
       14
@@ -3107,7 +3107,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.831 units remaining)
+  - location: 184 (remaining gas: 1039834.741 units remaining)
     [ 12
       16
       10
@@ -3116,7 +3116,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.821 units remaining)
+  - location: 184 (remaining gas: 1039834.731 units remaining)
     [ 3
       12
       16
@@ -3126,7 +3126,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.811 units remaining)
+  - location: 184 (remaining gas: 1039834.721 units remaining)
     [ 2
       3
       12
@@ -3137,7 +3137,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039834.811 units remaining)
+  - location: 184 (remaining gas: 1039834.721 units remaining)
     [ 2
       3
       12
@@ -3148,36 +3148,36 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.811 units remaining)
+  - location: 188 (remaining gas: 1039834.721 units remaining)
     [ 9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 191 (remaining gas: 1039834.801 units remaining)
+  - location: 191 (remaining gas: 1039834.711 units remaining)
     [ (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.781 units remaining)
+  - location: 188 (remaining gas: 1039834.691 units remaining)
     [ 19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.771 units remaining)
+  - location: 188 (remaining gas: 1039834.681 units remaining)
     [ 14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.761 units remaining)
+  - location: 188 (remaining gas: 1039834.671 units remaining)
     [ 10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.751 units remaining)
+  - location: 188 (remaining gas: 1039834.661 units remaining)
     [ 16
       10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.741 units remaining)
+  - location: 188 (remaining gas: 1039834.651 units remaining)
     [ 12
       16
       10
@@ -3185,7 +3185,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.731 units remaining)
+  - location: 188 (remaining gas: 1039834.641 units remaining)
     [ 3
       12
       16
@@ -3194,7 +3194,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.721 units remaining)
+  - location: 188 (remaining gas: 1039834.631 units remaining)
     [ 2
       3
       12
@@ -3204,7 +3204,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039834.721 units remaining)
+  - location: 188 (remaining gas: 1039834.631 units remaining)
     [ 2
       3
       12
@@ -3214,36 +3214,36 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.721 units remaining)
+  - location: 192 (remaining gas: 1039834.631 units remaining)
     [ 19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 195 (remaining gas: 1039834.711 units remaining)
+  - location: 195 (remaining gas: 1039834.621 units remaining)
     [ (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.691 units remaining)
+  - location: 192 (remaining gas: 1039834.601 units remaining)
     [ 14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.681 units remaining)
+  - location: 192 (remaining gas: 1039834.591 units remaining)
     [ 10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.671 units remaining)
+  - location: 192 (remaining gas: 1039834.581 units remaining)
     [ 16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.661 units remaining)
+  - location: 192 (remaining gas: 1039834.571 units remaining)
     [ 12
       16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.651 units remaining)
+  - location: 192 (remaining gas: 1039834.561 units remaining)
     [ 3
       12
       16
@@ -3251,7 +3251,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.641 units remaining)
+  - location: 192 (remaining gas: 1039834.551 units remaining)
     [ 2
       3
       12
@@ -3260,7 +3260,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039834.641 units remaining)
+  - location: 192 (remaining gas: 1039834.551 units remaining)
     [ 2
       3
       12
@@ -3269,36 +3269,36 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039834.641 units remaining)
+  - location: 196 (remaining gas: 1039834.551 units remaining)
     [ 14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 199 (remaining gas: 1039834.631 units remaining)
+  - location: 199 (remaining gas: 1039834.541 units remaining)
     [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039834.611 units remaining)
+  - location: 196 (remaining gas: 1039834.521 units remaining)
     [ 10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039834.601 units remaining)
+  - location: 196 (remaining gas: 1039834.511 units remaining)
     [ 16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039834.591 units remaining)
+  - location: 196 (remaining gas: 1039834.501 units remaining)
     [ 12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039834.581 units remaining)
+  - location: 196 (remaining gas: 1039834.491 units remaining)
     [ 3
       12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039834.571 units remaining)
+  - location: 196 (remaining gas: 1039834.481 units remaining)
     [ 2
       3
       12
@@ -3306,7 +3306,7 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039834.571 units remaining)
+  - location: 196 (remaining gas: 1039834.481 units remaining)
     [ 2
       3
       12
@@ -3314,118 +3314,118 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039834.571 units remaining)
+  - location: 200 (remaining gas: 1039834.481 units remaining)
     [ 10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 203 (remaining gas: 1039834.561 units remaining)
+  - location: 203 (remaining gas: 1039834.471 units remaining)
     [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039834.541 units remaining)
+  - location: 200 (remaining gas: 1039834.451 units remaining)
     [ 16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039834.531 units remaining)
+  - location: 200 (remaining gas: 1039834.441 units remaining)
     [ 12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039834.521 units remaining)
+  - location: 200 (remaining gas: 1039834.431 units remaining)
     [ 3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039834.511 units remaining)
+  - location: 200 (remaining gas: 1039834.421 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039834.511 units remaining)
+  - location: 200 (remaining gas: 1039834.421 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039834.511 units remaining)
+  - location: 204 (remaining gas: 1039834.421 units remaining)
     [ 16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 207 (remaining gas: 1039834.501 units remaining)
+  - location: 207 (remaining gas: 1039834.411 units remaining)
     [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039834.481 units remaining)
+  - location: 204 (remaining gas: 1039834.391 units remaining)
     [ 12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039834.471 units remaining)
+  - location: 204 (remaining gas: 1039834.381 units remaining)
     [ 3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039834.461 units remaining)
+  - location: 204 (remaining gas: 1039834.371 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039834.461 units remaining)
+  - location: 204 (remaining gas: 1039834.371 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039834.461 units remaining)
+  - location: 208 (remaining gas: 1039834.371 units remaining)
     [ 12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 211 (remaining gas: 1039834.451 units remaining)
+  - location: 211 (remaining gas: 1039834.361 units remaining)
     [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039834.431 units remaining)
+  - location: 208 (remaining gas: 1039834.341 units remaining)
     [ 3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039834.421 units remaining)
+  - location: 208 (remaining gas: 1039834.331 units remaining)
     [ 2
       3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039834.421 units remaining)
+  - location: 208 (remaining gas: 1039834.331 units remaining)
     [ 2
       3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 212 (remaining gas: 1039834.421 units remaining)
+  - location: 212 (remaining gas: 1039834.331 units remaining)
     [ 3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 214 (remaining gas: 1039834.411 units remaining)
+  - location: 214 (remaining gas: 1039834.321 units remaining)
     [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 212 (remaining gas: 1039834.391 units remaining)
+  - location: 212 (remaining gas: 1039834.301 units remaining)
     [ 2
       (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 215 (remaining gas: 1039834.381 units remaining)
+  - location: 215 (remaining gas: 1039834.291 units remaining)
     [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 218 (remaining gas: 1039833.626 units remaining)
+  - location: 218 (remaining gas: 1039833.536 units remaining)
     [ 0 ]
-  - location: 219 (remaining gas: 1039833.616 units remaining)
+  - location: 219 (remaining gas: 1039833.526 units remaining)
     [ True ]
-  - location: 220 (remaining gas: 1039833.616 units remaining)
+  - location: 220 (remaining gas: 1039833.526 units remaining)
     [  ]
-  - location: 220 (remaining gas: 1039833.606 units remaining)
+  - location: 220 (remaining gas: 1039833.516 units remaining)
     [  ]
-  - location: 226 (remaining gas: 1039833.596 units remaining)
+  - location: 226 (remaining gas: 1039833.506 units remaining)
     [ Unit ]
-  - location: 227 (remaining gas: 1039833.586 units remaining)
+  - location: 227 (remaining gas: 1039833.496 units remaining)
     [ {}
       Unit ]
-  - location: 229 (remaining gas: 1039833.576 units remaining)
+  - location: 229 (remaining gas: 1039833.486 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out
index a4da22a1b0c16f79e4db1c849ec4354aa331c7f5..29b923ab3463e76a12940cdfa9be6ffe40f9040f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (remaining gas: 1039988.045 units remaining)
+  - location: 15 (remaining gas: 1039988 units remaining)
     [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ]
-  - location: 15 (remaining gas: 1039988.035 units remaining)
+  - location: 15 (remaining gas: 1039987.990 units remaining)
     [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ]
-  - location: 16 (remaining gas: 1039988.025 units remaining)
+  - location: 16 (remaining gas: 1039987.980 units remaining)
     [ (Pair (Pair (Pair 1 2) 3) 4)
       5 ]
-  - location: 17 (remaining gas: 1039988.015 units remaining)
+  - location: 17 (remaining gas: 1039987.970 units remaining)
     [ (Pair (Pair 1 2) 3)
       4
       5 ]
-  - location: 18 (remaining gas: 1039988.005 units remaining)
+  - location: 18 (remaining gas: 1039987.960 units remaining)
     [ (Pair 1 2)
       3
       4
       5 ]
-  - location: 19 (remaining gas: 1039987.995 units remaining)
+  - location: 19 (remaining gas: 1039987.950 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 20 (remaining gas: 1039987.938 units remaining)
+  - location: 20 (remaining gas: 1039987.893 units remaining)
     [ 5
       1
       2
       3
       4 ]
-  - location: 22 (remaining gas: 1039987.938 units remaining)
+  - location: 22 (remaining gas: 1039987.893 units remaining)
     [ 1
       2
       3
       4 ]
-  - location: 24 (remaining gas: 1039987.928 units remaining)
+  - location: 24 (remaining gas: 1039987.883 units remaining)
     [ 2
       3
       4 ]
-  - location: 25 (remaining gas: 1039987.918 units remaining)
+  - location: 25 (remaining gas: 1039987.873 units remaining)
     [ 3
       4 ]
-  - location: 26 (remaining gas: 1039987.908 units remaining)
+  - location: 26 (remaining gas: 1039987.863 units remaining)
     [ 4 ]
-  - location: 27 (remaining gas: 1039987.898 units remaining)
+  - location: 27 (remaining gas: 1039987.853 units remaining)
     [  ]
-  - location: 22 (remaining gas: 1039987.878 units remaining)
+  - location: 22 (remaining gas: 1039987.833 units remaining)
     [ 5 ]
-  - location: 28 (remaining gas: 1039987.868 units remaining)
+  - location: 28 (remaining gas: 1039987.823 units remaining)
     [ {}
       5 ]
-  - location: 30 (remaining gas: 1039987.858 units remaining)
+  - location: 30 (remaining gas: 1039987.813 units remaining)
     [ (Pair {} 5) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out
index 6ba098bd84dae88c39570efc16ad47b7cee589fb..8e0514422cab7e2eb5d7c28eaccca6860539304e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039992.088 units remaining)
+  - location: 11 (remaining gas: 1039992.043 units remaining)
     [ (Pair (Pair 1 1) 0 0) ]
-  - location: 11 (remaining gas: 1039992.078 units remaining)
+  - location: 11 (remaining gas: 1039992.033 units remaining)
     [ (Pair 1 1) ]
-  - location: 12 (remaining gas: 1039992.068 units remaining)
+  - location: 12 (remaining gas: 1039992.023 units remaining)
     [ 1
       1 ]
-  - location: 13 (remaining gas: 1039992.058 units remaining)
+  - location: 13 (remaining gas: 1039992.013 units remaining)
     [ 1
       1
       1 ]
-  - location: 14 (remaining gas: 1039992.058 units remaining)
+  - location: 14 (remaining gas: 1039992.013 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039992.023 units remaining)
+  - location: 16 (remaining gas: 1039991.978 units remaining)
     [ 2 ]
-  - location: 14 (remaining gas: 1039992.003 units remaining)
+  - location: 14 (remaining gas: 1039991.958 units remaining)
     [ 1
       2 ]
-  - location: 17 (remaining gas: 1039991.993 units remaining)
+  - location: 17 (remaining gas: 1039991.948 units remaining)
     [ (Pair 1 2) ]
-  - location: 18 (remaining gas: 1039991.983 units remaining)
+  - location: 18 (remaining gas: 1039991.938 units remaining)
     [ {}
       (Pair 1 2) ]
-  - location: 20 (remaining gas: 1039991.973 units remaining)
+  - location: 20 (remaining gas: 1039991.928 units remaining)
     [ (Pair {} 1 2) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out
index cd96aee204138f09131cd0c01ff44d93f5bfa299..2cb6d45075784d690cded107e46db2627e974f2d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039992.088 units remaining)
+  - location: 11 (remaining gas: 1039992.043 units remaining)
     [ (Pair (Pair 15 9) 0 0) ]
-  - location: 11 (remaining gas: 1039992.078 units remaining)
+  - location: 11 (remaining gas: 1039992.033 units remaining)
     [ (Pair 15 9) ]
-  - location: 12 (remaining gas: 1039992.068 units remaining)
+  - location: 12 (remaining gas: 1039992.023 units remaining)
     [ 15
       9 ]
-  - location: 13 (remaining gas: 1039992.058 units remaining)
+  - location: 13 (remaining gas: 1039992.013 units remaining)
     [ 15
       15
       9 ]
-  - location: 14 (remaining gas: 1039992.058 units remaining)
+  - location: 14 (remaining gas: 1039992.013 units remaining)
     [ 15
       9 ]
-  - location: 16 (remaining gas: 1039992.023 units remaining)
+  - location: 16 (remaining gas: 1039991.978 units remaining)
     [ 24 ]
-  - location: 14 (remaining gas: 1039992.003 units remaining)
+  - location: 14 (remaining gas: 1039991.958 units remaining)
     [ 15
       24 ]
-  - location: 17 (remaining gas: 1039991.993 units remaining)
+  - location: 17 (remaining gas: 1039991.948 units remaining)
     [ (Pair 15 24) ]
-  - location: 18 (remaining gas: 1039991.983 units remaining)
+  - location: 18 (remaining gas: 1039991.938 units remaining)
     [ {}
       (Pair 15 24) ]
-  - location: 20 (remaining gas: 1039991.973 units remaining)
+  - location: 20 (remaining gas: 1039991.928 units remaining)
     [ (Pair {} 15 24) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out
index 8a2163c87cd6cbae969f3aaa19b99a0148266451..6cc093be67c8c70e6cc10754ef5a10a31434623c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out	
@@ -7,136 +7,136 @@ emitted operations
 big_map diff
   
 trace
-  - location: 25 (remaining gas: 1039974.438 units remaining)
+  - location: 25 (remaining gas: 1039974.168 units remaining)
     [ (Pair (Pair -8 2) None None None None) ]
-  - location: 25 (remaining gas: 1039974.428 units remaining)
+  - location: 25 (remaining gas: 1039974.158 units remaining)
     [ (Pair -8 2) ]
-  - location: 26 (remaining gas: 1039974.418 units remaining)
+  - location: 26 (remaining gas: 1039974.148 units remaining)
     [ (Pair -8 2)
       (Pair -8 2) ]
-  - location: 27 (remaining gas: 1039974.408 units remaining)
+  - location: 27 (remaining gas: 1039974.138 units remaining)
     [ -8
       2
       (Pair -8 2) ]
-  - location: 28 (remaining gas: 1039974.388 units remaining)
+  - location: 28 (remaining gas: 1039974.118 units remaining)
     [ 8
       2
       (Pair -8 2) ]
-  - location: 29 (remaining gas: 1039974.388 units remaining)
+  - location: 29 (remaining gas: 1039974.118 units remaining)
     [ 2
       (Pair -8 2) ]
-  - location: 31 (remaining gas: 1039974.368 units remaining)
+  - location: 31 (remaining gas: 1039974.098 units remaining)
     [ 2
       (Pair -8 2) ]
-  - location: 29 (remaining gas: 1039974.348 units remaining)
+  - location: 29 (remaining gas: 1039974.078 units remaining)
     [ 8
       2
       (Pair -8 2) ]
-  - location: 32 (remaining gas: 1039974.243 units remaining)
+  - location: 32 (remaining gas: 1039973.973 units remaining)
     [ (Some (Pair 4 0))
       (Pair -8 2) ]
-  - location: 33 (remaining gas: 1039974.233 units remaining)
+  - location: 33 (remaining gas: 1039973.963 units remaining)
     [ (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 34 (remaining gas: 1039974.223 units remaining)
+  - location: 34 (remaining gas: 1039973.953 units remaining)
     [ (Pair -8 2)
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 35 (remaining gas: 1039974.213 units remaining)
+  - location: 35 (remaining gas: 1039973.943 units remaining)
     [ -8
       2
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 36 (remaining gas: 1039974.193 units remaining)
+  - location: 36 (remaining gas: 1039973.923 units remaining)
     [ 8
       2
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 37 (remaining gas: 1039974.088 units remaining)
+  - location: 37 (remaining gas: 1039973.818 units remaining)
     [ (Some (Pair 4 0))
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 38 (remaining gas: 1039974.078 units remaining)
+  - location: 38 (remaining gas: 1039973.808 units remaining)
     [ (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 39 (remaining gas: 1039974.068 units remaining)
+  - location: 39 (remaining gas: 1039973.798 units remaining)
     [ (Pair -8 2)
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 40 (remaining gas: 1039974.058 units remaining)
+  - location: 40 (remaining gas: 1039973.788 units remaining)
     [ -8
       2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 41 (remaining gas: 1039974.058 units remaining)
+  - location: 41 (remaining gas: 1039973.788 units remaining)
     [ 2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 43 (remaining gas: 1039974.038 units remaining)
+  - location: 43 (remaining gas: 1039973.768 units remaining)
     [ 2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 41 (remaining gas: 1039974.018 units remaining)
+  - location: 41 (remaining gas: 1039973.748 units remaining)
     [ -8
       2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 44 (remaining gas: 1039973.913 units remaining)
+  - location: 44 (remaining gas: 1039973.643 units remaining)
     [ (Some (Pair -4 0))
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 45 (remaining gas: 1039973.903 units remaining)
+  - location: 45 (remaining gas: 1039973.633 units remaining)
     [ (Pair -8 2)
       (Some (Pair -4 0))
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 46 (remaining gas: 1039973.893 units remaining)
+  - location: 46 (remaining gas: 1039973.623 units remaining)
     [ -8
       2
       (Some (Pair -4 0))
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 47 (remaining gas: 1039973.788 units remaining)
+  - location: 47 (remaining gas: 1039973.518 units remaining)
     [ (Some (Pair -4 0))
       (Some (Pair -4 0))
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 49 (remaining gas: 1039973.788 units remaining)
+  - location: 49 (remaining gas: 1039973.518 units remaining)
     [ (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 52 (remaining gas: 1039973.778 units remaining)
+  - location: 52 (remaining gas: 1039973.508 units remaining)
     [ (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 49 (remaining gas: 1039973.758 units remaining)
+  - location: 49 (remaining gas: 1039973.488 units remaining)
     [ (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 49 (remaining gas: 1039973.748 units remaining)
+  - location: 49 (remaining gas: 1039973.478 units remaining)
     [ (Some (Pair -4 0))
       (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 49 (remaining gas: 1039973.748 units remaining)
+  - location: 49 (remaining gas: 1039973.478 units remaining)
     [ (Some (Pair -4 0))
       (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 53 (remaining gas: 1039973.748 units remaining)
+  - location: 53 (remaining gas: 1039973.478 units remaining)
     [ (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 55 (remaining gas: 1039973.738 units remaining)
+  - location: 55 (remaining gas: 1039973.468 units remaining)
     [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 53 (remaining gas: 1039973.718 units remaining)
+  - location: 53 (remaining gas: 1039973.448 units remaining)
     [ (Some (Pair -4 0))
       (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 56 (remaining gas: 1039973.708 units remaining)
+  - location: 56 (remaining gas: 1039973.438 units remaining)
     [ (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 57 (remaining gas: 1039973.698 units remaining)
+  - location: 57 (remaining gas: 1039973.428 units remaining)
     [ {}
       (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 59 (remaining gas: 1039973.688 units remaining)
+  - location: 59 (remaining gas: 1039973.418 units remaining)
     [ (Pair {} (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out
index 4c344786f295fba451c03c0065709145db285dc3..f980d105600958c2599fbc0febe884d8fc93a051 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out	
@@ -7,136 +7,136 @@ emitted operations
 big_map diff
   
 trace
-  - location: 25 (remaining gas: 1039974.438 units remaining)
+  - location: 25 (remaining gas: 1039974.168 units remaining)
     [ (Pair (Pair 10 -3) None None None None) ]
-  - location: 25 (remaining gas: 1039974.428 units remaining)
+  - location: 25 (remaining gas: 1039974.158 units remaining)
     [ (Pair 10 -3) ]
-  - location: 26 (remaining gas: 1039974.418 units remaining)
+  - location: 26 (remaining gas: 1039974.148 units remaining)
     [ (Pair 10 -3)
       (Pair 10 -3) ]
-  - location: 27 (remaining gas: 1039974.408 units remaining)
+  - location: 27 (remaining gas: 1039974.138 units remaining)
     [ 10
       -3
       (Pair 10 -3) ]
-  - location: 28 (remaining gas: 1039974.388 units remaining)
+  - location: 28 (remaining gas: 1039974.118 units remaining)
     [ 10
       -3
       (Pair 10 -3) ]
-  - location: 29 (remaining gas: 1039974.388 units remaining)
+  - location: 29 (remaining gas: 1039974.118 units remaining)
     [ -3
       (Pair 10 -3) ]
-  - location: 31 (remaining gas: 1039974.368 units remaining)
+  - location: 31 (remaining gas: 1039974.098 units remaining)
     [ 3
       (Pair 10 -3) ]
-  - location: 29 (remaining gas: 1039974.348 units remaining)
+  - location: 29 (remaining gas: 1039974.078 units remaining)
     [ 10
       3
       (Pair 10 -3) ]
-  - location: 32 (remaining gas: 1039974.243 units remaining)
+  - location: 32 (remaining gas: 1039973.973 units remaining)
     [ (Some (Pair 3 1))
       (Pair 10 -3) ]
-  - location: 33 (remaining gas: 1039974.233 units remaining)
+  - location: 33 (remaining gas: 1039973.963 units remaining)
     [ (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 34 (remaining gas: 1039974.223 units remaining)
+  - location: 34 (remaining gas: 1039973.953 units remaining)
     [ (Pair 10 -3)
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 35 (remaining gas: 1039974.213 units remaining)
+  - location: 35 (remaining gas: 1039973.943 units remaining)
     [ 10
       -3
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 36 (remaining gas: 1039974.193 units remaining)
+  - location: 36 (remaining gas: 1039973.923 units remaining)
     [ 10
       -3
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 37 (remaining gas: 1039974.088 units remaining)
+  - location: 37 (remaining gas: 1039973.818 units remaining)
     [ (Some (Pair -3 1))
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 38 (remaining gas: 1039974.078 units remaining)
+  - location: 38 (remaining gas: 1039973.808 units remaining)
     [ (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 39 (remaining gas: 1039974.068 units remaining)
+  - location: 39 (remaining gas: 1039973.798 units remaining)
     [ (Pair 10 -3)
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 40 (remaining gas: 1039974.058 units remaining)
+  - location: 40 (remaining gas: 1039973.788 units remaining)
     [ 10
       -3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 41 (remaining gas: 1039974.058 units remaining)
+  - location: 41 (remaining gas: 1039973.788 units remaining)
     [ -3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 43 (remaining gas: 1039974.038 units remaining)
+  - location: 43 (remaining gas: 1039973.768 units remaining)
     [ 3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 41 (remaining gas: 1039974.018 units remaining)
+  - location: 41 (remaining gas: 1039973.748 units remaining)
     [ 10
       3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 44 (remaining gas: 1039973.913 units remaining)
+  - location: 44 (remaining gas: 1039973.643 units remaining)
     [ (Some (Pair 3 1))
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 45 (remaining gas: 1039973.903 units remaining)
+  - location: 45 (remaining gas: 1039973.633 units remaining)
     [ (Pair 10 -3)
       (Some (Pair 3 1))
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 46 (remaining gas: 1039973.893 units remaining)
+  - location: 46 (remaining gas: 1039973.623 units remaining)
     [ 10
       -3
       (Some (Pair 3 1))
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 47 (remaining gas: 1039973.788 units remaining)
+  - location: 47 (remaining gas: 1039973.518 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1))
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 49 (remaining gas: 1039973.788 units remaining)
+  - location: 49 (remaining gas: 1039973.518 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 52 (remaining gas: 1039973.778 units remaining)
+  - location: 52 (remaining gas: 1039973.508 units remaining)
     [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 49 (remaining gas: 1039973.758 units remaining)
+  - location: 49 (remaining gas: 1039973.488 units remaining)
     [ (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 49 (remaining gas: 1039973.748 units remaining)
+  - location: 49 (remaining gas: 1039973.478 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 49 (remaining gas: 1039973.748 units remaining)
+  - location: 49 (remaining gas: 1039973.478 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 53 (remaining gas: 1039973.748 units remaining)
+  - location: 53 (remaining gas: 1039973.478 units remaining)
     [ (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 55 (remaining gas: 1039973.738 units remaining)
+  - location: 55 (remaining gas: 1039973.468 units remaining)
     [ (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 53 (remaining gas: 1039973.718 units remaining)
+  - location: 53 (remaining gas: 1039973.448 units remaining)
     [ (Some (Pair -3 1))
       (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 56 (remaining gas: 1039973.708 units remaining)
+  - location: 56 (remaining gas: 1039973.438 units remaining)
     [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 57 (remaining gas: 1039973.698 units remaining)
+  - location: 57 (remaining gas: 1039973.428 units remaining)
     [ {}
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 59 (remaining gas: 1039973.688 units remaining)
+  - location: 59 (remaining gas: 1039973.418 units remaining)
     [ (Pair {} (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out
index 0ff7b2d13503267f36a1783896e1a654c4f0df8a..07355e5c8a5737a3097b2240040587f45677194b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out	
@@ -7,136 +7,136 @@ emitted operations
 big_map diff
   
 trace
-  - location: 25 (remaining gas: 1039974.438 units remaining)
+  - location: 25 (remaining gas: 1039974.168 units remaining)
     [ (Pair (Pair 10 0) None None None None) ]
-  - location: 25 (remaining gas: 1039974.428 units remaining)
+  - location: 25 (remaining gas: 1039974.158 units remaining)
     [ (Pair 10 0) ]
-  - location: 26 (remaining gas: 1039974.418 units remaining)
+  - location: 26 (remaining gas: 1039974.148 units remaining)
     [ (Pair 10 0)
       (Pair 10 0) ]
-  - location: 27 (remaining gas: 1039974.408 units remaining)
+  - location: 27 (remaining gas: 1039974.138 units remaining)
     [ 10
       0
       (Pair 10 0) ]
-  - location: 28 (remaining gas: 1039974.388 units remaining)
+  - location: 28 (remaining gas: 1039974.118 units remaining)
     [ 10
       0
       (Pair 10 0) ]
-  - location: 29 (remaining gas: 1039974.388 units remaining)
+  - location: 29 (remaining gas: 1039974.118 units remaining)
     [ 0
       (Pair 10 0) ]
-  - location: 31 (remaining gas: 1039974.368 units remaining)
+  - location: 31 (remaining gas: 1039974.098 units remaining)
     [ 0
       (Pair 10 0) ]
-  - location: 29 (remaining gas: 1039974.348 units remaining)
+  - location: 29 (remaining gas: 1039974.078 units remaining)
     [ 10
       0
       (Pair 10 0) ]
-  - location: 32 (remaining gas: 1039974.243 units remaining)
+  - location: 32 (remaining gas: 1039973.973 units remaining)
     [ None
       (Pair 10 0) ]
-  - location: 33 (remaining gas: 1039974.233 units remaining)
+  - location: 33 (remaining gas: 1039973.963 units remaining)
     [ (Pair 10 0)
       None ]
-  - location: 34 (remaining gas: 1039974.223 units remaining)
+  - location: 34 (remaining gas: 1039973.953 units remaining)
     [ (Pair 10 0)
       (Pair 10 0)
       None ]
-  - location: 35 (remaining gas: 1039974.213 units remaining)
+  - location: 35 (remaining gas: 1039973.943 units remaining)
     [ 10
       0
       (Pair 10 0)
       None ]
-  - location: 36 (remaining gas: 1039974.193 units remaining)
+  - location: 36 (remaining gas: 1039973.923 units remaining)
     [ 10
       0
       (Pair 10 0)
       None ]
-  - location: 37 (remaining gas: 1039974.088 units remaining)
+  - location: 37 (remaining gas: 1039973.818 units remaining)
     [ None
       (Pair 10 0)
       None ]
-  - location: 38 (remaining gas: 1039974.078 units remaining)
+  - location: 38 (remaining gas: 1039973.808 units remaining)
     [ (Pair 10 0)
       None
       None ]
-  - location: 39 (remaining gas: 1039974.068 units remaining)
+  - location: 39 (remaining gas: 1039973.798 units remaining)
     [ (Pair 10 0)
       (Pair 10 0)
       None
       None ]
-  - location: 40 (remaining gas: 1039974.058 units remaining)
+  - location: 40 (remaining gas: 1039973.788 units remaining)
     [ 10
       0
       (Pair 10 0)
       None
       None ]
-  - location: 41 (remaining gas: 1039974.058 units remaining)
+  - location: 41 (remaining gas: 1039973.788 units remaining)
     [ 0
       (Pair 10 0)
       None
       None ]
-  - location: 43 (remaining gas: 1039974.038 units remaining)
+  - location: 43 (remaining gas: 1039973.768 units remaining)
     [ 0
       (Pair 10 0)
       None
       None ]
-  - location: 41 (remaining gas: 1039974.018 units remaining)
+  - location: 41 (remaining gas: 1039973.748 units remaining)
     [ 10
       0
       (Pair 10 0)
       None
       None ]
-  - location: 44 (remaining gas: 1039973.913 units remaining)
+  - location: 44 (remaining gas: 1039973.643 units remaining)
     [ None
       (Pair 10 0)
       None
       None ]
-  - location: 45 (remaining gas: 1039973.903 units remaining)
+  - location: 45 (remaining gas: 1039973.633 units remaining)
     [ (Pair 10 0)
       None
       None
       None ]
-  - location: 46 (remaining gas: 1039973.893 units remaining)
+  - location: 46 (remaining gas: 1039973.623 units remaining)
     [ 10
       0
       None
       None
       None ]
-  - location: 47 (remaining gas: 1039973.788 units remaining)
+  - location: 47 (remaining gas: 1039973.518 units remaining)
     [ None
       None
       None
       None ]
-  - location: 49 (remaining gas: 1039973.788 units remaining)
+  - location: 49 (remaining gas: 1039973.518 units remaining)
     [ None
       None ]
-  - location: 52 (remaining gas: 1039973.778 units remaining)
+  - location: 52 (remaining gas: 1039973.508 units remaining)
     [ (Pair None None) ]
-  - location: 49 (remaining gas: 1039973.758 units remaining)
+  - location: 49 (remaining gas: 1039973.488 units remaining)
     [ None
       (Pair None None) ]
-  - location: 49 (remaining gas: 1039973.748 units remaining)
+  - location: 49 (remaining gas: 1039973.478 units remaining)
     [ None
       None
       (Pair None None) ]
-  - location: 49 (remaining gas: 1039973.748 units remaining)
+  - location: 49 (remaining gas: 1039973.478 units remaining)
     [ None
       None
       (Pair None None) ]
-  - location: 53 (remaining gas: 1039973.748 units remaining)
+  - location: 53 (remaining gas: 1039973.478 units remaining)
     [ None
       (Pair None None) ]
-  - location: 55 (remaining gas: 1039973.738 units remaining)
+  - location: 55 (remaining gas: 1039973.468 units remaining)
     [ (Pair None None None) ]
-  - location: 53 (remaining gas: 1039973.718 units remaining)
+  - location: 53 (remaining gas: 1039973.448 units remaining)
     [ None
       (Pair None None None) ]
-  - location: 56 (remaining gas: 1039973.708 units remaining)
+  - location: 56 (remaining gas: 1039973.438 units remaining)
     [ (Pair None None None None) ]
-  - location: 57 (remaining gas: 1039973.698 units remaining)
+  - location: 57 (remaining gas: 1039973.428 units remaining)
     [ {}
       (Pair None None None None) ]
-  - location: 59 (remaining gas: 1039973.688 units remaining)
+  - location: 59 (remaining gas: 1039973.418 units remaining)
     [ (Pair {} None None None None) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out
index 1a2fd10da4e0c4d73375baedeced8075c9ed526b..d62eb1d0fc707cd90ec905b3f452a41b2671f62d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039992.178 units remaining)
+  - location: 8 (remaining gas: 1039992.133 units remaining)
     [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ]
-  - location: 8 (remaining gas: 1039992.168 units remaining)
+  - location: 8 (remaining gas: 1039992.123 units remaining)
     [ { 1 ; 2 ; 3 ; 4 } ]
-  - location: 9 (remaining gas: 1039992.168 units remaining)
+  - location: 9 (remaining gas: 1039992.123 units remaining)
     [ 1
       { 2 ; 3 ; 4 } ]
-  - location: 11 (remaining gas: 1039992.168 units remaining)
+  - location: 11 (remaining gas: 1039992.123 units remaining)
     [ { 2 ; 3 ; 4 } ]
-  - location: 13 (remaining gas: 1039992.158 units remaining)
+  - location: 13 (remaining gas: 1039992.113 units remaining)
     [  ]
-  - location: 11 (remaining gas: 1039992.138 units remaining)
+  - location: 11 (remaining gas: 1039992.093 units remaining)
     [ 1 ]
-  - location: 9 (remaining gas: 1039992.128 units remaining)
+  - location: 9 (remaining gas: 1039992.083 units remaining)
     [ 1 ]
-  - location: 18 (remaining gas: 1039992.118 units remaining)
+  - location: 18 (remaining gas: 1039992.073 units remaining)
     [ {}
       1 ]
-  - location: 20 (remaining gas: 1039992.108 units remaining)
+  - location: 20 (remaining gas: 1039992.063 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out
index 7d5ef42ec8b225d150f37d03c5d688632c8f6594..5aafb88d960f880d145036fc0258af18091e33dc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039992.478 units remaining)
+  - location: 8 (remaining gas: 1039992.433 units remaining)
     [ (Pair { 4 } 111) ]
-  - location: 8 (remaining gas: 1039992.468 units remaining)
+  - location: 8 (remaining gas: 1039992.423 units remaining)
     [ { 4 } ]
-  - location: 9 (remaining gas: 1039992.468 units remaining)
+  - location: 9 (remaining gas: 1039992.423 units remaining)
     [ 4
       {} ]
-  - location: 11 (remaining gas: 1039992.468 units remaining)
+  - location: 11 (remaining gas: 1039992.423 units remaining)
     [ {} ]
-  - location: 13 (remaining gas: 1039992.458 units remaining)
+  - location: 13 (remaining gas: 1039992.413 units remaining)
     [  ]
-  - location: 11 (remaining gas: 1039992.438 units remaining)
+  - location: 11 (remaining gas: 1039992.393 units remaining)
     [ 4 ]
-  - location: 9 (remaining gas: 1039992.428 units remaining)
+  - location: 9 (remaining gas: 1039992.383 units remaining)
     [ 4 ]
-  - location: 18 (remaining gas: 1039992.418 units remaining)
+  - location: 18 (remaining gas: 1039992.373 units remaining)
     [ {}
       4 ]
-  - location: 20 (remaining gas: 1039992.408 units remaining)
+  - location: 20 (remaining gas: 1039992.363 units remaining)
     [ (Pair {} 4) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out"
index ddb0c493f1dd4673bc2830c1d421883b193507c0..294c09d494e4b4bb801c327ed06502ea44b6dd53 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039991.921 units remaining)
+  - location: 13 (remaining gas: 1039991.876 units remaining)
     [ (Pair "hello" (Some 4) {}) ]
-  - location: 13 (remaining gas: 1039991.911 units remaining)
+  - location: 13 (remaining gas: 1039991.866 units remaining)
     [ "hello"
       (Pair (Some 4) {}) ]
-  - location: 14 (remaining gas: 1039991.911 units remaining)
+  - location: 14 (remaining gas: 1039991.866 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 16 (remaining gas: 1039991.901 units remaining)
+  - location: 16 (remaining gas: 1039991.856 units remaining)
     [ (Some 4)
       {} ]
-  - location: 14 (remaining gas: 1039991.881 units remaining)
+  - location: 14 (remaining gas: 1039991.836 units remaining)
     [ "hello"
       (Some 4)
       {} ]
-  - location: 17 (remaining gas: 1039991.786 units remaining)
+  - location: 17 (remaining gas: 1039991.741 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 18 (remaining gas: 1039991.776 units remaining)
+  - location: 18 (remaining gas: 1039991.731 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 19 (remaining gas: 1039991.766 units remaining)
+  - location: 19 (remaining gas: 1039991.721 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 }) ]
-  - location: 21 (remaining gas: 1039991.756 units remaining)
+  - location: 21 (remaining gas: 1039991.711 units remaining)
     [ (Pair {} None { Elt "hello" 4 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out"
index aaba5770cf0eba87c4e69d2574ed21aae54325e5..5b4e106cfff4930f173079e25a2e9cbbe0c0bdb6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039991.597 units remaining)
+  - location: 13 (remaining gas: 1039991.552 units remaining)
     [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039991.587 units remaining)
+  - location: 13 (remaining gas: 1039991.542 units remaining)
     [ "hi"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039991.587 units remaining)
+  - location: 14 (remaining gas: 1039991.542 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039991.577 units remaining)
+  - location: 16 (remaining gas: 1039991.532 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039991.557 units remaining)
+  - location: 14 (remaining gas: 1039991.512 units remaining)
     [ "hi"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039991.465 units remaining)
+  - location: 17 (remaining gas: 1039991.420 units remaining)
     [ None
       { Elt "hello" 4 ; Elt "hi" 5 } ]
-  - location: 18 (remaining gas: 1039991.455 units remaining)
+  - location: 18 (remaining gas: 1039991.410 units remaining)
     [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 19 (remaining gas: 1039991.445 units remaining)
+  - location: 19 (remaining gas: 1039991.400 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 21 (remaining gas: 1039991.435 units remaining)
+  - location: 21 (remaining gas: 1039991.390 units remaining)
     [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out"
index 5c4760e6d8ea37ac1bafd4008fcc734d49407e99..774c36287d0a170a829ecd1670147804def76d56 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039991.567 units remaining)
+  - location: 13 (remaining gas: 1039991.522 units remaining)
     [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039991.557 units remaining)
+  - location: 13 (remaining gas: 1039991.512 units remaining)
     [ "hello"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039991.557 units remaining)
+  - location: 14 (remaining gas: 1039991.512 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039991.547 units remaining)
+  - location: 16 (remaining gas: 1039991.502 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039991.527 units remaining)
+  - location: 14 (remaining gas: 1039991.482 units remaining)
     [ "hello"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039991.417 units remaining)
+  - location: 17 (remaining gas: 1039991.372 units remaining)
     [ (Some 4)
       { Elt "hello" 5 } ]
-  - location: 18 (remaining gas: 1039991.407 units remaining)
+  - location: 18 (remaining gas: 1039991.362 units remaining)
     [ (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 19 (remaining gas: 1039991.397 units remaining)
+  - location: 19 (remaining gas: 1039991.352 units remaining)
     [ {}
       (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 21 (remaining gas: 1039991.387 units remaining)
+  - location: 21 (remaining gas: 1039991.342 units remaining)
     [ (Pair {} (Some 4) { Elt "hello" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out"
index 135f0652afc16687b64f126097b5ecfce1251f23..9c5f9882de250387fdc821af680f17a50179b254 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039991.412 units remaining)
+  - location: 13 (remaining gas: 1039991.367 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039991.402 units remaining)
+  - location: 13 (remaining gas: 1039991.357 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039991.402 units remaining)
+  - location: 14 (remaining gas: 1039991.357 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039991.392 units remaining)
+  - location: 16 (remaining gas: 1039991.347 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039991.372 units remaining)
+  - location: 14 (remaining gas: 1039991.327 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039991.283 units remaining)
+  - location: 17 (remaining gas: 1039991.238 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039991.273 units remaining)
+  - location: 18 (remaining gas: 1039991.228 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039991.263 units remaining)
+  - location: 19 (remaining gas: 1039991.218 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039991.253 units remaining)
+  - location: 21 (remaining gas: 1039991.208 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out"
index 0837f31141d02bf40726bc867b913e90f0ff3caa..be201cfcf1d84a9ceee69e0a219dff05dffa8c97 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039991.412 units remaining)
+  - location: 13 (remaining gas: 1039991.367 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039991.402 units remaining)
+  - location: 13 (remaining gas: 1039991.357 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039991.402 units remaining)
+  - location: 14 (remaining gas: 1039991.357 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039991.392 units remaining)
+  - location: 16 (remaining gas: 1039991.347 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039991.372 units remaining)
+  - location: 14 (remaining gas: 1039991.327 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039991.283 units remaining)
+  - location: 17 (remaining gas: 1039991.238 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039991.273 units remaining)
+  - location: 18 (remaining gas: 1039991.228 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039991.263 units remaining)
+  - location: 19 (remaining gas: 1039991.218 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039991.253 units remaining)
+  - location: 21 (remaining gas: 1039991.208 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out"
index ab78f260fa10f045f0c42afa4648dbda06433f5d..546caf32d7baf71d1093cdfa5f6eca5d03a3cddc 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039991.667 units remaining)
+  - location: 13 (remaining gas: 1039991.622 units remaining)
     [ (Pair "hello" None { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039991.657 units remaining)
+  - location: 13 (remaining gas: 1039991.612 units remaining)
     [ "hello"
       (Pair None { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039991.657 units remaining)
+  - location: 14 (remaining gas: 1039991.612 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039991.647 units remaining)
+  - location: 16 (remaining gas: 1039991.602 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039991.627 units remaining)
+  - location: 14 (remaining gas: 1039991.582 units remaining)
     [ "hello"
       None
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039991.517 units remaining)
+  - location: 17 (remaining gas: 1039991.472 units remaining)
     [ (Some 4)
       {} ]
-  - location: 18 (remaining gas: 1039991.507 units remaining)
+  - location: 18 (remaining gas: 1039991.462 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 19 (remaining gas: 1039991.497 units remaining)
+  - location: 19 (remaining gas: 1039991.452 units remaining)
     [ {}
       (Pair (Some 4) {}) ]
-  - location: 21 (remaining gas: 1039991.487 units remaining)
+  - location: 21 (remaining gas: 1039991.442 units remaining)
     [ (Pair {} (Some 4) {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out"
index 0a3b356ee36aa537353ea5aeb544b3d835613a60..20197656df8af4abbbb0b49ca50f7484fc8642b2 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039992.021 units remaining)
+  - location: 13 (remaining gas: 1039991.976 units remaining)
     [ (Pair "hello" None {}) ]
-  - location: 13 (remaining gas: 1039992.011 units remaining)
+  - location: 13 (remaining gas: 1039991.966 units remaining)
     [ "hello"
       (Pair None {}) ]
-  - location: 14 (remaining gas: 1039992.011 units remaining)
+  - location: 14 (remaining gas: 1039991.966 units remaining)
     [ (Pair None {}) ]
-  - location: 16 (remaining gas: 1039992.001 units remaining)
+  - location: 16 (remaining gas: 1039991.956 units remaining)
     [ None
       {} ]
-  - location: 14 (remaining gas: 1039991.981 units remaining)
+  - location: 14 (remaining gas: 1039991.936 units remaining)
     [ "hello"
       None
       {} ]
-  - location: 17 (remaining gas: 1039991.886 units remaining)
+  - location: 17 (remaining gas: 1039991.841 units remaining)
     [ None
       {} ]
-  - location: 18 (remaining gas: 1039991.876 units remaining)
+  - location: 18 (remaining gas: 1039991.831 units remaining)
     [ (Pair None {}) ]
-  - location: 19 (remaining gas: 1039991.866 units remaining)
+  - location: 19 (remaining gas: 1039991.821 units remaining)
     [ {}
       (Pair None {}) ]
-  - location: 21 (remaining gas: 1039991.856 units remaining)
+  - location: 21 (remaining gas: 1039991.811 units remaining)
     [ (Pair {} None {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out"
index d23cf0902707275e46b7f2d5a4f3cdc19184002f..2afbc8cea8c4b06ff2bacb0030082e6d909b2183 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out"	
@@ -7,35 +7,35 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039988.811 units remaining)
+  - location: 12 (remaining gas: 1039988.766 units remaining)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 12 (remaining gas: 1039988.801 units remaining)
+  - location: 12 (remaining gas: 1039988.756 units remaining)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" })
       (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 13 (remaining gas: 1039988.791 units remaining)
+  - location: 13 (remaining gas: 1039988.746 units remaining)
     [ "1"
       (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 14 (remaining gas: 1039988.791 units remaining)
+  - location: 14 (remaining gas: 1039988.746 units remaining)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 17 (remaining gas: 1039988.781 units remaining)
+  - location: 17 (remaining gas: 1039988.736 units remaining)
     [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 18 (remaining gas: 1039988.771 units remaining)
+  - location: 18 (remaining gas: 1039988.726 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 19 (remaining gas: 1039988.761 units remaining)
+  - location: 19 (remaining gas: 1039988.716 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 14 (remaining gas: 1039988.741 units remaining)
+  - location: 14 (remaining gas: 1039988.696 units remaining)
     [ "1"
       { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 20 (remaining gas: 1039988.658 units remaining)
+  - location: 20 (remaining gas: 1039988.613 units remaining)
     [ (Some "one")
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 21 (remaining gas: 1039988.648 units remaining)
+  - location: 21 (remaining gas: 1039988.603 units remaining)
     [ (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 22 (remaining gas: 1039988.638 units remaining)
+  - location: 22 (remaining gas: 1039988.593 units remaining)
     [ {}
       (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 24 (remaining gas: 1039988.628 units remaining)
+  - location: 24 (remaining gas: 1039988.583 units remaining)
     [ (Pair {} (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out"
index b8fffe28508cf98b051a95f4f3a68b415ad214b1..e4c1427f833ac482b0ec89d5585957dca34b3d61 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out"	
@@ -7,35 +7,35 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.170 units remaining)
+  - location: 12 (remaining gas: 1039989.125 units remaining)
     [ (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 12 (remaining gas: 1039989.160 units remaining)
+  - location: 12 (remaining gas: 1039989.115 units remaining)
     [ (Pair "" None { Elt "hello" "hi" })
       (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 13 (remaining gas: 1039989.150 units remaining)
+  - location: 13 (remaining gas: 1039989.105 units remaining)
     [ ""
       (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 14 (remaining gas: 1039989.150 units remaining)
+  - location: 14 (remaining gas: 1039989.105 units remaining)
     [ (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 17 (remaining gas: 1039989.140 units remaining)
+  - location: 17 (remaining gas: 1039989.095 units remaining)
     [ (Pair None { Elt "hello" "hi" }) ]
-  - location: 18 (remaining gas: 1039989.130 units remaining)
+  - location: 18 (remaining gas: 1039989.085 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039989.120 units remaining)
+  - location: 19 (remaining gas: 1039989.075 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039989.100 units remaining)
+  - location: 14 (remaining gas: 1039989.055 units remaining)
     [ ""
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039989.020 units remaining)
+  - location: 20 (remaining gas: 1039988.975 units remaining)
     [ None
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039989.010 units remaining)
+  - location: 21 (remaining gas: 1039988.965 units remaining)
     [ (Pair None { Elt "hello" "hi" }) ]
-  - location: 22 (remaining gas: 1039989 units remaining)
+  - location: 22 (remaining gas: 1039988.955 units remaining)
     [ {}
       (Pair None { Elt "hello" "hi" }) ]
-  - location: 24 (remaining gas: 1039988.990 units remaining)
+  - location: 24 (remaining gas: 1039988.945 units remaining)
     [ (Pair {} None { Elt "hello" "hi" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out"
index 136d46fc9a37ada7c214941aa8f9dc35390eeec3..09821af25223ac0874419fa5754cee6f799b53c8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out"	
@@ -7,35 +7,35 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.120 units remaining)
+  - location: 12 (remaining gas: 1039989.075 units remaining)
     [ (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 12 (remaining gas: 1039989.110 units remaining)
+  - location: 12 (remaining gas: 1039989.065 units remaining)
     [ (Pair "hello" None { Elt "hello" "hi" })
       (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 13 (remaining gas: 1039989.100 units remaining)
+  - location: 13 (remaining gas: 1039989.055 units remaining)
     [ "hello"
       (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 14 (remaining gas: 1039989.100 units remaining)
+  - location: 14 (remaining gas: 1039989.055 units remaining)
     [ (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 17 (remaining gas: 1039989.090 units remaining)
+  - location: 17 (remaining gas: 1039989.045 units remaining)
     [ (Pair None { Elt "hello" "hi" }) ]
-  - location: 18 (remaining gas: 1039989.080 units remaining)
+  - location: 18 (remaining gas: 1039989.035 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039989.070 units remaining)
+  - location: 19 (remaining gas: 1039989.025 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039989.050 units remaining)
+  - location: 14 (remaining gas: 1039989.005 units remaining)
     [ "hello"
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039988.960 units remaining)
+  - location: 20 (remaining gas: 1039988.915 units remaining)
     [ (Some "hi")
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039988.950 units remaining)
+  - location: 21 (remaining gas: 1039988.905 units remaining)
     [ (Pair (Some "hi") { Elt "hello" "hi" }) ]
-  - location: 22 (remaining gas: 1039988.940 units remaining)
+  - location: 22 (remaining gas: 1039988.895 units remaining)
     [ {}
       (Pair (Some "hi") { Elt "hello" "hi" }) ]
-  - location: 24 (remaining gas: 1039988.930 units remaining)
+  - location: 24 (remaining gas: 1039988.885 units remaining)
     [ (Pair {} (Some "hi") { Elt "hello" "hi" }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out
index dfe88f045c709b7092b3a0da08178c247af387fa..e98b485943389319b7aa22c6f79105b4cd080785 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out	
@@ -7,130 +7,130 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039987.569 units remaining)
+  - location: 9 (remaining gas: 1039987.254 units remaining)
     [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ]
-  - location: 9 (remaining gas: 1039987.559 units remaining)
+  - location: 9 (remaining gas: 1039987.244 units remaining)
     [ { 1 ; 1 ; 1 ; 1 } ]
-  - location: 10 (remaining gas: 1039987.549 units remaining)
+  - location: 10 (remaining gas: 1039987.234 units remaining)
     [ 0
       { 1 ; 1 ; 1 ; 1 } ]
-  - location: 13 (remaining gas: 1039987.539 units remaining)
+  - location: 13 (remaining gas: 1039987.224 units remaining)
     [ { 1 ; 1 ; 1 ; 1 }
       0 ]
-  - location: 14 (remaining gas: 1039987.539 units remaining)
+  - location: 14 (remaining gas: 1039987.224 units remaining)
     [ 1
       0 ]
-  - location: 16 (remaining gas: 1039987.539 units remaining)
+  - location: 16 (remaining gas: 1039987.224 units remaining)
     [ 0 ]
-  - location: 18 (remaining gas: 1039987.529 units remaining)
+  - location: 18 (remaining gas: 1039987.214 units remaining)
     [ 0
       0 ]
-  - location: 16 (remaining gas: 1039987.509 units remaining)
+  - location: 16 (remaining gas: 1039987.194 units remaining)
     [ 1
       0
       0 ]
-  - location: 19 (remaining gas: 1039987.474 units remaining)
+  - location: 19 (remaining gas: 1039987.159 units remaining)
     [ 1
       0 ]
-  - location: 20 (remaining gas: 1039987.474 units remaining)
+  - location: 20 (remaining gas: 1039987.159 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039987.464 units remaining)
+  - location: 22 (remaining gas: 1039987.149 units remaining)
     [ 1
       0 ]
-  - location: 25 (remaining gas: 1039987.429 units remaining)
+  - location: 25 (remaining gas: 1039987.114 units remaining)
     [ 1 ]
-  - location: 20 (remaining gas: 1039987.409 units remaining)
+  - location: 20 (remaining gas: 1039987.094 units remaining)
     [ 1
       1 ]
-  - location: 14 (remaining gas: 1039987.399 units remaining)
+  - location: 14 (remaining gas: 1039987.084 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039987.399 units remaining)
+  - location: 16 (remaining gas: 1039987.084 units remaining)
     [ 1 ]
-  - location: 18 (remaining gas: 1039987.389 units remaining)
+  - location: 18 (remaining gas: 1039987.074 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039987.369 units remaining)
+  - location: 16 (remaining gas: 1039987.054 units remaining)
     [ 1
       1
       1 ]
-  - location: 19 (remaining gas: 1039987.334 units remaining)
+  - location: 19 (remaining gas: 1039987.019 units remaining)
     [ 2
       1 ]
-  - location: 20 (remaining gas: 1039987.334 units remaining)
+  - location: 20 (remaining gas: 1039987.019 units remaining)
     [ 1 ]
-  - location: 22 (remaining gas: 1039987.324 units remaining)
+  - location: 22 (remaining gas: 1039987.009 units remaining)
     [ 1
       1 ]
-  - location: 25 (remaining gas: 1039987.289 units remaining)
+  - location: 25 (remaining gas: 1039986.974 units remaining)
     [ 2 ]
-  - location: 20 (remaining gas: 1039987.269 units remaining)
+  - location: 20 (remaining gas: 1039986.954 units remaining)
     [ 2
       2 ]
-  - location: 14 (remaining gas: 1039987.259 units remaining)
+  - location: 14 (remaining gas: 1039986.944 units remaining)
     [ 1
       2 ]
-  - location: 16 (remaining gas: 1039987.259 units remaining)
+  - location: 16 (remaining gas: 1039986.944 units remaining)
     [ 2 ]
-  - location: 18 (remaining gas: 1039987.249 units remaining)
+  - location: 18 (remaining gas: 1039986.934 units remaining)
     [ 2
       2 ]
-  - location: 16 (remaining gas: 1039987.229 units remaining)
+  - location: 16 (remaining gas: 1039986.914 units remaining)
     [ 1
       2
       2 ]
-  - location: 19 (remaining gas: 1039987.194 units remaining)
+  - location: 19 (remaining gas: 1039986.879 units remaining)
     [ 3
       2 ]
-  - location: 20 (remaining gas: 1039987.194 units remaining)
+  - location: 20 (remaining gas: 1039986.879 units remaining)
     [ 2 ]
-  - location: 22 (remaining gas: 1039987.184 units remaining)
+  - location: 22 (remaining gas: 1039986.869 units remaining)
     [ 1
       2 ]
-  - location: 25 (remaining gas: 1039987.149 units remaining)
+  - location: 25 (remaining gas: 1039986.834 units remaining)
     [ 3 ]
-  - location: 20 (remaining gas: 1039987.129 units remaining)
+  - location: 20 (remaining gas: 1039986.814 units remaining)
     [ 3
       3 ]
-  - location: 14 (remaining gas: 1039987.119 units remaining)
+  - location: 14 (remaining gas: 1039986.804 units remaining)
     [ 1
       3 ]
-  - location: 16 (remaining gas: 1039987.119 units remaining)
+  - location: 16 (remaining gas: 1039986.804 units remaining)
     [ 3 ]
-  - location: 18 (remaining gas: 1039987.109 units remaining)
+  - location: 18 (remaining gas: 1039986.794 units remaining)
     [ 3
       3 ]
-  - location: 16 (remaining gas: 1039987.089 units remaining)
+  - location: 16 (remaining gas: 1039986.774 units remaining)
     [ 1
       3
       3 ]
-  - location: 19 (remaining gas: 1039987.054 units remaining)
+  - location: 19 (remaining gas: 1039986.739 units remaining)
     [ 4
       3 ]
-  - location: 20 (remaining gas: 1039987.054 units remaining)
+  - location: 20 (remaining gas: 1039986.739 units remaining)
     [ 3 ]
-  - location: 22 (remaining gas: 1039987.044 units remaining)
+  - location: 22 (remaining gas: 1039986.729 units remaining)
     [ 1
       3 ]
-  - location: 25 (remaining gas: 1039987.009 units remaining)
+  - location: 25 (remaining gas: 1039986.694 units remaining)
     [ 4 ]
-  - location: 20 (remaining gas: 1039986.989 units remaining)
+  - location: 20 (remaining gas: 1039986.674 units remaining)
     [ 4
       4 ]
-  - location: 14 (remaining gas: 1039986.979 units remaining)
+  - location: 14 (remaining gas: 1039986.664 units remaining)
     [ { 1 ; 2 ; 3 ; 4 }
       4 ]
-  - location: 26 (remaining gas: 1039986.969 units remaining)
+  - location: 26 (remaining gas: 1039986.654 units remaining)
     [ {}
       { 1 ; 2 ; 3 ; 4 }
       4 ]
-  - location: 28 (remaining gas: 1039986.959 units remaining)
+  - location: 28 (remaining gas: 1039986.644 units remaining)
     [ (Pair {} { 1 ; 2 ; 3 ; 4 })
       4 ]
-  - location: 29 (remaining gas: 1039986.959 units remaining)
+  - location: 29 (remaining gas: 1039986.644 units remaining)
     [ 4 ]
-  - location: 31 (remaining gas: 1039986.949 units remaining)
+  - location: 31 (remaining gas: 1039986.634 units remaining)
     [  ]
-  - location: 29 (remaining gas: 1039986.929 units remaining)
+  - location: 29 (remaining gas: 1039986.614 units remaining)
     [ (Pair {} { 1 ; 2 ; 3 ; 4 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out
index e213a3e4e239c24efbead687d8d36dc48fe7eb40..8f7af629612844e338d20f53d27ef61d98930d91 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out	
@@ -7,130 +7,130 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039987.569 units remaining)
+  - location: 9 (remaining gas: 1039987.254 units remaining)
     [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ]
-  - location: 9 (remaining gas: 1039987.559 units remaining)
+  - location: 9 (remaining gas: 1039987.244 units remaining)
     [ { 1 ; 2 ; 3 ; 0 } ]
-  - location: 10 (remaining gas: 1039987.549 units remaining)
+  - location: 10 (remaining gas: 1039987.234 units remaining)
     [ 0
       { 1 ; 2 ; 3 ; 0 } ]
-  - location: 13 (remaining gas: 1039987.539 units remaining)
+  - location: 13 (remaining gas: 1039987.224 units remaining)
     [ { 1 ; 2 ; 3 ; 0 }
       0 ]
-  - location: 14 (remaining gas: 1039987.539 units remaining)
+  - location: 14 (remaining gas: 1039987.224 units remaining)
     [ 1
       0 ]
-  - location: 16 (remaining gas: 1039987.539 units remaining)
+  - location: 16 (remaining gas: 1039987.224 units remaining)
     [ 0 ]
-  - location: 18 (remaining gas: 1039987.529 units remaining)
+  - location: 18 (remaining gas: 1039987.214 units remaining)
     [ 0
       0 ]
-  - location: 16 (remaining gas: 1039987.509 units remaining)
+  - location: 16 (remaining gas: 1039987.194 units remaining)
     [ 1
       0
       0 ]
-  - location: 19 (remaining gas: 1039987.474 units remaining)
+  - location: 19 (remaining gas: 1039987.159 units remaining)
     [ 1
       0 ]
-  - location: 20 (remaining gas: 1039987.474 units remaining)
+  - location: 20 (remaining gas: 1039987.159 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039987.464 units remaining)
+  - location: 22 (remaining gas: 1039987.149 units remaining)
     [ 1
       0 ]
-  - location: 25 (remaining gas: 1039987.429 units remaining)
+  - location: 25 (remaining gas: 1039987.114 units remaining)
     [ 1 ]
-  - location: 20 (remaining gas: 1039987.409 units remaining)
+  - location: 20 (remaining gas: 1039987.094 units remaining)
     [ 1
       1 ]
-  - location: 14 (remaining gas: 1039987.399 units remaining)
+  - location: 14 (remaining gas: 1039987.084 units remaining)
     [ 2
       1 ]
-  - location: 16 (remaining gas: 1039987.399 units remaining)
+  - location: 16 (remaining gas: 1039987.084 units remaining)
     [ 1 ]
-  - location: 18 (remaining gas: 1039987.389 units remaining)
+  - location: 18 (remaining gas: 1039987.074 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039987.369 units remaining)
+  - location: 16 (remaining gas: 1039987.054 units remaining)
     [ 2
       1
       1 ]
-  - location: 19 (remaining gas: 1039987.334 units remaining)
+  - location: 19 (remaining gas: 1039987.019 units remaining)
     [ 3
       1 ]
-  - location: 20 (remaining gas: 1039987.334 units remaining)
+  - location: 20 (remaining gas: 1039987.019 units remaining)
     [ 1 ]
-  - location: 22 (remaining gas: 1039987.324 units remaining)
+  - location: 22 (remaining gas: 1039987.009 units remaining)
     [ 1
       1 ]
-  - location: 25 (remaining gas: 1039987.289 units remaining)
+  - location: 25 (remaining gas: 1039986.974 units remaining)
     [ 2 ]
-  - location: 20 (remaining gas: 1039987.269 units remaining)
+  - location: 20 (remaining gas: 1039986.954 units remaining)
     [ 3
       2 ]
-  - location: 14 (remaining gas: 1039987.259 units remaining)
+  - location: 14 (remaining gas: 1039986.944 units remaining)
     [ 3
       2 ]
-  - location: 16 (remaining gas: 1039987.259 units remaining)
+  - location: 16 (remaining gas: 1039986.944 units remaining)
     [ 2 ]
-  - location: 18 (remaining gas: 1039987.249 units remaining)
+  - location: 18 (remaining gas: 1039986.934 units remaining)
     [ 2
       2 ]
-  - location: 16 (remaining gas: 1039987.229 units remaining)
+  - location: 16 (remaining gas: 1039986.914 units remaining)
     [ 3
       2
       2 ]
-  - location: 19 (remaining gas: 1039987.194 units remaining)
+  - location: 19 (remaining gas: 1039986.879 units remaining)
     [ 5
       2 ]
-  - location: 20 (remaining gas: 1039987.194 units remaining)
+  - location: 20 (remaining gas: 1039986.879 units remaining)
     [ 2 ]
-  - location: 22 (remaining gas: 1039987.184 units remaining)
+  - location: 22 (remaining gas: 1039986.869 units remaining)
     [ 1
       2 ]
-  - location: 25 (remaining gas: 1039987.149 units remaining)
+  - location: 25 (remaining gas: 1039986.834 units remaining)
     [ 3 ]
-  - location: 20 (remaining gas: 1039987.129 units remaining)
+  - location: 20 (remaining gas: 1039986.814 units remaining)
     [ 5
       3 ]
-  - location: 14 (remaining gas: 1039987.119 units remaining)
+  - location: 14 (remaining gas: 1039986.804 units remaining)
     [ 0
       3 ]
-  - location: 16 (remaining gas: 1039987.119 units remaining)
+  - location: 16 (remaining gas: 1039986.804 units remaining)
     [ 3 ]
-  - location: 18 (remaining gas: 1039987.109 units remaining)
+  - location: 18 (remaining gas: 1039986.794 units remaining)
     [ 3
       3 ]
-  - location: 16 (remaining gas: 1039987.089 units remaining)
+  - location: 16 (remaining gas: 1039986.774 units remaining)
     [ 0
       3
       3 ]
-  - location: 19 (remaining gas: 1039987.054 units remaining)
+  - location: 19 (remaining gas: 1039986.739 units remaining)
     [ 3
       3 ]
-  - location: 20 (remaining gas: 1039987.054 units remaining)
+  - location: 20 (remaining gas: 1039986.739 units remaining)
     [ 3 ]
-  - location: 22 (remaining gas: 1039987.044 units remaining)
+  - location: 22 (remaining gas: 1039986.729 units remaining)
     [ 1
       3 ]
-  - location: 25 (remaining gas: 1039987.009 units remaining)
+  - location: 25 (remaining gas: 1039986.694 units remaining)
     [ 4 ]
-  - location: 20 (remaining gas: 1039986.989 units remaining)
+  - location: 20 (remaining gas: 1039986.674 units remaining)
     [ 3
       4 ]
-  - location: 14 (remaining gas: 1039986.979 units remaining)
+  - location: 14 (remaining gas: 1039986.664 units remaining)
     [ { 1 ; 3 ; 5 ; 3 }
       4 ]
-  - location: 26 (remaining gas: 1039986.969 units remaining)
+  - location: 26 (remaining gas: 1039986.654 units remaining)
     [ {}
       { 1 ; 3 ; 5 ; 3 }
       4 ]
-  - location: 28 (remaining gas: 1039986.959 units remaining)
+  - location: 28 (remaining gas: 1039986.644 units remaining)
     [ (Pair {} { 1 ; 3 ; 5 ; 3 })
       4 ]
-  - location: 29 (remaining gas: 1039986.959 units remaining)
+  - location: 29 (remaining gas: 1039986.644 units remaining)
     [ 4 ]
-  - location: 31 (remaining gas: 1039986.949 units remaining)
+  - location: 31 (remaining gas: 1039986.634 units remaining)
     [  ]
-  - location: 29 (remaining gas: 1039986.929 units remaining)
+  - location: 29 (remaining gas: 1039986.614 units remaining)
     [ (Pair {} { 1 ; 3 ; 5 ; 3 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out
index bab5459c15ce04f0274042e7035247da2faefa6b..50bf460b74a55d5d382b5889e8c9c7a7a2dbb4cb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039987.969 units remaining)
+  - location: 9 (remaining gas: 1039987.654 units remaining)
     [ (Pair {} { 0 }) ]
-  - location: 9 (remaining gas: 1039987.959 units remaining)
+  - location: 9 (remaining gas: 1039987.644 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039987.949 units remaining)
+  - location: 10 (remaining gas: 1039987.634 units remaining)
     [ 0
       {} ]
-  - location: 13 (remaining gas: 1039987.939 units remaining)
+  - location: 13 (remaining gas: 1039987.624 units remaining)
     [ {}
       0 ]
-  - location: 14 (remaining gas: 1039987.939 units remaining)
+  - location: 14 (remaining gas: 1039987.624 units remaining)
     [ {}
       0 ]
-  - location: 26 (remaining gas: 1039987.929 units remaining)
+  - location: 26 (remaining gas: 1039987.614 units remaining)
     [ {}
       {}
       0 ]
-  - location: 28 (remaining gas: 1039987.919 units remaining)
+  - location: 28 (remaining gas: 1039987.604 units remaining)
     [ (Pair {} {})
       0 ]
-  - location: 29 (remaining gas: 1039987.919 units remaining)
+  - location: 29 (remaining gas: 1039987.604 units remaining)
     [ 0 ]
-  - location: 31 (remaining gas: 1039987.909 units remaining)
+  - location: 31 (remaining gas: 1039987.594 units remaining)
     [  ]
-  - location: 29 (remaining gas: 1039987.889 units remaining)
+  - location: 29 (remaining gas: 1039987.574 units remaining)
     [ (Pair {} {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index 7b2ecc5d66703373f868e186a58abc01a3d164f1..9d49bd7d9965880196b0fdcbf4217764ea3ee7b1 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,157 +7,157 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039982.365 units remaining)
+  - location: 9 (remaining gas: 1039982.185 units remaining)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
-  - location: 9 (remaining gas: 1039982.355 units remaining)
+  - location: 9 (remaining gas: 1039982.175 units remaining)
     [ { "c" ; "b" ; "a" } ]
-  - location: 10 (remaining gas: 1039982.345 units remaining)
+  - location: 10 (remaining gas: 1039982.165 units remaining)
     [ {}
       { "c" ; "b" ; "a" } ]
-  - location: 12 (remaining gas: 1039982.335 units remaining)
+  - location: 12 (remaining gas: 1039982.155 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 13 (remaining gas: 1039982.325 units remaining)
+  - location: 13 (remaining gas: 1039982.145 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 14 (remaining gas: 1039982.315 units remaining)
+  - location: 14 (remaining gas: 1039982.135 units remaining)
     [ (Left (Pair { "c" ; "b" ; "a" } {})) ]
-  - location: 41 (remaining gas: 1039982.315 units remaining)
+  - location: 41 (remaining gas: 1039982.135 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 19 (remaining gas: 1039982.305 units remaining)
+  - location: 19 (remaining gas: 1039982.125 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {})
       (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 20 (remaining gas: 1039982.295 units remaining)
+  - location: 20 (remaining gas: 1039982.115 units remaining)
     [ { "c" ; "b" ; "a" }
       (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 21 (remaining gas: 1039982.295 units remaining)
+  - location: 21 (remaining gas: 1039982.115 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 23 (remaining gas: 1039982.285 units remaining)
+  - location: 23 (remaining gas: 1039982.105 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039982.265 units remaining)
+  - location: 21 (remaining gas: 1039982.085 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 24 (remaining gas: 1039982.265 units remaining)
+  - location: 24 (remaining gas: 1039982.085 units remaining)
     [ "c"
       { "b" ; "a" }
       {} ]
-  - location: 26 (remaining gas: 1039982.255 units remaining)
+  - location: 26 (remaining gas: 1039982.075 units remaining)
     [ { "b" ; "a" }
       "c"
       {} ]
-  - location: 27 (remaining gas: 1039982.255 units remaining)
+  - location: 27 (remaining gas: 1039982.075 units remaining)
     [ "c"
       {} ]
-  - location: 29 (remaining gas: 1039982.245 units remaining)
+  - location: 29 (remaining gas: 1039982.065 units remaining)
     [ { "c" } ]
-  - location: 27 (remaining gas: 1039982.225 units remaining)
+  - location: 27 (remaining gas: 1039982.045 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 30 (remaining gas: 1039982.215 units remaining)
+  - location: 30 (remaining gas: 1039982.035 units remaining)
     [ (Pair { "b" ; "a" } { "c" }) ]
-  - location: 31 (remaining gas: 1039982.205 units remaining)
+  - location: 31 (remaining gas: 1039982.025 units remaining)
     [ (Left (Pair { "b" ; "a" } { "c" })) ]
-  - location: 24 (remaining gas: 1039982.195 units remaining)
+  - location: 24 (remaining gas: 1039982.015 units remaining)
     [ (Left (Pair { "b" ; "a" } { "c" })) ]
-  - location: 41 (remaining gas: 1039982.185 units remaining)
+  - location: 41 (remaining gas: 1039982.005 units remaining)
     [ (Pair { "b" ; "a" } { "c" }) ]
-  - location: 19 (remaining gas: 1039982.175 units remaining)
+  - location: 19 (remaining gas: 1039981.995 units remaining)
     [ (Pair { "b" ; "a" } { "c" })
       (Pair { "b" ; "a" } { "c" }) ]
-  - location: 20 (remaining gas: 1039982.165 units remaining)
+  - location: 20 (remaining gas: 1039981.985 units remaining)
     [ { "b" ; "a" }
       (Pair { "b" ; "a" } { "c" }) ]
-  - location: 21 (remaining gas: 1039982.165 units remaining)
+  - location: 21 (remaining gas: 1039981.985 units remaining)
     [ (Pair { "b" ; "a" } { "c" }) ]
-  - location: 23 (remaining gas: 1039982.155 units remaining)
+  - location: 23 (remaining gas: 1039981.975 units remaining)
     [ { "c" } ]
-  - location: 21 (remaining gas: 1039982.135 units remaining)
+  - location: 21 (remaining gas: 1039981.955 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 24 (remaining gas: 1039982.135 units remaining)
+  - location: 24 (remaining gas: 1039981.955 units remaining)
     [ "b"
       { "a" }
       { "c" } ]
-  - location: 26 (remaining gas: 1039982.125 units remaining)
+  - location: 26 (remaining gas: 1039981.945 units remaining)
     [ { "a" }
       "b"
       { "c" } ]
-  - location: 27 (remaining gas: 1039982.125 units remaining)
+  - location: 27 (remaining gas: 1039981.945 units remaining)
     [ "b"
       { "c" } ]
-  - location: 29 (remaining gas: 1039982.115 units remaining)
+  - location: 29 (remaining gas: 1039981.935 units remaining)
     [ { "b" ; "c" } ]
-  - location: 27 (remaining gas: 1039982.095 units remaining)
+  - location: 27 (remaining gas: 1039981.915 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 30 (remaining gas: 1039982.085 units remaining)
+  - location: 30 (remaining gas: 1039981.905 units remaining)
     [ (Pair { "a" } { "b" ; "c" }) ]
-  - location: 31 (remaining gas: 1039982.075 units remaining)
+  - location: 31 (remaining gas: 1039981.895 units remaining)
     [ (Left (Pair { "a" } { "b" ; "c" })) ]
-  - location: 24 (remaining gas: 1039982.065 units remaining)
+  - location: 24 (remaining gas: 1039981.885 units remaining)
     [ (Left (Pair { "a" } { "b" ; "c" })) ]
-  - location: 41 (remaining gas: 1039982.055 units remaining)
+  - location: 41 (remaining gas: 1039981.875 units remaining)
     [ (Pair { "a" } { "b" ; "c" }) ]
-  - location: 19 (remaining gas: 1039982.045 units remaining)
+  - location: 19 (remaining gas: 1039981.865 units remaining)
     [ (Pair { "a" } { "b" ; "c" })
       (Pair { "a" } { "b" ; "c" }) ]
-  - location: 20 (remaining gas: 1039982.035 units remaining)
+  - location: 20 (remaining gas: 1039981.855 units remaining)
     [ { "a" }
       (Pair { "a" } { "b" ; "c" }) ]
-  - location: 21 (remaining gas: 1039982.035 units remaining)
+  - location: 21 (remaining gas: 1039981.855 units remaining)
     [ (Pair { "a" } { "b" ; "c" }) ]
-  - location: 23 (remaining gas: 1039982.025 units remaining)
+  - location: 23 (remaining gas: 1039981.845 units remaining)
     [ { "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039982.005 units remaining)
+  - location: 21 (remaining gas: 1039981.825 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039982.005 units remaining)
+  - location: 24 (remaining gas: 1039981.825 units remaining)
     [ "a"
       {}
       { "b" ; "c" } ]
-  - location: 26 (remaining gas: 1039981.995 units remaining)
+  - location: 26 (remaining gas: 1039981.815 units remaining)
     [ {}
       "a"
       { "b" ; "c" } ]
-  - location: 27 (remaining gas: 1039981.995 units remaining)
+  - location: 27 (remaining gas: 1039981.815 units remaining)
     [ "a"
       { "b" ; "c" } ]
-  - location: 29 (remaining gas: 1039981.985 units remaining)
+  - location: 29 (remaining gas: 1039981.805 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 27 (remaining gas: 1039981.965 units remaining)
+  - location: 27 (remaining gas: 1039981.785 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 30 (remaining gas: 1039981.955 units remaining)
+  - location: 30 (remaining gas: 1039981.775 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 31 (remaining gas: 1039981.945 units remaining)
+  - location: 31 (remaining gas: 1039981.765 units remaining)
     [ (Left (Pair {} { "a" ; "b" ; "c" })) ]
-  - location: 24 (remaining gas: 1039981.935 units remaining)
+  - location: 24 (remaining gas: 1039981.755 units remaining)
     [ (Left (Pair {} { "a" ; "b" ; "c" })) ]
-  - location: 41 (remaining gas: 1039981.925 units remaining)
+  - location: 41 (remaining gas: 1039981.745 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 19 (remaining gas: 1039981.915 units remaining)
+  - location: 19 (remaining gas: 1039981.735 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" })
       (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 20 (remaining gas: 1039981.905 units remaining)
+  - location: 20 (remaining gas: 1039981.725 units remaining)
     [ {}
       (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 21 (remaining gas: 1039981.905 units remaining)
+  - location: 21 (remaining gas: 1039981.725 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 23 (remaining gas: 1039981.895 units remaining)
+  - location: 23 (remaining gas: 1039981.715 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039981.875 units remaining)
+  - location: 21 (remaining gas: 1039981.695 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039981.875 units remaining)
+  - location: 24 (remaining gas: 1039981.695 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 35 (remaining gas: 1039981.865 units remaining)
+  - location: 35 (remaining gas: 1039981.685 units remaining)
     [ (Right { "a" ; "b" ; "c" }) ]
-  - location: 24 (remaining gas: 1039981.855 units remaining)
+  - location: 24 (remaining gas: 1039981.675 units remaining)
     [ (Right { "a" ; "b" ; "c" }) ]
-  - location: 41 (remaining gas: 1039981.845 units remaining)
+  - location: 41 (remaining gas: 1039981.665 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 41 (remaining gas: 1039981.835 units remaining)
+  - location: 41 (remaining gas: 1039981.655 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 43 (remaining gas: 1039981.825 units remaining)
+  - location: 43 (remaining gas: 1039981.645 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out"
index 086e8dab04ffefe65d12d022552cff4ee1a1343b..b834c602c1c044c00141fe944148e1d78491d286 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out"
@@ -7,46 +7,46 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039982.737 units remaining)
+  - location: 9 (remaining gas: 1039982.557 units remaining)
     [ (Pair {} { "" }) ]
-  - location: 9 (remaining gas: 1039982.727 units remaining)
+  - location: 9 (remaining gas: 1039982.547 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039982.717 units remaining)
+  - location: 10 (remaining gas: 1039982.537 units remaining)
     [ {}
       {} ]
-  - location: 12 (remaining gas: 1039982.707 units remaining)
+  - location: 12 (remaining gas: 1039982.527 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039982.697 units remaining)
+  - location: 13 (remaining gas: 1039982.517 units remaining)
     [ (Pair {} {}) ]
-  - location: 14 (remaining gas: 1039982.687 units remaining)
+  - location: 14 (remaining gas: 1039982.507 units remaining)
     [ (Left (Pair {} {})) ]
-  - location: 41 (remaining gas: 1039982.687 units remaining)
+  - location: 41 (remaining gas: 1039982.507 units remaining)
     [ (Pair {} {}) ]
-  - location: 19 (remaining gas: 1039982.677 units remaining)
+  - location: 19 (remaining gas: 1039982.497 units remaining)
     [ (Pair {} {})
       (Pair {} {}) ]
-  - location: 20 (remaining gas: 1039982.667 units remaining)
+  - location: 20 (remaining gas: 1039982.487 units remaining)
     [ {}
       (Pair {} {}) ]
-  - location: 21 (remaining gas: 1039982.667 units remaining)
+  - location: 21 (remaining gas: 1039982.487 units remaining)
     [ (Pair {} {}) ]
-  - location: 23 (remaining gas: 1039982.657 units remaining)
+  - location: 23 (remaining gas: 1039982.477 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039982.637 units remaining)
+  - location: 21 (remaining gas: 1039982.457 units remaining)
     [ {}
       {} ]
-  - location: 24 (remaining gas: 1039982.637 units remaining)
+  - location: 24 (remaining gas: 1039982.457 units remaining)
     [ {} ]
-  - location: 35 (remaining gas: 1039982.627 units remaining)
+  - location: 35 (remaining gas: 1039982.447 units remaining)
     [ (Right {}) ]
-  - location: 24 (remaining gas: 1039982.617 units remaining)
+  - location: 24 (remaining gas: 1039982.437 units remaining)
     [ (Right {}) ]
-  - location: 41 (remaining gas: 1039982.607 units remaining)
+  - location: 41 (remaining gas: 1039982.427 units remaining)
     [ {} ]
-  - location: 41 (remaining gas: 1039982.597 units remaining)
+  - location: 41 (remaining gas: 1039982.417 units remaining)
     [ {}
       {} ]
-  - location: 43 (remaining gas: 1039982.587 units remaining)
+  - location: 43 (remaining gas: 1039982.407 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out
index 0cd106b1b6729079ce12026e2c49c8345b930ea6..a3754cb87113154b8e29300860eb4b42f526f542 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out	
@@ -7,146 +7,146 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039981.249 units remaining)
+  - location: 11 (remaining gas: 1039980.889 units remaining)
     [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ]
-  - location: 11 (remaining gas: 1039981.239 units remaining)
+  - location: 11 (remaining gas: 1039980.879 units remaining)
     [ { Elt 0 100 ; Elt 2 100 } ]
-  - location: 12 (remaining gas: 1039981.229 units remaining)
+  - location: 12 (remaining gas: 1039980.869 units remaining)
     [ 0
       { Elt 0 100 ; Elt 2 100 } ]
-  - location: 15 (remaining gas: 1039981.219 units remaining)
+  - location: 15 (remaining gas: 1039980.859 units remaining)
     [ 0
       0
       { Elt 0 100 ; Elt 2 100 } ]
-  - location: 18 (remaining gas: 1039981.209 units remaining)
+  - location: 18 (remaining gas: 1039980.849 units remaining)
     [ (Pair 0 0)
       { Elt 0 100 ; Elt 2 100 } ]
-  - location: 19 (remaining gas: 1039981.199 units remaining)
+  - location: 19 (remaining gas: 1039980.839 units remaining)
     [ { Elt 0 100 ; Elt 2 100 }
       (Pair 0 0) ]
-  - location: 20 (remaining gas: 1039981.199 units remaining)
+  - location: 20 (remaining gas: 1039980.839 units remaining)
     [ (Pair 0 100)
       (Pair 0 0) ]
-  - location: 22 (remaining gas: 1039981.199 units remaining)
+  - location: 22 (remaining gas: 1039980.839 units remaining)
     [ (Pair 0 0) ]
-  - location: 24 (remaining gas: 1039981.189 units remaining)
+  - location: 24 (remaining gas: 1039980.829 units remaining)
     [ (Pair 0 0)
       (Pair 0 0) ]
-  - location: 25 (remaining gas: 1039981.179 units remaining)
+  - location: 25 (remaining gas: 1039980.819 units remaining)
     [ 0
       (Pair 0 0) ]
-  - location: 26 (remaining gas: 1039981.179 units remaining)
+  - location: 26 (remaining gas: 1039980.819 units remaining)
     [ (Pair 0 0) ]
-  - location: 28 (remaining gas: 1039981.169 units remaining)
+  - location: 28 (remaining gas: 1039980.809 units remaining)
     [ 0 ]
-  - location: 26 (remaining gas: 1039981.149 units remaining)
+  - location: 26 (remaining gas: 1039980.789 units remaining)
     [ 0
       0 ]
-  - location: 22 (remaining gas: 1039981.129 units remaining)
+  - location: 22 (remaining gas: 1039980.769 units remaining)
     [ (Pair 0 100)
       0
       0 ]
-  - location: 29 (remaining gas: 1039981.119 units remaining)
+  - location: 29 (remaining gas: 1039980.759 units remaining)
     [ (Pair 0 100)
       (Pair 0 100)
       0
       0 ]
-  - location: 30 (remaining gas: 1039981.119 units remaining)
+  - location: 30 (remaining gas: 1039980.759 units remaining)
     [ (Pair 0 100)
       0
       0 ]
-  - location: 32 (remaining gas: 1039981.109 units remaining)
+  - location: 32 (remaining gas: 1039980.749 units remaining)
     [ 0
       0
       0 ]
-  - location: 33 (remaining gas: 1039981.074 units remaining)
+  - location: 33 (remaining gas: 1039980.714 units remaining)
     [ 0
       0 ]
-  - location: 30 (remaining gas: 1039981.054 units remaining)
+  - location: 30 (remaining gas: 1039980.694 units remaining)
     [ (Pair 0 100)
       0
       0 ]
-  - location: 34 (remaining gas: 1039981.044 units remaining)
+  - location: 34 (remaining gas: 1039980.684 units remaining)
     [ 0
       (Pair 0 100)
       0 ]
-  - location: 35 (remaining gas: 1039981.044 units remaining)
+  - location: 35 (remaining gas: 1039980.684 units remaining)
     [ (Pair 0 100)
       0 ]
-  - location: 37 (remaining gas: 1039981.034 units remaining)
+  - location: 37 (remaining gas: 1039980.674 units remaining)
     [ 100
       0 ]
-  - location: 38 (remaining gas: 1039980.999 units remaining)
+  - location: 38 (remaining gas: 1039980.639 units remaining)
     [ 100 ]
-  - location: 35 (remaining gas: 1039980.979 units remaining)
+  - location: 35 (remaining gas: 1039980.619 units remaining)
     [ 0
       100 ]
-  - location: 39 (remaining gas: 1039980.969 units remaining)
+  - location: 39 (remaining gas: 1039980.609 units remaining)
     [ (Pair 0 100) ]
-  - location: 20 (remaining gas: 1039980.959 units remaining)
+  - location: 20 (remaining gas: 1039980.599 units remaining)
     [ (Pair 2 100)
       (Pair 0 100) ]
-  - location: 22 (remaining gas: 1039980.959 units remaining)
+  - location: 22 (remaining gas: 1039980.599 units remaining)
     [ (Pair 0 100) ]
-  - location: 24 (remaining gas: 1039980.949 units remaining)
+  - location: 24 (remaining gas: 1039980.589 units remaining)
     [ (Pair 0 100)
       (Pair 0 100) ]
-  - location: 25 (remaining gas: 1039980.939 units remaining)
+  - location: 25 (remaining gas: 1039980.579 units remaining)
     [ 0
       (Pair 0 100) ]
-  - location: 26 (remaining gas: 1039980.939 units remaining)
+  - location: 26 (remaining gas: 1039980.579 units remaining)
     [ (Pair 0 100) ]
-  - location: 28 (remaining gas: 1039980.929 units remaining)
+  - location: 28 (remaining gas: 1039980.569 units remaining)
     [ 100 ]
-  - location: 26 (remaining gas: 1039980.909 units remaining)
+  - location: 26 (remaining gas: 1039980.549 units remaining)
     [ 0
       100 ]
-  - location: 22 (remaining gas: 1039980.889 units remaining)
+  - location: 22 (remaining gas: 1039980.529 units remaining)
     [ (Pair 2 100)
       0
       100 ]
-  - location: 29 (remaining gas: 1039980.879 units remaining)
+  - location: 29 (remaining gas: 1039980.519 units remaining)
     [ (Pair 2 100)
       (Pair 2 100)
       0
       100 ]
-  - location: 30 (remaining gas: 1039980.879 units remaining)
+  - location: 30 (remaining gas: 1039980.519 units remaining)
     [ (Pair 2 100)
       0
       100 ]
-  - location: 32 (remaining gas: 1039980.869 units remaining)
+  - location: 32 (remaining gas: 1039980.509 units remaining)
     [ 2
       0
       100 ]
-  - location: 33 (remaining gas: 1039980.834 units remaining)
+  - location: 33 (remaining gas: 1039980.474 units remaining)
     [ 2
       100 ]
-  - location: 30 (remaining gas: 1039980.814 units remaining)
+  - location: 30 (remaining gas: 1039980.454 units remaining)
     [ (Pair 2 100)
       2
       100 ]
-  - location: 34 (remaining gas: 1039980.804 units remaining)
+  - location: 34 (remaining gas: 1039980.444 units remaining)
     [ 2
       (Pair 2 100)
       100 ]
-  - location: 35 (remaining gas: 1039980.804 units remaining)
+  - location: 35 (remaining gas: 1039980.444 units remaining)
     [ (Pair 2 100)
       100 ]
-  - location: 37 (remaining gas: 1039980.794 units remaining)
+  - location: 37 (remaining gas: 1039980.434 units remaining)
     [ 100
       100 ]
-  - location: 38 (remaining gas: 1039980.759 units remaining)
+  - location: 38 (remaining gas: 1039980.399 units remaining)
     [ 200 ]
-  - location: 35 (remaining gas: 1039980.739 units remaining)
+  - location: 35 (remaining gas: 1039980.379 units remaining)
     [ 2
       200 ]
-  - location: 39 (remaining gas: 1039980.729 units remaining)
+  - location: 39 (remaining gas: 1039980.369 units remaining)
     [ (Pair 2 200) ]
-  - location: 20 (remaining gas: 1039980.719 units remaining)
+  - location: 20 (remaining gas: 1039980.359 units remaining)
     [ (Pair 2 200) ]
-  - location: 40 (remaining gas: 1039980.709 units remaining)
+  - location: 40 (remaining gas: 1039980.349 units remaining)
     [ {}
       (Pair 2 200) ]
-  - location: 42 (remaining gas: 1039980.699 units remaining)
+  - location: 42 (remaining gas: 1039980.339 units remaining)
     [ (Pair {} 2 200) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out
index 492709cd15fd9d6ad116bcb943e8a658a117e727..1e26bd588cc9e8126e573fa6dd764dd8bd240455 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out	
@@ -7,146 +7,146 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039981.249 units remaining)
+  - location: 11 (remaining gas: 1039980.889 units remaining)
     [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ]
-  - location: 11 (remaining gas: 1039981.239 units remaining)
+  - location: 11 (remaining gas: 1039980.879 units remaining)
     [ { Elt 1 1 ; Elt 2 100 } ]
-  - location: 12 (remaining gas: 1039981.229 units remaining)
+  - location: 12 (remaining gas: 1039980.869 units remaining)
     [ 0
       { Elt 1 1 ; Elt 2 100 } ]
-  - location: 15 (remaining gas: 1039981.219 units remaining)
+  - location: 15 (remaining gas: 1039980.859 units remaining)
     [ 0
       0
       { Elt 1 1 ; Elt 2 100 } ]
-  - location: 18 (remaining gas: 1039981.209 units remaining)
+  - location: 18 (remaining gas: 1039980.849 units remaining)
     [ (Pair 0 0)
       { Elt 1 1 ; Elt 2 100 } ]
-  - location: 19 (remaining gas: 1039981.199 units remaining)
+  - location: 19 (remaining gas: 1039980.839 units remaining)
     [ { Elt 1 1 ; Elt 2 100 }
       (Pair 0 0) ]
-  - location: 20 (remaining gas: 1039981.199 units remaining)
+  - location: 20 (remaining gas: 1039980.839 units remaining)
     [ (Pair 1 1)
       (Pair 0 0) ]
-  - location: 22 (remaining gas: 1039981.199 units remaining)
+  - location: 22 (remaining gas: 1039980.839 units remaining)
     [ (Pair 0 0) ]
-  - location: 24 (remaining gas: 1039981.189 units remaining)
+  - location: 24 (remaining gas: 1039980.829 units remaining)
     [ (Pair 0 0)
       (Pair 0 0) ]
-  - location: 25 (remaining gas: 1039981.179 units remaining)
+  - location: 25 (remaining gas: 1039980.819 units remaining)
     [ 0
       (Pair 0 0) ]
-  - location: 26 (remaining gas: 1039981.179 units remaining)
+  - location: 26 (remaining gas: 1039980.819 units remaining)
     [ (Pair 0 0) ]
-  - location: 28 (remaining gas: 1039981.169 units remaining)
+  - location: 28 (remaining gas: 1039980.809 units remaining)
     [ 0 ]
-  - location: 26 (remaining gas: 1039981.149 units remaining)
+  - location: 26 (remaining gas: 1039980.789 units remaining)
     [ 0
       0 ]
-  - location: 22 (remaining gas: 1039981.129 units remaining)
+  - location: 22 (remaining gas: 1039980.769 units remaining)
     [ (Pair 1 1)
       0
       0 ]
-  - location: 29 (remaining gas: 1039981.119 units remaining)
+  - location: 29 (remaining gas: 1039980.759 units remaining)
     [ (Pair 1 1)
       (Pair 1 1)
       0
       0 ]
-  - location: 30 (remaining gas: 1039981.119 units remaining)
+  - location: 30 (remaining gas: 1039980.759 units remaining)
     [ (Pair 1 1)
       0
       0 ]
-  - location: 32 (remaining gas: 1039981.109 units remaining)
+  - location: 32 (remaining gas: 1039980.749 units remaining)
     [ 1
       0
       0 ]
-  - location: 33 (remaining gas: 1039981.074 units remaining)
+  - location: 33 (remaining gas: 1039980.714 units remaining)
     [ 1
       0 ]
-  - location: 30 (remaining gas: 1039981.054 units remaining)
+  - location: 30 (remaining gas: 1039980.694 units remaining)
     [ (Pair 1 1)
       1
       0 ]
-  - location: 34 (remaining gas: 1039981.044 units remaining)
+  - location: 34 (remaining gas: 1039980.684 units remaining)
     [ 1
       (Pair 1 1)
       0 ]
-  - location: 35 (remaining gas: 1039981.044 units remaining)
+  - location: 35 (remaining gas: 1039980.684 units remaining)
     [ (Pair 1 1)
       0 ]
-  - location: 37 (remaining gas: 1039981.034 units remaining)
+  - location: 37 (remaining gas: 1039980.674 units remaining)
     [ 1
       0 ]
-  - location: 38 (remaining gas: 1039980.999 units remaining)
+  - location: 38 (remaining gas: 1039980.639 units remaining)
     [ 1 ]
-  - location: 35 (remaining gas: 1039980.979 units remaining)
+  - location: 35 (remaining gas: 1039980.619 units remaining)
     [ 1
       1 ]
-  - location: 39 (remaining gas: 1039980.969 units remaining)
+  - location: 39 (remaining gas: 1039980.609 units remaining)
     [ (Pair 1 1) ]
-  - location: 20 (remaining gas: 1039980.959 units remaining)
+  - location: 20 (remaining gas: 1039980.599 units remaining)
     [ (Pair 2 100)
       (Pair 1 1) ]
-  - location: 22 (remaining gas: 1039980.959 units remaining)
+  - location: 22 (remaining gas: 1039980.599 units remaining)
     [ (Pair 1 1) ]
-  - location: 24 (remaining gas: 1039980.949 units remaining)
+  - location: 24 (remaining gas: 1039980.589 units remaining)
     [ (Pair 1 1)
       (Pair 1 1) ]
-  - location: 25 (remaining gas: 1039980.939 units remaining)
+  - location: 25 (remaining gas: 1039980.579 units remaining)
     [ 1
       (Pair 1 1) ]
-  - location: 26 (remaining gas: 1039980.939 units remaining)
+  - location: 26 (remaining gas: 1039980.579 units remaining)
     [ (Pair 1 1) ]
-  - location: 28 (remaining gas: 1039980.929 units remaining)
+  - location: 28 (remaining gas: 1039980.569 units remaining)
     [ 1 ]
-  - location: 26 (remaining gas: 1039980.909 units remaining)
+  - location: 26 (remaining gas: 1039980.549 units remaining)
     [ 1
       1 ]
-  - location: 22 (remaining gas: 1039980.889 units remaining)
+  - location: 22 (remaining gas: 1039980.529 units remaining)
     [ (Pair 2 100)
       1
       1 ]
-  - location: 29 (remaining gas: 1039980.879 units remaining)
+  - location: 29 (remaining gas: 1039980.519 units remaining)
     [ (Pair 2 100)
       (Pair 2 100)
       1
       1 ]
-  - location: 30 (remaining gas: 1039980.879 units remaining)
+  - location: 30 (remaining gas: 1039980.519 units remaining)
     [ (Pair 2 100)
       1
       1 ]
-  - location: 32 (remaining gas: 1039980.869 units remaining)
+  - location: 32 (remaining gas: 1039980.509 units remaining)
     [ 2
       1
       1 ]
-  - location: 33 (remaining gas: 1039980.834 units remaining)
+  - location: 33 (remaining gas: 1039980.474 units remaining)
     [ 3
       1 ]
-  - location: 30 (remaining gas: 1039980.814 units remaining)
+  - location: 30 (remaining gas: 1039980.454 units remaining)
     [ (Pair 2 100)
       3
       1 ]
-  - location: 34 (remaining gas: 1039980.804 units remaining)
+  - location: 34 (remaining gas: 1039980.444 units remaining)
     [ 3
       (Pair 2 100)
       1 ]
-  - location: 35 (remaining gas: 1039980.804 units remaining)
+  - location: 35 (remaining gas: 1039980.444 units remaining)
     [ (Pair 2 100)
       1 ]
-  - location: 37 (remaining gas: 1039980.794 units remaining)
+  - location: 37 (remaining gas: 1039980.434 units remaining)
     [ 100
       1 ]
-  - location: 38 (remaining gas: 1039980.759 units remaining)
+  - location: 38 (remaining gas: 1039980.399 units remaining)
     [ 101 ]
-  - location: 35 (remaining gas: 1039980.739 units remaining)
+  - location: 35 (remaining gas: 1039980.379 units remaining)
     [ 3
       101 ]
-  - location: 39 (remaining gas: 1039980.729 units remaining)
+  - location: 39 (remaining gas: 1039980.369 units remaining)
     [ (Pair 3 101) ]
-  - location: 20 (remaining gas: 1039980.719 units remaining)
+  - location: 20 (remaining gas: 1039980.359 units remaining)
     [ (Pair 3 101) ]
-  - location: 40 (remaining gas: 1039980.709 units remaining)
+  - location: 40 (remaining gas: 1039980.349 units remaining)
     [ {}
       (Pair 3 101) ]
-  - location: 42 (remaining gas: 1039980.699 units remaining)
+  - location: 42 (remaining gas: 1039980.339 units remaining)
     [ (Pair {} 3 101) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out"
index 4b84de0b8de90d954c0b86861f130cda6b18c24a..eed99112077d98c889bac63b73e093d89990137e 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out"	
@@ -7,62 +7,62 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039989.948 units remaining)
+  - location: 9 (remaining gas: 1039989.768 units remaining)
     [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ]
-  - location: 9 (remaining gas: 1039989.938 units remaining)
+  - location: 9 (remaining gas: 1039989.758 units remaining)
     [ 15
       { Elt "bar" 5 ; Elt "foo" 1 } ]
-  - location: 10 (remaining gas: 1039989.928 units remaining)
+  - location: 10 (remaining gas: 1039989.748 units remaining)
     [ { Elt "bar" 5 ; Elt "foo" 1 }
       15 ]
-  - location: 11 (remaining gas: 1039989.928 units remaining)
+  - location: 11 (remaining gas: 1039989.748 units remaining)
     [ (Pair "bar" 5)
       15 ]
-  - location: 13 (remaining gas: 1039989.918 units remaining)
+  - location: 13 (remaining gas: 1039989.738 units remaining)
     [ 5
       15 ]
-  - location: 14 (remaining gas: 1039989.918 units remaining)
+  - location: 14 (remaining gas: 1039989.738 units remaining)
     [ 15 ]
-  - location: 16 (remaining gas: 1039989.908 units remaining)
+  - location: 16 (remaining gas: 1039989.728 units remaining)
     [ 15
       15 ]
-  - location: 14 (remaining gas: 1039989.888 units remaining)
+  - location: 14 (remaining gas: 1039989.708 units remaining)
     [ 5
       15
       15 ]
-  - location: 17 (remaining gas: 1039989.853 units remaining)
+  - location: 17 (remaining gas: 1039989.673 units remaining)
     [ 20
       15 ]
-  - location: 11 (remaining gas: 1039989.843 units remaining)
+  - location: 11 (remaining gas: 1039989.663 units remaining)
     [ (Pair "foo" 1)
       15 ]
-  - location: 13 (remaining gas: 1039989.833 units remaining)
+  - location: 13 (remaining gas: 1039989.653 units remaining)
     [ 1
       15 ]
-  - location: 14 (remaining gas: 1039989.833 units remaining)
+  - location: 14 (remaining gas: 1039989.653 units remaining)
     [ 15 ]
-  - location: 16 (remaining gas: 1039989.823 units remaining)
+  - location: 16 (remaining gas: 1039989.643 units remaining)
     [ 15
       15 ]
-  - location: 14 (remaining gas: 1039989.803 units remaining)
+  - location: 14 (remaining gas: 1039989.623 units remaining)
     [ 1
       15
       15 ]
-  - location: 17 (remaining gas: 1039989.768 units remaining)
+  - location: 17 (remaining gas: 1039989.588 units remaining)
     [ 16
       15 ]
-  - location: 11 (remaining gas: 1039989.758 units remaining)
+  - location: 11 (remaining gas: 1039989.578 units remaining)
     [ { Elt "bar" 20 ; Elt "foo" 16 }
       15 ]
-  - location: 18 (remaining gas: 1039989.758 units remaining)
+  - location: 18 (remaining gas: 1039989.578 units remaining)
     [ 15 ]
-  - location: 20 (remaining gas: 1039989.748 units remaining)
+  - location: 20 (remaining gas: 1039989.568 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039989.728 units remaining)
+  - location: 18 (remaining gas: 1039989.548 units remaining)
     [ { Elt "bar" 20 ; Elt "foo" 16 } ]
-  - location: 21 (remaining gas: 1039989.718 units remaining)
+  - location: 21 (remaining gas: 1039989.538 units remaining)
     [ {}
       { Elt "bar" 20 ; Elt "foo" 16 } ]
-  - location: 23 (remaining gas: 1039989.708 units remaining)
+  - location: 23 (remaining gas: 1039989.528 units remaining)
     [ (Pair {} { Elt "bar" 20 ; Elt "foo" 16 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out"
index 256c20c1436b7687b6eaa17cf27ad5ea7e283c32..153fef7a131163e115ddbe5ee1700dcd0758ace1 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out"	
@@ -7,44 +7,44 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039990.319 units remaining)
+  - location: 9 (remaining gas: 1039990.139 units remaining)
     [ (Pair 10 { Elt "foo" 1 }) ]
-  - location: 9 (remaining gas: 1039990.309 units remaining)
+  - location: 9 (remaining gas: 1039990.129 units remaining)
     [ 10
       { Elt "foo" 1 } ]
-  - location: 10 (remaining gas: 1039990.299 units remaining)
+  - location: 10 (remaining gas: 1039990.119 units remaining)
     [ { Elt "foo" 1 }
       10 ]
-  - location: 11 (remaining gas: 1039990.299 units remaining)
+  - location: 11 (remaining gas: 1039990.119 units remaining)
     [ (Pair "foo" 1)
       10 ]
-  - location: 13 (remaining gas: 1039990.289 units remaining)
+  - location: 13 (remaining gas: 1039990.109 units remaining)
     [ 1
       10 ]
-  - location: 14 (remaining gas: 1039990.289 units remaining)
+  - location: 14 (remaining gas: 1039990.109 units remaining)
     [ 10 ]
-  - location: 16 (remaining gas: 1039990.279 units remaining)
+  - location: 16 (remaining gas: 1039990.099 units remaining)
     [ 10
       10 ]
-  - location: 14 (remaining gas: 1039990.259 units remaining)
+  - location: 14 (remaining gas: 1039990.079 units remaining)
     [ 1
       10
       10 ]
-  - location: 17 (remaining gas: 1039990.224 units remaining)
+  - location: 17 (remaining gas: 1039990.044 units remaining)
     [ 11
       10 ]
-  - location: 11 (remaining gas: 1039990.214 units remaining)
+  - location: 11 (remaining gas: 1039990.034 units remaining)
     [ { Elt "foo" 11 }
       10 ]
-  - location: 18 (remaining gas: 1039990.214 units remaining)
+  - location: 18 (remaining gas: 1039990.034 units remaining)
     [ 10 ]
-  - location: 20 (remaining gas: 1039990.204 units remaining)
+  - location: 20 (remaining gas: 1039990.024 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039990.184 units remaining)
+  - location: 18 (remaining gas: 1039990.004 units remaining)
     [ { Elt "foo" 11 } ]
-  - location: 21 (remaining gas: 1039990.174 units remaining)
+  - location: 21 (remaining gas: 1039989.994 units remaining)
     [ {}
       { Elt "foo" 11 } ]
-  - location: 23 (remaining gas: 1039990.164 units remaining)
+  - location: 23 (remaining gas: 1039989.984 units remaining)
     [ (Pair {} { Elt "foo" 11 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out
index 2f38eaf0e2f42f985dc74a73680b46c41acaffe5..94bbf2bb15dcbfb0092a95cdf0f64ffd87fb94bb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039990.649 units remaining)
+  - location: 9 (remaining gas: 1039990.469 units remaining)
     [ (Pair 10 {}) ]
-  - location: 9 (remaining gas: 1039990.639 units remaining)
+  - location: 9 (remaining gas: 1039990.459 units remaining)
     [ 10
       {} ]
-  - location: 10 (remaining gas: 1039990.629 units remaining)
+  - location: 10 (remaining gas: 1039990.449 units remaining)
     [ {}
       10 ]
-  - location: 11 (remaining gas: 1039990.629 units remaining)
+  - location: 11 (remaining gas: 1039990.449 units remaining)
     [ {}
       10 ]
-  - location: 18 (remaining gas: 1039990.629 units remaining)
+  - location: 18 (remaining gas: 1039990.449 units remaining)
     [ 10 ]
-  - location: 20 (remaining gas: 1039990.619 units remaining)
+  - location: 20 (remaining gas: 1039990.439 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039990.599 units remaining)
+  - location: 18 (remaining gas: 1039990.419 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039990.589 units remaining)
+  - location: 21 (remaining gas: 1039990.409 units remaining)
     [ {}
       {} ]
-  - location: 23 (remaining gas: 1039990.579 units remaining)
+  - location: 23 (remaining gas: 1039990.399 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out
index a5e17ae873e4080bf9b9cf685c7b208146f8ed04..1fdd550025c0f22e5fc5b54196ad91a52b302355 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039990.284 units remaining)
+  - location: 12 (remaining gas: 1039990.239 units remaining)
     [ (Pair 1 { Elt 0 1 } None) ]
-  - location: 12 (remaining gas: 1039990.274 units remaining)
+  - location: 12 (remaining gas: 1039990.229 units remaining)
     [ 1
       (Pair { Elt 0 1 } None) ]
-  - location: 13 (remaining gas: 1039990.274 units remaining)
+  - location: 13 (remaining gas: 1039990.229 units remaining)
     [ (Pair { Elt 0 1 } None) ]
-  - location: 15 (remaining gas: 1039990.264 units remaining)
+  - location: 15 (remaining gas: 1039990.219 units remaining)
     [ { Elt 0 1 } ]
-  - location: 16 (remaining gas: 1039990.254 units remaining)
+  - location: 16 (remaining gas: 1039990.209 units remaining)
     [ { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 13 (remaining gas: 1039990.234 units remaining)
+  - location: 13 (remaining gas: 1039990.189 units remaining)
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (remaining gas: 1039990.154 units remaining)
+  - location: 17 (remaining gas: 1039990.109 units remaining)
     [ False
       { Elt 0 1 } ]
-  - location: 18 (remaining gas: 1039990.144 units remaining)
+  - location: 18 (remaining gas: 1039990.099 units remaining)
     [ (Some False)
       { Elt 0 1 } ]
-  - location: 19 (remaining gas: 1039990.134 units remaining)
+  - location: 19 (remaining gas: 1039990.089 units remaining)
     [ { Elt 0 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039990.124 units remaining)
+  - location: 20 (remaining gas: 1039990.079 units remaining)
     [ (Pair { Elt 0 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039990.114 units remaining)
+  - location: 21 (remaining gas: 1039990.069 units remaining)
     [ {}
       (Pair { Elt 0 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039990.104 units remaining)
+  - location: 23 (remaining gas: 1039990.059 units remaining)
     [ (Pair {} { Elt 0 1 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out
index a6afa9d662d52c7a57cf42e98546825df0d85523..39ab64050fe4dd843040b664bfb4ccdd6df18812 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039990.284 units remaining)
+  - location: 12 (remaining gas: 1039990.239 units remaining)
     [ (Pair 1 { Elt 1 0 } None) ]
-  - location: 12 (remaining gas: 1039990.274 units remaining)
+  - location: 12 (remaining gas: 1039990.229 units remaining)
     [ 1
       (Pair { Elt 1 0 } None) ]
-  - location: 13 (remaining gas: 1039990.274 units remaining)
+  - location: 13 (remaining gas: 1039990.229 units remaining)
     [ (Pair { Elt 1 0 } None) ]
-  - location: 15 (remaining gas: 1039990.264 units remaining)
+  - location: 15 (remaining gas: 1039990.219 units remaining)
     [ { Elt 1 0 } ]
-  - location: 16 (remaining gas: 1039990.254 units remaining)
+  - location: 16 (remaining gas: 1039990.209 units remaining)
     [ { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 13 (remaining gas: 1039990.234 units remaining)
+  - location: 13 (remaining gas: 1039990.189 units remaining)
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (remaining gas: 1039990.154 units remaining)
+  - location: 17 (remaining gas: 1039990.109 units remaining)
     [ True
       { Elt 1 0 } ]
-  - location: 18 (remaining gas: 1039990.144 units remaining)
+  - location: 18 (remaining gas: 1039990.099 units remaining)
     [ (Some True)
       { Elt 1 0 } ]
-  - location: 19 (remaining gas: 1039990.134 units remaining)
+  - location: 19 (remaining gas: 1039990.089 units remaining)
     [ { Elt 1 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039990.124 units remaining)
+  - location: 20 (remaining gas: 1039990.079 units remaining)
     [ (Pair { Elt 1 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039990.114 units remaining)
+  - location: 21 (remaining gas: 1039990.069 units remaining)
     [ {}
       (Pair { Elt 1 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039990.104 units remaining)
+  - location: 23 (remaining gas: 1039990.059 units remaining)
     [ (Pair {} { Elt 1 0 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out
index 6360854cd53d7b2e55eab0c445a556516a843060..56dad8deb8423ccb83e23f27b8b66deeea259c51 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.969 units remaining)
+  - location: 12 (remaining gas: 1039989.924 units remaining)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039989.959 units remaining)
+  - location: 12 (remaining gas: 1039989.914 units remaining)
     [ 1
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039989.959 units remaining)
+  - location: 13 (remaining gas: 1039989.914 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039989.949 units remaining)
+  - location: 15 (remaining gas: 1039989.904 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039989.939 units remaining)
+  - location: 16 (remaining gas: 1039989.894 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039989.919 units remaining)
+  - location: 13 (remaining gas: 1039989.874 units remaining)
     [ 1
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039989.839 units remaining)
+  - location: 17 (remaining gas: 1039989.794 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039989.829 units remaining)
+  - location: 18 (remaining gas: 1039989.784 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039989.819 units remaining)
+  - location: 19 (remaining gas: 1039989.774 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039989.809 units remaining)
+  - location: 20 (remaining gas: 1039989.764 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039989.799 units remaining)
+  - location: 21 (remaining gas: 1039989.754 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039989.789 units remaining)
+  - location: 23 (remaining gas: 1039989.744 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out
index 518ecff0484feecc671c7458f8df886dcb07703c..9110d3ba78896377a2895c12481447d8a3e268cc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.969 units remaining)
+  - location: 12 (remaining gas: 1039989.924 units remaining)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039989.959 units remaining)
+  - location: 12 (remaining gas: 1039989.914 units remaining)
     [ 2
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039989.959 units remaining)
+  - location: 13 (remaining gas: 1039989.914 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039989.949 units remaining)
+  - location: 15 (remaining gas: 1039989.904 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039989.939 units remaining)
+  - location: 16 (remaining gas: 1039989.894 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039989.919 units remaining)
+  - location: 13 (remaining gas: 1039989.874 units remaining)
     [ 2
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039989.839 units remaining)
+  - location: 17 (remaining gas: 1039989.794 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039989.829 units remaining)
+  - location: 18 (remaining gas: 1039989.784 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039989.819 units remaining)
+  - location: 19 (remaining gas: 1039989.774 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039989.809 units remaining)
+  - location: 20 (remaining gas: 1039989.764 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039989.799 units remaining)
+  - location: 21 (remaining gas: 1039989.754 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039989.789 units remaining)
+  - location: 23 (remaining gas: 1039989.744 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out
index 42085d26662373adadff508e6a3164c937b41e0d..d8e0a4248cd3b11e31089ec89da72b1b8a38ef25 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.969 units remaining)
+  - location: 12 (remaining gas: 1039989.924 units remaining)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039989.959 units remaining)
+  - location: 12 (remaining gas: 1039989.914 units remaining)
     [ 3
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039989.959 units remaining)
+  - location: 13 (remaining gas: 1039989.914 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039989.949 units remaining)
+  - location: 15 (remaining gas: 1039989.904 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039989.939 units remaining)
+  - location: 16 (remaining gas: 1039989.894 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039989.919 units remaining)
+  - location: 13 (remaining gas: 1039989.874 units remaining)
     [ 3
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039989.839 units remaining)
+  - location: 17 (remaining gas: 1039989.794 units remaining)
     [ False
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039989.829 units remaining)
+  - location: 18 (remaining gas: 1039989.784 units remaining)
     [ (Some False)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039989.819 units remaining)
+  - location: 19 (remaining gas: 1039989.774 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039989.809 units remaining)
+  - location: 20 (remaining gas: 1039989.764 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039989.799 units remaining)
+  - location: 21 (remaining gas: 1039989.754 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039989.789 units remaining)
+  - location: 23 (remaining gas: 1039989.744 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out
index 12d26bad535692ccee10987f91d1a63d8ba2b5ea..bc3287c1fe8653a43b00ce6b82111afc35a5b586 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039990.564 units remaining)
+  - location: 12 (remaining gas: 1039990.519 units remaining)
     [ (Pair 1 {} None) ]
-  - location: 12 (remaining gas: 1039990.554 units remaining)
+  - location: 12 (remaining gas: 1039990.509 units remaining)
     [ 1
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039990.554 units remaining)
+  - location: 13 (remaining gas: 1039990.509 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039990.544 units remaining)
+  - location: 15 (remaining gas: 1039990.499 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039990.534 units remaining)
+  - location: 16 (remaining gas: 1039990.489 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039990.514 units remaining)
+  - location: 13 (remaining gas: 1039990.469 units remaining)
     [ 1
       {}
       {} ]
-  - location: 17 (remaining gas: 1039990.434 units remaining)
+  - location: 17 (remaining gas: 1039990.389 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039990.424 units remaining)
+  - location: 18 (remaining gas: 1039990.379 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039990.414 units remaining)
+  - location: 19 (remaining gas: 1039990.369 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039990.404 units remaining)
+  - location: 20 (remaining gas: 1039990.359 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039990.394 units remaining)
+  - location: 21 (remaining gas: 1039990.349 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039990.384 units remaining)
+  - location: 23 (remaining gas: 1039990.339 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out"
index 67eb8fc0443213468949aec7297fe0dedd2d67e8..4c33590503696655a2f57b172652a23360dd46c8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.819 units remaining)
+  - location: 12 (remaining gas: 1039989.774 units remaining)
     [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039989.809 units remaining)
+  - location: 12 (remaining gas: 1039989.764 units remaining)
     [ "bar"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039989.809 units remaining)
+  - location: 13 (remaining gas: 1039989.764 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039989.799 units remaining)
+  - location: 15 (remaining gas: 1039989.754 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039989.789 units remaining)
+  - location: 16 (remaining gas: 1039989.744 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039989.769 units remaining)
+  - location: 13 (remaining gas: 1039989.724 units remaining)
     [ "bar"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039989.680 units remaining)
+  - location: 17 (remaining gas: 1039989.635 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039989.670 units remaining)
+  - location: 18 (remaining gas: 1039989.625 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039989.660 units remaining)
+  - location: 19 (remaining gas: 1039989.615 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039989.650 units remaining)
+  - location: 20 (remaining gas: 1039989.605 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039989.640 units remaining)
+  - location: 21 (remaining gas: 1039989.595 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039989.630 units remaining)
+  - location: 23 (remaining gas: 1039989.585 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out"
index 5a6dc2910da7fce9590e633ed4bb32f780af68ad..15db8bd5653344034861c395161a3d1bc1777f6a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.819 units remaining)
+  - location: 12 (remaining gas: 1039989.774 units remaining)
     [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039989.809 units remaining)
+  - location: 12 (remaining gas: 1039989.764 units remaining)
     [ "foo"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039989.809 units remaining)
+  - location: 13 (remaining gas: 1039989.764 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039989.799 units remaining)
+  - location: 15 (remaining gas: 1039989.754 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039989.789 units remaining)
+  - location: 16 (remaining gas: 1039989.744 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039989.769 units remaining)
+  - location: 13 (remaining gas: 1039989.724 units remaining)
     [ "foo"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039989.680 units remaining)
+  - location: 17 (remaining gas: 1039989.635 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039989.670 units remaining)
+  - location: 18 (remaining gas: 1039989.625 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039989.660 units remaining)
+  - location: 19 (remaining gas: 1039989.615 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039989.650 units remaining)
+  - location: 20 (remaining gas: 1039989.605 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039989.640 units remaining)
+  - location: 21 (remaining gas: 1039989.595 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039989.630 units remaining)
+  - location: 23 (remaining gas: 1039989.585 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out"
index 27a5ae23a027d562d11b894fe326da4e99be5070..61d97b958bd7136cfee20f13e51d3f32b3ea0a48 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039989.819 units remaining)
+  - location: 12 (remaining gas: 1039989.774 units remaining)
     [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039989.809 units remaining)
+  - location: 12 (remaining gas: 1039989.764 units remaining)
     [ "baz"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039989.809 units remaining)
+  - location: 13 (remaining gas: 1039989.764 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039989.799 units remaining)
+  - location: 15 (remaining gas: 1039989.754 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039989.789 units remaining)
+  - location: 16 (remaining gas: 1039989.744 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039989.769 units remaining)
+  - location: 13 (remaining gas: 1039989.724 units remaining)
     [ "baz"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039989.680 units remaining)
+  - location: 17 (remaining gas: 1039989.635 units remaining)
     [ False
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039989.670 units remaining)
+  - location: 18 (remaining gas: 1039989.625 units remaining)
     [ (Some False)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039989.660 units remaining)
+  - location: 19 (remaining gas: 1039989.615 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039989.650 units remaining)
+  - location: 20 (remaining gas: 1039989.605 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039989.640 units remaining)
+  - location: 21 (remaining gas: 1039989.595 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039989.630 units remaining)
+  - location: 23 (remaining gas: 1039989.585 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out"
index e58f171396e07a107cce746d3d63fc9836764987..84a99f4bd1fcd02c6a980cf4d590c6ea64a4dbec 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039990.190 units remaining)
+  - location: 12 (remaining gas: 1039990.145 units remaining)
     [ (Pair "foo" { Elt "foo" 0 } None) ]
-  - location: 12 (remaining gas: 1039990.180 units remaining)
+  - location: 12 (remaining gas: 1039990.135 units remaining)
     [ "foo"
       (Pair { Elt "foo" 0 } None) ]
-  - location: 13 (remaining gas: 1039990.180 units remaining)
+  - location: 13 (remaining gas: 1039990.135 units remaining)
     [ (Pair { Elt "foo" 0 } None) ]
-  - location: 15 (remaining gas: 1039990.170 units remaining)
+  - location: 15 (remaining gas: 1039990.125 units remaining)
     [ { Elt "foo" 0 } ]
-  - location: 16 (remaining gas: 1039990.160 units remaining)
+  - location: 16 (remaining gas: 1039990.115 units remaining)
     [ { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 13 (remaining gas: 1039990.140 units remaining)
+  - location: 13 (remaining gas: 1039990.095 units remaining)
     [ "foo"
       { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 17 (remaining gas: 1039990.054 units remaining)
+  - location: 17 (remaining gas: 1039990.009 units remaining)
     [ True
       { Elt "foo" 0 } ]
-  - location: 18 (remaining gas: 1039990.044 units remaining)
+  - location: 18 (remaining gas: 1039989.999 units remaining)
     [ (Some True)
       { Elt "foo" 0 } ]
-  - location: 19 (remaining gas: 1039990.034 units remaining)
+  - location: 19 (remaining gas: 1039989.989 units remaining)
     [ { Elt "foo" 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039990.024 units remaining)
+  - location: 20 (remaining gas: 1039989.979 units remaining)
     [ (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039990.014 units remaining)
+  - location: 21 (remaining gas: 1039989.969 units remaining)
     [ {}
       (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039990.004 units remaining)
+  - location: 23 (remaining gas: 1039989.959 units remaining)
     [ (Pair {} { Elt "foo" 0 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out"
index a75d5f59ac2e129918cb07ae2a3d8ff2b687241d..ab9007d5e7da50e27118c168b736d3cfcec66440 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039990.190 units remaining)
+  - location: 12 (remaining gas: 1039990.145 units remaining)
     [ (Pair "bar" { Elt "foo" 1 } None) ]
-  - location: 12 (remaining gas: 1039990.180 units remaining)
+  - location: 12 (remaining gas: 1039990.135 units remaining)
     [ "bar"
       (Pair { Elt "foo" 1 } None) ]
-  - location: 13 (remaining gas: 1039990.180 units remaining)
+  - location: 13 (remaining gas: 1039990.135 units remaining)
     [ (Pair { Elt "foo" 1 } None) ]
-  - location: 15 (remaining gas: 1039990.170 units remaining)
+  - location: 15 (remaining gas: 1039990.125 units remaining)
     [ { Elt "foo" 1 } ]
-  - location: 16 (remaining gas: 1039990.160 units remaining)
+  - location: 16 (remaining gas: 1039990.115 units remaining)
     [ { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 13 (remaining gas: 1039990.140 units remaining)
+  - location: 13 (remaining gas: 1039990.095 units remaining)
     [ "bar"
       { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 17 (remaining gas: 1039990.054 units remaining)
+  - location: 17 (remaining gas: 1039990.009 units remaining)
     [ False
       { Elt "foo" 1 } ]
-  - location: 18 (remaining gas: 1039990.044 units remaining)
+  - location: 18 (remaining gas: 1039989.999 units remaining)
     [ (Some False)
       { Elt "foo" 1 } ]
-  - location: 19 (remaining gas: 1039990.034 units remaining)
+  - location: 19 (remaining gas: 1039989.989 units remaining)
     [ { Elt "foo" 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039990.024 units remaining)
+  - location: 20 (remaining gas: 1039989.979 units remaining)
     [ (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039990.014 units remaining)
+  - location: 21 (remaining gas: 1039989.969 units remaining)
     [ {}
       (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039990.004 units remaining)
+  - location: 23 (remaining gas: 1039989.959 units remaining)
     [ (Pair {} { Elt "foo" 1 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out"
index 2fb57047a03a2274f9187e7b51226e75c473ea52..fa8b93cc5df8f7638a5c9b131158c04c9d5ed12c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039990.520 units remaining)
+  - location: 12 (remaining gas: 1039990.475 units remaining)
     [ (Pair "bar" {} None) ]
-  - location: 12 (remaining gas: 1039990.510 units remaining)
+  - location: 12 (remaining gas: 1039990.465 units remaining)
     [ "bar"
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039990.510 units remaining)
+  - location: 13 (remaining gas: 1039990.465 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039990.500 units remaining)
+  - location: 15 (remaining gas: 1039990.455 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039990.490 units remaining)
+  - location: 16 (remaining gas: 1039990.445 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039990.470 units remaining)
+  - location: 13 (remaining gas: 1039990.425 units remaining)
     [ "bar"
       {}
       {} ]
-  - location: 17 (remaining gas: 1039990.387 units remaining)
+  - location: 17 (remaining gas: 1039990.342 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039990.377 units remaining)
+  - location: 18 (remaining gas: 1039990.332 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039990.367 units remaining)
+  - location: 19 (remaining gas: 1039990.322 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039990.357 units remaining)
+  - location: 20 (remaining gas: 1039990.312 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039990.347 units remaining)
+  - location: 21 (remaining gas: 1039990.302 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039990.337 units remaining)
+  - location: 23 (remaining gas: 1039990.292 units remaining)
     [ (Pair {} {} (Some False)) ]
 
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 38d9a473dd52985d96a9e2f967e58f239e0226f6..a6c996f35cf845edab08cd1ba3b018419dd5aa44 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: 1039851.095 units remaining)
+  - location: 16 (remaining gas: 1039850.735 units remaining)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -18,7 +18,7 @@ trace
                   "2019-09-09T08:35:33Z"
                   "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             Unit) ]
-  - location: 16 (remaining gas: 1039851.085 units remaining)
+  - location: 16 (remaining gas: 1039850.725 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -28,7 +28,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 17 (remaining gas: 1039851.075 units remaining)
+  - location: 17 (remaining gas: 1039850.715 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -47,7 +47,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 18 (remaining gas: 1039851.065 units remaining)
+  - location: 18 (remaining gas: 1039850.705 units remaining)
     [ -1
       (Pair -1
             1
@@ -58,7 +58,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039851.065 units remaining)
+  - location: 19 (remaining gas: 1039850.705 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -68,7 +68,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 21 (remaining gas: 1039851.055 units remaining)
+  - location: 21 (remaining gas: 1039850.695 units remaining)
     [ -1
       (Pair 1
             "foobar"
@@ -78,7 +78,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039851.035 units remaining)
+  - location: 19 (remaining gas: 1039850.675 units remaining)
     [ -1
       -1
       (Pair 1
@@ -89,7 +89,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 22 (remaining gas: 1039850.808 units remaining)
+  - location: 22 (remaining gas: 1039850.448 units remaining)
     [ 0x050041
       -1
       (Pair 1
@@ -100,7 +100,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 23 (remaining gas: 1039850.388 units remaining)
+  - location: 23 (remaining gas: 1039850.028 units remaining)
     [ (Some -1)
       -1
       (Pair 1
@@ -111,7 +111,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039850.388 units remaining)
+  - location: 26 (remaining gas: 1039850.028 units remaining)
     [ -1
       -1
       (Pair 1
@@ -122,7 +122,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039850.378 units remaining)
+  - location: 26 (remaining gas: 1039850.018 units remaining)
     [ -1
       -1
       (Pair 1
@@ -133,7 +133,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 34 (remaining gas: 1039850.343 units remaining)
+  - location: 34 (remaining gas: 1039849.983 units remaining)
     [ 0
       (Pair 1
             "foobar"
@@ -143,7 +143,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 35 (remaining gas: 1039850.333 units remaining)
+  - location: 35 (remaining gas: 1039849.973 units remaining)
     [ True
       (Pair 1
             "foobar"
@@ -153,7 +153,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039850.333 units remaining)
+  - location: 36 (remaining gas: 1039849.973 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -162,7 +162,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039850.323 units remaining)
+  - location: 36 (remaining gas: 1039849.963 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -171,7 +171,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 42 (remaining gas: 1039850.313 units remaining)
+  - location: 42 (remaining gas: 1039849.953 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -188,7 +188,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 43 (remaining gas: 1039850.303 units remaining)
+  - location: 43 (remaining gas: 1039849.943 units remaining)
     [ 1
       (Pair 1
             "foobar"
@@ -198,7 +198,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039850.303 units remaining)
+  - location: 44 (remaining gas: 1039849.943 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -207,7 +207,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 46 (remaining gas: 1039850.293 units remaining)
+  - location: 46 (remaining gas: 1039849.933 units remaining)
     [ 1
       (Pair "foobar"
             0x00aabbcc
@@ -216,7 +216,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039850.273 units remaining)
+  - location: 44 (remaining gas: 1039849.913 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -226,7 +226,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 47 (remaining gas: 1039850.046 units remaining)
+  - location: 47 (remaining gas: 1039849.686 units remaining)
     [ 0x050001
       1
       (Pair "foobar"
@@ -236,7 +236,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 48 (remaining gas: 1039849.626 units remaining)
+  - location: 48 (remaining gas: 1039849.266 units remaining)
     [ (Some 1)
       1
       (Pair "foobar"
@@ -246,7 +246,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039849.626 units remaining)
+  - location: 51 (remaining gas: 1039849.266 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -256,7 +256,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039849.616 units remaining)
+  - location: 51 (remaining gas: 1039849.256 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -266,7 +266,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 59 (remaining gas: 1039849.581 units remaining)
+  - location: 59 (remaining gas: 1039849.221 units remaining)
     [ 0
       (Pair "foobar"
             0x00aabbcc
@@ -275,7 +275,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 60 (remaining gas: 1039849.571 units remaining)
+  - location: 60 (remaining gas: 1039849.211 units remaining)
     [ True
       (Pair "foobar"
             0x00aabbcc
@@ -284,7 +284,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039849.571 units remaining)
+  - location: 61 (remaining gas: 1039849.211 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -292,7 +292,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039849.561 units remaining)
+  - location: 61 (remaining gas: 1039849.201 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -300,7 +300,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 67 (remaining gas: 1039849.551 units remaining)
+  - location: 67 (remaining gas: 1039849.191 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -315,7 +315,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 68 (remaining gas: 1039849.541 units remaining)
+  - location: 68 (remaining gas: 1039849.181 units remaining)
     [ "foobar"
       (Pair "foobar"
             0x00aabbcc
@@ -324,7 +324,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039849.541 units remaining)
+  - location: 69 (remaining gas: 1039849.181 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -332,7 +332,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 71 (remaining gas: 1039849.531 units remaining)
+  - location: 71 (remaining gas: 1039849.171 units remaining)
     [ "foobar"
       (Pair 0x00aabbcc
             1000
@@ -340,7 +340,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039849.511 units remaining)
+  - location: 69 (remaining gas: 1039849.151 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -349,7 +349,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 72 (remaining gas: 1039848.987 units remaining)
+  - location: 72 (remaining gas: 1039848.627 units remaining)
     [ 0x050100000006666f6f626172
       "foobar"
       (Pair 0x00aabbcc
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (remaining gas: 1039848.312 units remaining)
+  - location: 73 (remaining gas: 1039847.952 units remaining)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
@@ -367,7 +367,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039848.312 units remaining)
+  - location: 76 (remaining gas: 1039847.952 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -376,7 +376,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039848.302 units remaining)
+  - location: 76 (remaining gas: 1039847.942 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -385,7 +385,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 84 (remaining gas: 1039848.267 units remaining)
+  - location: 84 (remaining gas: 1039847.907 units remaining)
     [ 0
       (Pair 0x00aabbcc
             1000
@@ -393,7 +393,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 85 (remaining gas: 1039848.257 units remaining)
+  - location: 85 (remaining gas: 1039847.897 units remaining)
     [ True
       (Pair 0x00aabbcc
             1000
@@ -401,21 +401,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039848.257 units remaining)
+  - location: 86 (remaining gas: 1039847.897 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039848.247 units remaining)
+  - location: 86 (remaining gas: 1039847.887 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 92 (remaining gas: 1039848.237 units remaining)
+  - location: 92 (remaining gas: 1039847.877 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
@@ -428,7 +428,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 93 (remaining gas: 1039848.227 units remaining)
+  - location: 93 (remaining gas: 1039847.867 units remaining)
     [ 0x00aabbcc
       (Pair 0x00aabbcc
             1000
@@ -436,21 +436,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039848.227 units remaining)
+  - location: 94 (remaining gas: 1039847.867 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 96 (remaining gas: 1039848.217 units remaining)
+  - location: 96 (remaining gas: 1039847.857 units remaining)
     [ 0x00aabbcc
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039848.197 units remaining)
+  - location: 94 (remaining gas: 1039847.837 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -458,7 +458,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 97 (remaining gas: 1039847.739 units remaining)
+  - location: 97 (remaining gas: 1039847.379 units remaining)
     [ 0x050a0000000400aabbcc
       0x00aabbcc
       (Pair 1000
@@ -466,7 +466,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 98 (remaining gas: 1039847.178 units remaining)
+  - location: 98 (remaining gas: 1039846.818 units remaining)
     [ (Some 0x00aabbcc)
       0x00aabbcc
       (Pair 1000
@@ -474,7 +474,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039847.178 units remaining)
+  - location: 101 (remaining gas: 1039846.818 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -482,7 +482,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039847.168 units remaining)
+  - location: 101 (remaining gas: 1039846.808 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -490,33 +490,33 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 109 (remaining gas: 1039847.133 units remaining)
+  - location: 109 (remaining gas: 1039846.773 units remaining)
     [ 0
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 110 (remaining gas: 1039847.123 units remaining)
+  - location: 110 (remaining gas: 1039846.763 units remaining)
     [ True
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039847.123 units remaining)
+  - location: 111 (remaining gas: 1039846.763 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039847.113 units remaining)
+  - location: 111 (remaining gas: 1039846.753 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 117 (remaining gas: 1039847.103 units remaining)
+  - location: 117 (remaining gas: 1039846.743 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
@@ -527,83 +527,83 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 118 (remaining gas: 1039847.093 units remaining)
+  - location: 118 (remaining gas: 1039846.733 units remaining)
     [ 1000
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039847.093 units remaining)
+  - location: 119 (remaining gas: 1039846.733 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 121 (remaining gas: 1039847.083 units remaining)
+  - location: 121 (remaining gas: 1039846.723 units remaining)
     [ 1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039847.063 units remaining)
+  - location: 119 (remaining gas: 1039846.703 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 122 (remaining gas: 1039846.803 units remaining)
+  - location: 122 (remaining gas: 1039846.443 units remaining)
     [ 0x0500a80f
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 123 (remaining gas: 1039846.363 units remaining)
+  - location: 123 (remaining gas: 1039846.003 units remaining)
     [ (Some 1000)
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039846.363 units remaining)
+  - location: 126 (remaining gas: 1039846.003 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039846.353 units remaining)
+  - location: 126 (remaining gas: 1039845.993 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 134 (remaining gas: 1039846.318 units remaining)
+  - location: 134 (remaining gas: 1039845.958 units remaining)
     [ 0
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 135 (remaining gas: 1039846.308 units remaining)
+  - location: 135 (remaining gas: 1039845.948 units remaining)
     [ True
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039846.308 units remaining)
+  - location: 136 (remaining gas: 1039845.948 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039846.298 units remaining)
+  - location: 136 (remaining gas: 1039845.938 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 142 (remaining gas: 1039846.288 units remaining)
+  - location: 142 (remaining gas: 1039845.928 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: 1039846.278 units remaining)
+  - location: 143 (remaining gas: 1039845.918 units remaining)
     [ False
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039846.278 units remaining)
+  - location: 144 (remaining gas: 1039845.918 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 146 (remaining gas: 1039846.268 units remaining)
+  - location: 146 (remaining gas: 1039845.908 units remaining)
     [ False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039846.248 units remaining)
+  - location: 144 (remaining gas: 1039845.888 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 147 (remaining gas: 1039846.021 units remaining)
+  - location: 147 (remaining gas: 1039845.661 units remaining)
     [ 0x050303
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 148 (remaining gas: 1039845.601 units remaining)
+  - location: 148 (remaining gas: 1039845.241 units remaining)
     [ (Some False)
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039845.601 units remaining)
+  - location: 151 (remaining gas: 1039845.241 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039845.591 units remaining)
+  - location: 151 (remaining gas: 1039845.231 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 159 (remaining gas: 1039845.556 units remaining)
+  - location: 159 (remaining gas: 1039845.196 units remaining)
     [ 0
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 160 (remaining gas: 1039845.546 units remaining)
+  - location: 160 (remaining gas: 1039845.186 units remaining)
     [ True
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039845.546 units remaining)
+  - location: 161 (remaining gas: 1039845.186 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039845.536 units remaining)
+  - location: 161 (remaining gas: 1039845.176 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 167 (remaining gas: 1039845.526 units remaining)
+  - location: 167 (remaining gas: 1039845.166 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 168 (remaining gas: 1039845.516 units remaining)
+  - location: 168 (remaining gas: 1039845.156 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039845.516 units remaining)
+  - location: 169 (remaining gas: 1039845.156 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 171 (remaining gas: 1039845.506 units remaining)
+  - location: 171 (remaining gas: 1039845.146 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039845.486 units remaining)
+  - location: 169 (remaining gas: 1039845.126 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 172 (remaining gas: 1039844.396 units remaining)
+  - location: 172 (remaining gas: 1039844.036 units remaining)
     [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 173 (remaining gas: 1039843.443 units remaining)
+  - location: 173 (remaining gas: 1039843.083 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039843.443 units remaining)
+  - location: 176 (remaining gas: 1039843.083 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039843.433 units remaining)
+  - location: 176 (remaining gas: 1039843.073 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 184 (remaining gas: 1039843.397 units remaining)
+  - location: 184 (remaining gas: 1039843.037 units remaining)
     [ 0
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 185 (remaining gas: 1039843.387 units remaining)
+  - location: 185 (remaining gas: 1039843.027 units remaining)
     [ True
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039843.387 units remaining)
+  - location: 186 (remaining gas: 1039843.027 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039843.377 units remaining)
+  - location: 186 (remaining gas: 1039843.017 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 192 (remaining gas: 1039843.367 units remaining)
+  - location: 192 (remaining gas: 1039843.007 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 193 (remaining gas: 1039843.357 units remaining)
+  - location: 193 (remaining gas: 1039842.997 units remaining)
     [ "2019-09-09T08:35:33Z"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 194 (remaining gas: 1039843.357 units remaining)
+  - location: 194 (remaining gas: 1039842.997 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 196 (remaining gas: 1039843.347 units remaining)
+  - location: 196 (remaining gas: 1039842.987 units remaining)
     [ "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 194 (remaining gas: 1039843.327 units remaining)
+  - location: 194 (remaining gas: 1039842.967 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 197 (remaining gas: 1039842.968 units remaining)
+  - location: 197 (remaining gas: 1039842.608 units remaining)
     [ 0x050095bbb0d70b
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 198 (remaining gas: 1039842.468 units remaining)
+  - location: 198 (remaining gas: 1039842.108 units remaining)
     [ (Some "2019-09-09T08:35:33Z")
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039842.468 units remaining)
+  - location: 201 (remaining gas: 1039842.108 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039842.458 units remaining)
+  - location: 201 (remaining gas: 1039842.098 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 209 (remaining gas: 1039842.423 units remaining)
+  - location: 209 (remaining gas: 1039842.063 units remaining)
     [ 0
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 210 (remaining gas: 1039842.413 units remaining)
+  - location: 210 (remaining gas: 1039842.053 units remaining)
     [ True
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039842.413 units remaining)
+  - location: 211 (remaining gas: 1039842.053 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039842.403 units remaining)
+  - location: 211 (remaining gas: 1039842.043 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 217 (remaining gas: 1039842.393 units remaining)
+  - location: 217 (remaining gas: 1039842.033 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 218 (remaining gas: 1039841.270 units remaining)
+  - location: 218 (remaining gas: 1039840.910 units remaining)
     [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 219 (remaining gas: 1039840.297 units remaining)
+  - location: 219 (remaining gas: 1039839.937 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039840.297 units remaining)
+  - location: 222 (remaining gas: 1039839.937 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039840.287 units remaining)
+  - location: 222 (remaining gas: 1039839.927 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 230 (remaining gas: 1039840.251 units remaining)
+  - location: 230 (remaining gas: 1039839.891 units remaining)
     [ 0 ]
-  - location: 231 (remaining gas: 1039840.241 units remaining)
+  - location: 231 (remaining gas: 1039839.881 units remaining)
     [ True ]
-  - location: 232 (remaining gas: 1039840.241 units remaining)
+  - location: 232 (remaining gas: 1039839.881 units remaining)
     [  ]
-  - location: 232 (remaining gas: 1039840.231 units remaining)
+  - location: 232 (remaining gas: 1039839.871 units remaining)
     [  ]
-  - location: 238 (remaining gas: 1039840.221 units remaining)
+  - location: 238 (remaining gas: 1039839.861 units remaining)
     [ 0 ]
-  - location: 241 (remaining gas: 1039839.994 units remaining)
+  - location: 241 (remaining gas: 1039839.634 units remaining)
     [ 0x050000 ]
-  - location: 242 (remaining gas: 1039839.574 units remaining)
+  - location: 242 (remaining gas: 1039839.214 units remaining)
     [ (Some 0) ]
-  - location: 245 (remaining gas: 1039839.574 units remaining)
+  - location: 245 (remaining gas: 1039839.214 units remaining)
     [ 0 ]
-  - location: 245 (remaining gas: 1039839.564 units remaining)
+  - location: 245 (remaining gas: 1039839.204 units remaining)
     [ 0 ]
-  - location: 251 (remaining gas: 1039839.554 units remaining)
+  - location: 251 (remaining gas: 1039839.194 units remaining)
     [  ]
-  - location: 252 (remaining gas: 1039839.544 units remaining)
+  - location: 252 (remaining gas: 1039839.184 units remaining)
     [ -1 ]
-  - location: 255 (remaining gas: 1039839.317 units remaining)
+  - location: 255 (remaining gas: 1039838.957 units remaining)
     [ 0x050041 ]
-  - location: 256 (remaining gas: 1039742.997 units remaining)
+  - location: 256 (remaining gas: 1039742.637 units remaining)
     [ None ]
-  - location: 259 (remaining gas: 1039742.997 units remaining)
+  - location: 259 (remaining gas: 1039742.637 units remaining)
     [  ]
-  - location: 259 (remaining gas: 1039742.987 units remaining)
+  - location: 259 (remaining gas: 1039742.627 units remaining)
     [  ]
-  - location: 265 (remaining gas: 1039742.977 units remaining)
+  - location: 265 (remaining gas: 1039742.617 units remaining)
     [ 0x ]
-  - location: 268 (remaining gas: 1039742.717 units remaining)
+  - location: 268 (remaining gas: 1039742.357 units remaining)
     [ None ]
-  - location: 271 (remaining gas: 1039742.717 units remaining)
+  - location: 271 (remaining gas: 1039742.357 units remaining)
     [  ]
-  - location: 271 (remaining gas: 1039742.707 units remaining)
+  - location: 271 (remaining gas: 1039742.347 units remaining)
     [  ]
-  - location: 277 (remaining gas: 1039742.697 units remaining)
+  - location: 277 (remaining gas: 1039742.337 units remaining)
     [ 0x04 ]
-  - location: 280 (remaining gas: 1039742.417 units remaining)
+  - location: 280 (remaining gas: 1039742.057 units remaining)
     [ None ]
-  - location: 283 (remaining gas: 1039742.417 units remaining)
+  - location: 283 (remaining gas: 1039742.057 units remaining)
     [  ]
-  - location: 283 (remaining gas: 1039742.407 units remaining)
+  - location: 283 (remaining gas: 1039742.047 units remaining)
     [  ]
-  - location: 289 (remaining gas: 1039742.397 units remaining)
+  - location: 289 (remaining gas: 1039742.037 units remaining)
     [ 0x05 ]
-  - location: 292 (remaining gas: 1039742.117 units remaining)
+  - location: 292 (remaining gas: 1039741.757 units remaining)
     [ None ]
-  - location: 295 (remaining gas: 1039742.117 units remaining)
+  - location: 295 (remaining gas: 1039741.757 units remaining)
     [  ]
-  - location: 295 (remaining gas: 1039742.107 units remaining)
+  - location: 295 (remaining gas: 1039741.747 units remaining)
     [  ]
-  - location: 301 (remaining gas: 1039742.097 units remaining)
+  - location: 301 (remaining gas: 1039741.737 units remaining)
     [ Unit ]
-  - location: 302 (remaining gas: 1039742.087 units remaining)
+  - location: 302 (remaining gas: 1039741.727 units remaining)
     [ {}
       Unit ]
-  - location: 304 (remaining gas: 1039742.077 units remaining)
+  - location: 304 (remaining gas: 1039741.717 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 b92b3e0efdedb950f9a110c7aa792b8f6a442667..ff2b2d58c041a7f8e26d52e8a30535898d799734 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: 1039851.095 units remaining)
+  - location: 16 (remaining gas: 1039850.735 units remaining)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -18,7 +18,7 @@ trace
                   "2019-09-09T08:35:33Z"
                   "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             Unit) ]
-  - location: 16 (remaining gas: 1039851.085 units remaining)
+  - location: 16 (remaining gas: 1039850.725 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -28,7 +28,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 17 (remaining gas: 1039851.075 units remaining)
+  - location: 17 (remaining gas: 1039850.715 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -47,7 +47,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 18 (remaining gas: 1039851.065 units remaining)
+  - location: 18 (remaining gas: 1039850.705 units remaining)
     [ -1
       (Pair -1
             1
@@ -58,7 +58,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039851.065 units remaining)
+  - location: 19 (remaining gas: 1039850.705 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -68,7 +68,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 21 (remaining gas: 1039851.055 units remaining)
+  - location: 21 (remaining gas: 1039850.695 units remaining)
     [ -1
       (Pair 1
             "foobar"
@@ -78,7 +78,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039851.035 units remaining)
+  - location: 19 (remaining gas: 1039850.675 units remaining)
     [ -1
       -1
       (Pair 1
@@ -89,7 +89,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 22 (remaining gas: 1039850.808 units remaining)
+  - location: 22 (remaining gas: 1039850.448 units remaining)
     [ 0x050041
       -1
       (Pair 1
@@ -100,7 +100,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 23 (remaining gas: 1039850.388 units remaining)
+  - location: 23 (remaining gas: 1039850.028 units remaining)
     [ (Some -1)
       -1
       (Pair 1
@@ -111,7 +111,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039850.388 units remaining)
+  - location: 26 (remaining gas: 1039850.028 units remaining)
     [ -1
       -1
       (Pair 1
@@ -122,7 +122,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039850.378 units remaining)
+  - location: 26 (remaining gas: 1039850.018 units remaining)
     [ -1
       -1
       (Pair 1
@@ -133,7 +133,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 34 (remaining gas: 1039850.343 units remaining)
+  - location: 34 (remaining gas: 1039849.983 units remaining)
     [ 0
       (Pair 1
             "foobar"
@@ -143,7 +143,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 35 (remaining gas: 1039850.333 units remaining)
+  - location: 35 (remaining gas: 1039849.973 units remaining)
     [ True
       (Pair 1
             "foobar"
@@ -153,7 +153,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039850.333 units remaining)
+  - location: 36 (remaining gas: 1039849.973 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -162,7 +162,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039850.323 units remaining)
+  - location: 36 (remaining gas: 1039849.963 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -171,7 +171,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 42 (remaining gas: 1039850.313 units remaining)
+  - location: 42 (remaining gas: 1039849.953 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -188,7 +188,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 43 (remaining gas: 1039850.303 units remaining)
+  - location: 43 (remaining gas: 1039849.943 units remaining)
     [ 1
       (Pair 1
             "foobar"
@@ -198,7 +198,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039850.303 units remaining)
+  - location: 44 (remaining gas: 1039849.943 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -207,7 +207,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 46 (remaining gas: 1039850.293 units remaining)
+  - location: 46 (remaining gas: 1039849.933 units remaining)
     [ 1
       (Pair "foobar"
             0x00aabbcc
@@ -216,7 +216,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039850.273 units remaining)
+  - location: 44 (remaining gas: 1039849.913 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -226,7 +226,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 47 (remaining gas: 1039850.046 units remaining)
+  - location: 47 (remaining gas: 1039849.686 units remaining)
     [ 0x050001
       1
       (Pair "foobar"
@@ -236,7 +236,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 48 (remaining gas: 1039849.626 units remaining)
+  - location: 48 (remaining gas: 1039849.266 units remaining)
     [ (Some 1)
       1
       (Pair "foobar"
@@ -246,7 +246,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039849.626 units remaining)
+  - location: 51 (remaining gas: 1039849.266 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -256,7 +256,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039849.616 units remaining)
+  - location: 51 (remaining gas: 1039849.256 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -266,7 +266,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 59 (remaining gas: 1039849.581 units remaining)
+  - location: 59 (remaining gas: 1039849.221 units remaining)
     [ 0
       (Pair "foobar"
             0x00aabbcc
@@ -275,7 +275,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 60 (remaining gas: 1039849.571 units remaining)
+  - location: 60 (remaining gas: 1039849.211 units remaining)
     [ True
       (Pair "foobar"
             0x00aabbcc
@@ -284,7 +284,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039849.571 units remaining)
+  - location: 61 (remaining gas: 1039849.211 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -292,7 +292,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039849.561 units remaining)
+  - location: 61 (remaining gas: 1039849.201 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -300,7 +300,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 67 (remaining gas: 1039849.551 units remaining)
+  - location: 67 (remaining gas: 1039849.191 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -315,7 +315,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 68 (remaining gas: 1039849.541 units remaining)
+  - location: 68 (remaining gas: 1039849.181 units remaining)
     [ "foobar"
       (Pair "foobar"
             0x00aabbcc
@@ -324,7 +324,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039849.541 units remaining)
+  - location: 69 (remaining gas: 1039849.181 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -332,7 +332,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 71 (remaining gas: 1039849.531 units remaining)
+  - location: 71 (remaining gas: 1039849.171 units remaining)
     [ "foobar"
       (Pair 0x00aabbcc
             1000
@@ -340,7 +340,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039849.511 units remaining)
+  - location: 69 (remaining gas: 1039849.151 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -349,7 +349,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 72 (remaining gas: 1039848.987 units remaining)
+  - location: 72 (remaining gas: 1039848.627 units remaining)
     [ 0x050100000006666f6f626172
       "foobar"
       (Pair 0x00aabbcc
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (remaining gas: 1039848.312 units remaining)
+  - location: 73 (remaining gas: 1039847.952 units remaining)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
@@ -367,7 +367,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039848.312 units remaining)
+  - location: 76 (remaining gas: 1039847.952 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -376,7 +376,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039848.302 units remaining)
+  - location: 76 (remaining gas: 1039847.942 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -385,7 +385,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 84 (remaining gas: 1039848.267 units remaining)
+  - location: 84 (remaining gas: 1039847.907 units remaining)
     [ 0
       (Pair 0x00aabbcc
             1000
@@ -393,7 +393,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 85 (remaining gas: 1039848.257 units remaining)
+  - location: 85 (remaining gas: 1039847.897 units remaining)
     [ True
       (Pair 0x00aabbcc
             1000
@@ -401,21 +401,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039848.257 units remaining)
+  - location: 86 (remaining gas: 1039847.897 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039848.247 units remaining)
+  - location: 86 (remaining gas: 1039847.887 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 92 (remaining gas: 1039848.237 units remaining)
+  - location: 92 (remaining gas: 1039847.877 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
@@ -428,7 +428,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 93 (remaining gas: 1039848.227 units remaining)
+  - location: 93 (remaining gas: 1039847.867 units remaining)
     [ 0x00aabbcc
       (Pair 0x00aabbcc
             1000
@@ -436,21 +436,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039848.227 units remaining)
+  - location: 94 (remaining gas: 1039847.867 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 96 (remaining gas: 1039848.217 units remaining)
+  - location: 96 (remaining gas: 1039847.857 units remaining)
     [ 0x00aabbcc
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039848.197 units remaining)
+  - location: 94 (remaining gas: 1039847.837 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -458,7 +458,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 97 (remaining gas: 1039847.739 units remaining)
+  - location: 97 (remaining gas: 1039847.379 units remaining)
     [ 0x050a0000000400aabbcc
       0x00aabbcc
       (Pair 1000
@@ -466,7 +466,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 98 (remaining gas: 1039847.178 units remaining)
+  - location: 98 (remaining gas: 1039846.818 units remaining)
     [ (Some 0x00aabbcc)
       0x00aabbcc
       (Pair 1000
@@ -474,7 +474,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039847.178 units remaining)
+  - location: 101 (remaining gas: 1039846.818 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -482,7 +482,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039847.168 units remaining)
+  - location: 101 (remaining gas: 1039846.808 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -490,33 +490,33 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 109 (remaining gas: 1039847.133 units remaining)
+  - location: 109 (remaining gas: 1039846.773 units remaining)
     [ 0
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 110 (remaining gas: 1039847.123 units remaining)
+  - location: 110 (remaining gas: 1039846.763 units remaining)
     [ True
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039847.123 units remaining)
+  - location: 111 (remaining gas: 1039846.763 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039847.113 units remaining)
+  - location: 111 (remaining gas: 1039846.753 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 117 (remaining gas: 1039847.103 units remaining)
+  - location: 117 (remaining gas: 1039846.743 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
@@ -527,83 +527,83 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 118 (remaining gas: 1039847.093 units remaining)
+  - location: 118 (remaining gas: 1039846.733 units remaining)
     [ 1000
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039847.093 units remaining)
+  - location: 119 (remaining gas: 1039846.733 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 121 (remaining gas: 1039847.083 units remaining)
+  - location: 121 (remaining gas: 1039846.723 units remaining)
     [ 1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039847.063 units remaining)
+  - location: 119 (remaining gas: 1039846.703 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 122 (remaining gas: 1039846.803 units remaining)
+  - location: 122 (remaining gas: 1039846.443 units remaining)
     [ 0x0500a80f
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 123 (remaining gas: 1039846.363 units remaining)
+  - location: 123 (remaining gas: 1039846.003 units remaining)
     [ (Some 1000)
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039846.363 units remaining)
+  - location: 126 (remaining gas: 1039846.003 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039846.353 units remaining)
+  - location: 126 (remaining gas: 1039845.993 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 134 (remaining gas: 1039846.318 units remaining)
+  - location: 134 (remaining gas: 1039845.958 units remaining)
     [ 0
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 135 (remaining gas: 1039846.308 units remaining)
+  - location: 135 (remaining gas: 1039845.948 units remaining)
     [ True
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039846.308 units remaining)
+  - location: 136 (remaining gas: 1039845.948 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039846.298 units remaining)
+  - location: 136 (remaining gas: 1039845.938 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 142 (remaining gas: 1039846.288 units remaining)
+  - location: 142 (remaining gas: 1039845.928 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: 1039846.278 units remaining)
+  - location: 143 (remaining gas: 1039845.918 units remaining)
     [ False
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039846.278 units remaining)
+  - location: 144 (remaining gas: 1039845.918 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 146 (remaining gas: 1039846.268 units remaining)
+  - location: 146 (remaining gas: 1039845.908 units remaining)
     [ False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039846.248 units remaining)
+  - location: 144 (remaining gas: 1039845.888 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 147 (remaining gas: 1039846.021 units remaining)
+  - location: 147 (remaining gas: 1039845.661 units remaining)
     [ 0x050303
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 148 (remaining gas: 1039845.601 units remaining)
+  - location: 148 (remaining gas: 1039845.241 units remaining)
     [ (Some False)
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039845.601 units remaining)
+  - location: 151 (remaining gas: 1039845.241 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039845.591 units remaining)
+  - location: 151 (remaining gas: 1039845.231 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 159 (remaining gas: 1039845.556 units remaining)
+  - location: 159 (remaining gas: 1039845.196 units remaining)
     [ 0
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 160 (remaining gas: 1039845.546 units remaining)
+  - location: 160 (remaining gas: 1039845.186 units remaining)
     [ True
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039845.546 units remaining)
+  - location: 161 (remaining gas: 1039845.186 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039845.536 units remaining)
+  - location: 161 (remaining gas: 1039845.176 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 167 (remaining gas: 1039845.526 units remaining)
+  - location: 167 (remaining gas: 1039845.166 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 168 (remaining gas: 1039845.516 units remaining)
+  - location: 168 (remaining gas: 1039845.156 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039845.516 units remaining)
+  - location: 169 (remaining gas: 1039845.156 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 171 (remaining gas: 1039845.506 units remaining)
+  - location: 171 (remaining gas: 1039845.146 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039845.486 units remaining)
+  - location: 169 (remaining gas: 1039845.126 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 172 (remaining gas: 1039844.396 units remaining)
+  - location: 172 (remaining gas: 1039844.036 units remaining)
     [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 173 (remaining gas: 1039843.443 units remaining)
+  - location: 173 (remaining gas: 1039843.083 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039843.443 units remaining)
+  - location: 176 (remaining gas: 1039843.083 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039843.433 units remaining)
+  - location: 176 (remaining gas: 1039843.073 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 184 (remaining gas: 1039843.397 units remaining)
+  - location: 184 (remaining gas: 1039843.037 units remaining)
     [ 0
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 185 (remaining gas: 1039843.387 units remaining)
+  - location: 185 (remaining gas: 1039843.027 units remaining)
     [ True
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039843.387 units remaining)
+  - location: 186 (remaining gas: 1039843.027 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039843.377 units remaining)
+  - location: 186 (remaining gas: 1039843.017 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 192 (remaining gas: 1039843.367 units remaining)
+  - location: 192 (remaining gas: 1039843.007 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 193 (remaining gas: 1039843.357 units remaining)
+  - location: 193 (remaining gas: 1039842.997 units remaining)
     [ "2019-09-09T08:35:33Z"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 194 (remaining gas: 1039843.357 units remaining)
+  - location: 194 (remaining gas: 1039842.997 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 196 (remaining gas: 1039843.347 units remaining)
+  - location: 196 (remaining gas: 1039842.987 units remaining)
     [ "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 194 (remaining gas: 1039843.327 units remaining)
+  - location: 194 (remaining gas: 1039842.967 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 197 (remaining gas: 1039842.968 units remaining)
+  - location: 197 (remaining gas: 1039842.608 units remaining)
     [ 0x050095bbb0d70b
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 198 (remaining gas: 1039842.468 units remaining)
+  - location: 198 (remaining gas: 1039842.108 units remaining)
     [ (Some "2019-09-09T08:35:33Z")
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039842.468 units remaining)
+  - location: 201 (remaining gas: 1039842.108 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039842.458 units remaining)
+  - location: 201 (remaining gas: 1039842.098 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 209 (remaining gas: 1039842.423 units remaining)
+  - location: 209 (remaining gas: 1039842.063 units remaining)
     [ 0
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 210 (remaining gas: 1039842.413 units remaining)
+  - location: 210 (remaining gas: 1039842.053 units remaining)
     [ True
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039842.413 units remaining)
+  - location: 211 (remaining gas: 1039842.053 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039842.403 units remaining)
+  - location: 211 (remaining gas: 1039842.043 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 217 (remaining gas: 1039842.393 units remaining)
+  - location: 217 (remaining gas: 1039842.033 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 218 (remaining gas: 1039841.270 units remaining)
+  - location: 218 (remaining gas: 1039840.910 units remaining)
     [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 219 (remaining gas: 1039840.297 units remaining)
+  - location: 219 (remaining gas: 1039839.937 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039840.297 units remaining)
+  - location: 222 (remaining gas: 1039839.937 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1039840.287 units remaining)
+  - location: 222 (remaining gas: 1039839.927 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 230 (remaining gas: 1039840.251 units remaining)
+  - location: 230 (remaining gas: 1039839.891 units remaining)
     [ 0 ]
-  - location: 231 (remaining gas: 1039840.241 units remaining)
+  - location: 231 (remaining gas: 1039839.881 units remaining)
     [ True ]
-  - location: 232 (remaining gas: 1039840.241 units remaining)
+  - location: 232 (remaining gas: 1039839.881 units remaining)
     [  ]
-  - location: 232 (remaining gas: 1039840.231 units remaining)
+  - location: 232 (remaining gas: 1039839.871 units remaining)
     [  ]
-  - location: 238 (remaining gas: 1039840.221 units remaining)
+  - location: 238 (remaining gas: 1039839.861 units remaining)
     [ 0 ]
-  - location: 241 (remaining gas: 1039839.994 units remaining)
+  - location: 241 (remaining gas: 1039839.634 units remaining)
     [ 0x050000 ]
-  - location: 242 (remaining gas: 1039839.574 units remaining)
+  - location: 242 (remaining gas: 1039839.214 units remaining)
     [ (Some 0) ]
-  - location: 245 (remaining gas: 1039839.574 units remaining)
+  - location: 245 (remaining gas: 1039839.214 units remaining)
     [ 0 ]
-  - location: 245 (remaining gas: 1039839.564 units remaining)
+  - location: 245 (remaining gas: 1039839.204 units remaining)
     [ 0 ]
-  - location: 251 (remaining gas: 1039839.554 units remaining)
+  - location: 251 (remaining gas: 1039839.194 units remaining)
     [  ]
-  - location: 252 (remaining gas: 1039839.544 units remaining)
+  - location: 252 (remaining gas: 1039839.184 units remaining)
     [ -1 ]
-  - location: 255 (remaining gas: 1039839.317 units remaining)
+  - location: 255 (remaining gas: 1039838.957 units remaining)
     [ 0x050041 ]
-  - location: 256 (remaining gas: 1039742.997 units remaining)
+  - location: 256 (remaining gas: 1039742.637 units remaining)
     [ None ]
-  - location: 259 (remaining gas: 1039742.997 units remaining)
+  - location: 259 (remaining gas: 1039742.637 units remaining)
     [  ]
-  - location: 259 (remaining gas: 1039742.987 units remaining)
+  - location: 259 (remaining gas: 1039742.627 units remaining)
     [  ]
-  - location: 265 (remaining gas: 1039742.977 units remaining)
+  - location: 265 (remaining gas: 1039742.617 units remaining)
     [ 0x ]
-  - location: 268 (remaining gas: 1039742.717 units remaining)
+  - location: 268 (remaining gas: 1039742.357 units remaining)
     [ None ]
-  - location: 271 (remaining gas: 1039742.717 units remaining)
+  - location: 271 (remaining gas: 1039742.357 units remaining)
     [  ]
-  - location: 271 (remaining gas: 1039742.707 units remaining)
+  - location: 271 (remaining gas: 1039742.347 units remaining)
     [  ]
-  - location: 277 (remaining gas: 1039742.697 units remaining)
+  - location: 277 (remaining gas: 1039742.337 units remaining)
     [ 0x04 ]
-  - location: 280 (remaining gas: 1039742.417 units remaining)
+  - location: 280 (remaining gas: 1039742.057 units remaining)
     [ None ]
-  - location: 283 (remaining gas: 1039742.417 units remaining)
+  - location: 283 (remaining gas: 1039742.057 units remaining)
     [  ]
-  - location: 283 (remaining gas: 1039742.407 units remaining)
+  - location: 283 (remaining gas: 1039742.047 units remaining)
     [  ]
-  - location: 289 (remaining gas: 1039742.397 units remaining)
+  - location: 289 (remaining gas: 1039742.037 units remaining)
     [ 0x05 ]
-  - location: 292 (remaining gas: 1039742.117 units remaining)
+  - location: 292 (remaining gas: 1039741.757 units remaining)
     [ None ]
-  - location: 295 (remaining gas: 1039742.117 units remaining)
+  - location: 295 (remaining gas: 1039741.757 units remaining)
     [  ]
-  - location: 295 (remaining gas: 1039742.107 units remaining)
+  - location: 295 (remaining gas: 1039741.747 units remaining)
     [  ]
-  - location: 301 (remaining gas: 1039742.097 units remaining)
+  - location: 301 (remaining gas: 1039741.737 units remaining)
     [ Unit ]
-  - location: 302 (remaining gas: 1039742.087 units remaining)
+  - location: 302 (remaining gas: 1039741.727 units remaining)
     [ {}
       Unit ]
-  - location: 304 (remaining gas: 1039742.077 units remaining)
+  - location: 304 (remaining gas: 1039741.717 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out"
index b8077bc521a2d4d6c637e6f0bcfde841e6a90fe7..ebc21d34f9cba5d92b87b46602670af8a386a909 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 28 (remaining gas: 1039497.693 units remaining)
+  - location: 28 (remaining gas: 1039496.433 units remaining)
     [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
                   Unit
                   "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -19,7 +19,7 @@ trace
                   { Elt 0 "foo" ; Elt 1 "bar" }
                   { PACK })
             Unit) ]
-  - location: 28 (remaining gas: 1039497.683 units remaining)
+  - location: 28 (remaining gas: 1039496.423 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -30,7 +30,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 29 (remaining gas: 1039497.673 units remaining)
+  - location: 29 (remaining gas: 1039496.413 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -51,7 +51,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 30 (remaining gas: 1039497.663 units remaining)
+  - location: 30 (remaining gas: 1039496.403 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
@@ -63,7 +63,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 31 (remaining gas: 1039497.663 units remaining)
+  - location: 31 (remaining gas: 1039496.403 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -74,7 +74,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 33 (remaining gas: 1039497.653 units remaining)
+  - location: 33 (remaining gas: 1039496.393 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -85,7 +85,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 31 (remaining gas: 1039497.633 units remaining)
+  - location: 31 (remaining gas: 1039496.373 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -97,7 +97,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 34 (remaining gas: 1039495.761 units remaining)
+  - location: 34 (remaining gas: 1039494.501 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -109,7 +109,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 35 (remaining gas: 1039495.761 units remaining)
+  - location: 35 (remaining gas: 1039494.501 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -120,7 +120,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 37 (remaining gas: 1039493.889 units remaining)
+  - location: 37 (remaining gas: 1039492.629 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -131,7 +131,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 38 (remaining gas: 1039172.745 units remaining)
+  - location: 38 (remaining gas: 1039171.485 units remaining)
     [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav")
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -142,7 +142,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 41 (remaining gas: 1039172.745 units remaining)
+  - location: 41 (remaining gas: 1039171.485 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -153,7 +153,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 41 (remaining gas: 1039172.735 units remaining)
+  - location: 41 (remaining gas: 1039171.475 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -164,7 +164,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 47 (remaining gas: 1039170.863 units remaining)
+  - location: 47 (remaining gas: 1039169.603 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -175,7 +175,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 35 (remaining gas: 1039170.843 units remaining)
+  - location: 35 (remaining gas: 1039169.583 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
@@ -187,7 +187,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 50 (remaining gas: 1039170.808 units remaining)
+  - location: 50 (remaining gas: 1039169.548 units remaining)
     [ 0
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -198,7 +198,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 51 (remaining gas: 1039170.798 units remaining)
+  - location: 51 (remaining gas: 1039169.538 units remaining)
     [ True
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -209,7 +209,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 52 (remaining gas: 1039170.798 units remaining)
+  - location: 52 (remaining gas: 1039169.538 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -219,7 +219,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 52 (remaining gas: 1039170.788 units remaining)
+  - location: 52 (remaining gas: 1039169.528 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -229,7 +229,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 58 (remaining gas: 1039170.778 units remaining)
+  - location: 58 (remaining gas: 1039169.518 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -248,7 +248,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 59 (remaining gas: 1039170.768 units remaining)
+  - location: 59 (remaining gas: 1039169.508 units remaining)
     [ Unit
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -259,7 +259,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 60 (remaining gas: 1039170.768 units remaining)
+  - location: 60 (remaining gas: 1039169.508 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -269,7 +269,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 62 (remaining gas: 1039170.758 units remaining)
+  - location: 62 (remaining gas: 1039169.498 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -279,7 +279,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 60 (remaining gas: 1039170.738 units remaining)
+  - location: 60 (remaining gas: 1039169.478 units remaining)
     [ Unit
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -290,7 +290,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 63 (remaining gas: 1039170.511 units remaining)
+  - location: 63 (remaining gas: 1039169.251 units remaining)
     [ 0x05030b
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -301,7 +301,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 64 (remaining gas: 1039170.511 units remaining)
+  - location: 64 (remaining gas: 1039169.251 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -311,7 +311,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 66 (remaining gas: 1039170.284 units remaining)
+  - location: 66 (remaining gas: 1039169.024 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -321,7 +321,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 67 (remaining gas: 1039169.864 units remaining)
+  - location: 67 (remaining gas: 1039168.604 units remaining)
     [ (Some Unit)
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -331,7 +331,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 70 (remaining gas: 1039169.864 units remaining)
+  - location: 70 (remaining gas: 1039168.604 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -341,7 +341,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 70 (remaining gas: 1039169.854 units remaining)
+  - location: 70 (remaining gas: 1039168.594 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -351,7 +351,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 76 (remaining gas: 1039169.627 units remaining)
+  - location: 76 (remaining gas: 1039168.367 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -361,7 +361,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 64 (remaining gas: 1039169.607 units remaining)
+  - location: 64 (remaining gas: 1039168.347 units remaining)
     [ 0x05030b
       0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -372,7 +372,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 79 (remaining gas: 1039169.572 units remaining)
+  - location: 79 (remaining gas: 1039168.312 units remaining)
     [ 0
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -382,7 +382,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 80 (remaining gas: 1039169.562 units remaining)
+  - location: 80 (remaining gas: 1039168.302 units remaining)
     [ True
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -392,7 +392,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 81 (remaining gas: 1039169.562 units remaining)
+  - location: 81 (remaining gas: 1039168.302 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -401,7 +401,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 81 (remaining gas: 1039169.552 units remaining)
+  - location: 81 (remaining gas: 1039168.292 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -410,7 +410,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 87 (remaining gas: 1039169.542 units remaining)
+  - location: 87 (remaining gas: 1039168.282 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -427,7 +427,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 88 (remaining gas: 1039169.532 units remaining)
+  - location: 88 (remaining gas: 1039168.272 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -437,7 +437,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 89 (remaining gas: 1039169.532 units remaining)
+  - location: 89 (remaining gas: 1039168.272 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -446,7 +446,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 91 (remaining gas: 1039169.522 units remaining)
+  - location: 91 (remaining gas: 1039168.262 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -455,7 +455,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 89 (remaining gas: 1039169.502 units remaining)
+  - location: 89 (remaining gas: 1039168.242 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -465,7 +465,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 92 (remaining gas: 1039167.015 units remaining)
+  - location: 92 (remaining gas: 1039165.755 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -475,7 +475,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 93 (remaining gas: 1039167.015 units remaining)
+  - location: 93 (remaining gas: 1039165.755 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -484,7 +484,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 95 (remaining gas: 1039164.528 units remaining)
+  - location: 95 (remaining gas: 1039163.268 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -493,7 +493,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 96 (remaining gas: 1039162.725 units remaining)
+  - location: 96 (remaining gas: 1039161.465 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -502,7 +502,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 99 (remaining gas: 1039162.725 units remaining)
+  - location: 99 (remaining gas: 1039161.465 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -511,7 +511,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 99 (remaining gas: 1039162.715 units remaining)
+  - location: 99 (remaining gas: 1039161.455 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -520,7 +520,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 105 (remaining gas: 1039160.228 units remaining)
+  - location: 105 (remaining gas: 1039158.968 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -529,7 +529,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 93 (remaining gas: 1039160.208 units remaining)
+  - location: 93 (remaining gas: 1039158.948 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -539,7 +539,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 108 (remaining gas: 1039160.172 units remaining)
+  - location: 108 (remaining gas: 1039158.912 units remaining)
     [ 0
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -548,7 +548,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 109 (remaining gas: 1039160.162 units remaining)
+  - location: 109 (remaining gas: 1039158.902 units remaining)
     [ True
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -557,7 +557,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 110 (remaining gas: 1039160.162 units remaining)
+  - location: 110 (remaining gas: 1039158.902 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -565,7 +565,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 110 (remaining gas: 1039160.152 units remaining)
+  - location: 110 (remaining gas: 1039158.892 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -573,7 +573,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 116 (remaining gas: 1039160.142 units remaining)
+  - location: 116 (remaining gas: 1039158.882 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -588,7 +588,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 117 (remaining gas: 1039160.132 units remaining)
+  - location: 117 (remaining gas: 1039158.872 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -597,7 +597,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 118 (remaining gas: 1039160.132 units remaining)
+  - location: 118 (remaining gas: 1039158.872 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -605,7 +605,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 120 (remaining gas: 1039160.122 units remaining)
+  - location: 120 (remaining gas: 1039158.862 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
             { True }
@@ -613,7 +613,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 118 (remaining gas: 1039160.102 units remaining)
+  - location: 118 (remaining gas: 1039158.842 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
@@ -622,7 +622,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 121 (remaining gas: 1039157.453 units remaining)
+  - location: 121 (remaining gas: 1039156.193 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
@@ -631,7 +631,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 122 (remaining gas: 1039157.453 units remaining)
+  - location: 122 (remaining gas: 1039156.193 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
             { True }
@@ -639,7 +639,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 124 (remaining gas: 1039154.804 units remaining)
+  - location: 124 (remaining gas: 1039153.544 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair { Unit }
             { True }
@@ -647,7 +647,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 125 (remaining gas: 1039152.860 units remaining)
+  - location: 125 (remaining gas: 1039151.600 units remaining)
     [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"))
       (Pair { Unit }
             { True }
@@ -655,7 +655,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 129 (remaining gas: 1039152.860 units remaining)
+  - location: 129 (remaining gas: 1039151.600 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair { Unit }
             { True }
@@ -663,7 +663,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 129 (remaining gas: 1039152.850 units remaining)
+  - location: 129 (remaining gas: 1039151.590 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair { Unit }
             { True }
@@ -671,7 +671,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 135 (remaining gas: 1039150.201 units remaining)
+  - location: 135 (remaining gas: 1039148.941 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair { Unit }
             { True }
@@ -679,7 +679,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 122 (remaining gas: 1039150.181 units remaining)
+  - location: 122 (remaining gas: 1039148.921 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair { Unit }
@@ -688,7 +688,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 138 (remaining gas: 1039150.145 units remaining)
+  - location: 138 (remaining gas: 1039148.885 units remaining)
     [ 0
       (Pair { Unit }
             { True }
@@ -696,7 +696,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 139 (remaining gas: 1039150.135 units remaining)
+  - location: 139 (remaining gas: 1039148.875 units remaining)
     [ True
       (Pair { Unit }
             { True }
@@ -704,21 +704,21 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 140 (remaining gas: 1039150.135 units remaining)
+  - location: 140 (remaining gas: 1039148.875 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 140 (remaining gas: 1039150.125 units remaining)
+  - location: 140 (remaining gas: 1039148.865 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 146 (remaining gas: 1039150.115 units remaining)
+  - location: 146 (remaining gas: 1039148.855 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
@@ -731,7 +731,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 147 (remaining gas: 1039150.105 units remaining)
+  - location: 147 (remaining gas: 1039148.845 units remaining)
     [ { Unit }
       (Pair { Unit }
             { True }
@@ -739,21 +739,21 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 148 (remaining gas: 1039150.105 units remaining)
+  - location: 148 (remaining gas: 1039148.845 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 150 (remaining gas: 1039150.095 units remaining)
+  - location: 150 (remaining gas: 1039148.835 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 148 (remaining gas: 1039150.075 units remaining)
+  - location: 148 (remaining gas: 1039148.815 units remaining)
     [ { Unit }
       { Unit }
       (Pair { True }
@@ -761,7 +761,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 151 (remaining gas: 1039149.587 units remaining)
+  - location: 151 (remaining gas: 1039148.327 units remaining)
     [ 0x050200000002030b
       { Unit }
       (Pair { True }
@@ -769,49 +769,49 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 152 (remaining gas: 1039149.587 units remaining)
+  - location: 152 (remaining gas: 1039148.327 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 154 (remaining gas: 1039149.099 units remaining)
+  - location: 154 (remaining gas: 1039147.839 units remaining)
     [ 0x050200000002030b
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 155 (remaining gas: 1039148.478 units remaining)
+  - location: 155 (remaining gas: 1039147.218 units remaining)
     [ (Some { Unit })
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 159 (remaining gas: 1039148.478 units remaining)
+  - location: 159 (remaining gas: 1039147.218 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 159 (remaining gas: 1039148.468 units remaining)
+  - location: 159 (remaining gas: 1039147.208 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 165 (remaining gas: 1039147.980 units remaining)
+  - location: 165 (remaining gas: 1039146.720 units remaining)
     [ 0x050200000002030b
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 152 (remaining gas: 1039147.960 units remaining)
+  - location: 152 (remaining gas: 1039146.700 units remaining)
     [ 0x050200000002030b
       0x050200000002030b
       (Pair { True }
@@ -819,33 +819,33 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 168 (remaining gas: 1039147.925 units remaining)
+  - location: 168 (remaining gas: 1039146.665 units remaining)
     [ 0
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 169 (remaining gas: 1039147.915 units remaining)
+  - location: 169 (remaining gas: 1039146.655 units remaining)
     [ True
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 170 (remaining gas: 1039147.915 units remaining)
+  - location: 170 (remaining gas: 1039146.655 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 170 (remaining gas: 1039147.905 units remaining)
+  - location: 170 (remaining gas: 1039146.645 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 176 (remaining gas: 1039147.895 units remaining)
+  - location: 176 (remaining gas: 1039146.635 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
@@ -856,105 +856,105 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 177 (remaining gas: 1039147.885 units remaining)
+  - location: 177 (remaining gas: 1039146.625 units remaining)
     [ { True }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 178 (remaining gas: 1039147.885 units remaining)
+  - location: 178 (remaining gas: 1039146.625 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 180 (remaining gas: 1039147.875 units remaining)
+  - location: 180 (remaining gas: 1039146.615 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 178 (remaining gas: 1039147.855 units remaining)
+  - location: 178 (remaining gas: 1039146.595 units remaining)
     [ { True }
       { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 181 (remaining gas: 1039147.367 units remaining)
+  - location: 181 (remaining gas: 1039146.107 units remaining)
     [ 0x050200000002030a
       { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 182 (remaining gas: 1039147.367 units remaining)
+  - location: 182 (remaining gas: 1039146.107 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 184 (remaining gas: 1039146.879 units remaining)
+  - location: 184 (remaining gas: 1039145.619 units remaining)
     [ 0x050200000002030a
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 185 (remaining gas: 1039146.126 units remaining)
+  - location: 185 (remaining gas: 1039144.866 units remaining)
     [ (Some { True })
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 189 (remaining gas: 1039146.126 units remaining)
+  - location: 189 (remaining gas: 1039144.866 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 189 (remaining gas: 1039146.116 units remaining)
+  - location: 189 (remaining gas: 1039144.856 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 195 (remaining gas: 1039145.628 units remaining)
+  - location: 195 (remaining gas: 1039144.368 units remaining)
     [ 0x050200000002030a
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 182 (remaining gas: 1039145.608 units remaining)
+  - location: 182 (remaining gas: 1039144.348 units remaining)
     [ 0x050200000002030a
       0x050200000002030a
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 198 (remaining gas: 1039145.573 units remaining)
+  - location: 198 (remaining gas: 1039144.313 units remaining)
     [ 0
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 199 (remaining gas: 1039145.563 units remaining)
+  - location: 199 (remaining gas: 1039144.303 units remaining)
     [ True
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 200 (remaining gas: 1039145.563 units remaining)
+  - location: 200 (remaining gas: 1039144.303 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 200 (remaining gas: 1039145.553 units remaining)
+  - location: 200 (remaining gas: 1039144.293 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 206 (remaining gas: 1039145.543 units remaining)
+  - location: 206 (remaining gas: 1039144.283 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
@@ -963,232 +963,232 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 207 (remaining gas: 1039145.533 units remaining)
+  - location: 207 (remaining gas: 1039144.273 units remaining)
     [ (Pair 19 10)
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 208 (remaining gas: 1039145.533 units remaining)
+  - location: 208 (remaining gas: 1039144.273 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 210 (remaining gas: 1039145.523 units remaining)
+  - location: 210 (remaining gas: 1039144.263 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 208 (remaining gas: 1039145.503 units remaining)
+  - location: 208 (remaining gas: 1039144.243 units remaining)
     [ (Pair 19 10)
       (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 211 (remaining gas: 1039144.952 units remaining)
+  - location: 211 (remaining gas: 1039143.692 units remaining)
     [ 0x0507070013000a
       (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 212 (remaining gas: 1039144.952 units remaining)
+  - location: 212 (remaining gas: 1039143.692 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 214 (remaining gas: 1039144.401 units remaining)
+  - location: 214 (remaining gas: 1039143.141 units remaining)
     [ 0x0507070013000a
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 215 (remaining gas: 1039143.701 units remaining)
+  - location: 215 (remaining gas: 1039142.441 units remaining)
     [ (Some (Pair 19 10))
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 220 (remaining gas: 1039143.701 units remaining)
+  - location: 220 (remaining gas: 1039142.441 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 220 (remaining gas: 1039143.691 units remaining)
+  - location: 220 (remaining gas: 1039142.431 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 226 (remaining gas: 1039143.140 units remaining)
+  - location: 226 (remaining gas: 1039141.880 units remaining)
     [ 0x0507070013000a
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 212 (remaining gas: 1039143.120 units remaining)
+  - location: 212 (remaining gas: 1039141.860 units remaining)
     [ 0x0507070013000a
       0x0507070013000a
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 229 (remaining gas: 1039143.085 units remaining)
+  - location: 229 (remaining gas: 1039141.825 units remaining)
     [ 0
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 230 (remaining gas: 1039143.075 units remaining)
+  - location: 230 (remaining gas: 1039141.815 units remaining)
     [ True
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 231 (remaining gas: 1039143.075 units remaining)
+  - location: 231 (remaining gas: 1039141.815 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 231 (remaining gas: 1039143.065 units remaining)
+  - location: 231 (remaining gas: 1039141.805 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 237 (remaining gas: 1039143.055 units remaining)
+  - location: 237 (remaining gas: 1039141.795 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK })
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 238 (remaining gas: 1039143.045 units remaining)
+  - location: 238 (remaining gas: 1039141.785 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 239 (remaining gas: 1039143.045 units remaining)
+  - location: 239 (remaining gas: 1039141.785 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 241 (remaining gas: 1039143.035 units remaining)
+  - location: 241 (remaining gas: 1039141.775 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 239 (remaining gas: 1039143.015 units remaining)
+  - location: 239 (remaining gas: 1039141.755 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 242 (remaining gas: 1039141.763 units remaining)
+  - location: 242 (remaining gas: 1039140.503 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 243 (remaining gas: 1039141.763 units remaining)
+  - location: 243 (remaining gas: 1039140.503 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 245 (remaining gas: 1039140.511 units remaining)
+  - location: 245 (remaining gas: 1039139.251 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 246 (remaining gas: 1039139.418 units remaining)
+  - location: 246 (remaining gas: 1039138.158 units remaining)
     [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"))
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 251 (remaining gas: 1039139.418 units remaining)
+  - location: 251 (remaining gas: 1039138.158 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 251 (remaining gas: 1039139.408 units remaining)
+  - location: 251 (remaining gas: 1039138.148 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 257 (remaining gas: 1039138.156 units remaining)
+  - location: 257 (remaining gas: 1039136.896 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 243 (remaining gas: 1039138.136 units remaining)
+  - location: 243 (remaining gas: 1039136.876 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 260 (remaining gas: 1039138.101 units remaining)
+  - location: 260 (remaining gas: 1039136.841 units remaining)
     [ 0
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 261 (remaining gas: 1039138.091 units remaining)
+  - location: 261 (remaining gas: 1039136.831 units remaining)
     [ True
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 262 (remaining gas: 1039138.091 units remaining)
+  - location: 262 (remaining gas: 1039136.831 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 262 (remaining gas: 1039138.081 units remaining)
+  - location: 262 (remaining gas: 1039136.821 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 268 (remaining gas: 1039138.071 units remaining)
+  - location: 268 (remaining gas: 1039136.811 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK })
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 269 (remaining gas: 1039138.061 units remaining)
+  - location: 269 (remaining gas: 1039136.801 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 270 (remaining gas: 1039138.061 units remaining)
+  - location: 270 (remaining gas: 1039136.801 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 272 (remaining gas: 1039138.051 units remaining)
+  - location: 272 (remaining gas: 1039136.791 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 270 (remaining gas: 1039138.031 units remaining)
+  - location: 270 (remaining gas: 1039136.771 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 273 (remaining gas: 1039136.426 units remaining)
+  - location: 273 (remaining gas: 1039135.166 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 274 (remaining gas: 1039136.426 units remaining)
+  - location: 274 (remaining gas: 1039135.166 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 276 (remaining gas: 1039134.821 units remaining)
+  - location: 276 (remaining gas: 1039133.561 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       { PACK } ]
-  - location: 277 (remaining gas: 1039133.175 units remaining)
+  - location: 277 (remaining gas: 1039131.915 units remaining)
     [ (Some { Elt 0 "foo" ; Elt 1 "bar" })
       { PACK } ]
-  - location: 282 (remaining gas: 1039133.175 units remaining)
+  - location: 282 (remaining gas: 1039131.915 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 282 (remaining gas: 1039133.165 units remaining)
+  - location: 282 (remaining gas: 1039131.905 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 288 (remaining gas: 1039131.560 units remaining)
+  - location: 288 (remaining gas: 1039130.300 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       { PACK } ]
-  - location: 274 (remaining gas: 1039131.540 units remaining)
+  - location: 274 (remaining gas: 1039130.280 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       0x050200000018070400000100000003666f6f070400010100000003626172
       { PACK } ]
-  - location: 291 (remaining gas: 1039131.505 units remaining)
+  - location: 291 (remaining gas: 1039130.245 units remaining)
     [ 0
       { PACK } ]
-  - location: 292 (remaining gas: 1039131.495 units remaining)
+  - location: 292 (remaining gas: 1039130.235 units remaining)
     [ True
       { PACK } ]
-  - location: 293 (remaining gas: 1039131.495 units remaining)
+  - location: 293 (remaining gas: 1039130.235 units remaining)
     [ { PACK } ]
-  - location: 293 (remaining gas: 1039131.485 units remaining)
+  - location: 293 (remaining gas: 1039130.225 units remaining)
     [ { PACK } ]
-  - location: 299 (remaining gas: 1039131.475 units remaining)
+  - location: 299 (remaining gas: 1039130.215 units remaining)
     [ { PACK }
       { PACK } ]
-  - location: 300 (remaining gas: 1039130.802 units remaining)
+  - location: 300 (remaining gas: 1039129.542 units remaining)
     [ 0x050200000002030c
       { PACK } ]
-  - location: 301 (remaining gas: 1039130.802 units remaining)
+  - location: 301 (remaining gas: 1039129.542 units remaining)
     [ { PACK } ]
-  - location: 303 (remaining gas: 1039130.129 units remaining)
+  - location: 303 (remaining gas: 1039128.869 units remaining)
     [ 0x050200000002030c ]
-  - location: 304 (remaining gas: 1039129.108 units remaining)
+  - location: 304 (remaining gas: 1039127.848 units remaining)
     [ (Some { PACK }) ]
-  - location: 309 (remaining gas: 1039129.108 units remaining)
+  - location: 309 (remaining gas: 1039127.848 units remaining)
     [ { PACK } ]
-  - location: 309 (remaining gas: 1039129.098 units remaining)
+  - location: 309 (remaining gas: 1039127.838 units remaining)
     [ { PACK } ]
-  - location: 315 (remaining gas: 1039128.425 units remaining)
+  - location: 315 (remaining gas: 1039127.165 units remaining)
     [ 0x050200000002030c ]
-  - location: 301 (remaining gas: 1039128.405 units remaining)
+  - location: 301 (remaining gas: 1039127.145 units remaining)
     [ 0x050200000002030c
       0x050200000002030c ]
-  - location: 318 (remaining gas: 1039128.370 units remaining)
+  - location: 318 (remaining gas: 1039127.110 units remaining)
     [ 0 ]
-  - location: 319 (remaining gas: 1039128.360 units remaining)
+  - location: 319 (remaining gas: 1039127.100 units remaining)
     [ True ]
-  - location: 320 (remaining gas: 1039128.360 units remaining)
+  - location: 320 (remaining gas: 1039127.100 units remaining)
     [  ]
-  - location: 320 (remaining gas: 1039128.350 units remaining)
+  - location: 320 (remaining gas: 1039127.090 units remaining)
     [  ]
-  - location: 326 (remaining gas: 1039128.340 units remaining)
+  - location: 326 (remaining gas: 1039127.080 units remaining)
     [ Unit ]
-  - location: 327 (remaining gas: 1039128.330 units remaining)
+  - location: 327 (remaining gas: 1039127.070 units remaining)
     [ {}
       Unit ]
-  - location: 329 (remaining gas: 1039128.320 units remaining)
+  - location: 329 (remaining gas: 1039127.060 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out"
index 7bcd2fc8332c9f3fdd7cb96fbf134c5b3e516bcd..3a9269ac40e212748c2c35ccfa498524af77d1af 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 28 (remaining gas: 1039506.698 units remaining)
+  - location: 28 (remaining gas: 1039505.438 units remaining)
     [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
                   Unit
                   "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -19,7 +19,7 @@ trace
                   {}
                   { DUP ; DROP ; PACK })
             Unit) ]
-  - location: 28 (remaining gas: 1039506.688 units remaining)
+  - location: 28 (remaining gas: 1039505.428 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -30,7 +30,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 29 (remaining gas: 1039506.678 units remaining)
+  - location: 29 (remaining gas: 1039505.418 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -51,7 +51,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 30 (remaining gas: 1039506.668 units remaining)
+  - location: 30 (remaining gas: 1039505.408 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
@@ -63,7 +63,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 31 (remaining gas: 1039506.668 units remaining)
+  - location: 31 (remaining gas: 1039505.408 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -74,7 +74,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 33 (remaining gas: 1039506.658 units remaining)
+  - location: 33 (remaining gas: 1039505.398 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -85,7 +85,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 31 (remaining gas: 1039506.638 units remaining)
+  - location: 31 (remaining gas: 1039505.378 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -97,7 +97,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 34 (remaining gas: 1039504.766 units remaining)
+  - location: 34 (remaining gas: 1039503.506 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -109,7 +109,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 35 (remaining gas: 1039504.766 units remaining)
+  - location: 35 (remaining gas: 1039503.506 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -120,7 +120,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 37 (remaining gas: 1039502.894 units remaining)
+  - location: 37 (remaining gas: 1039501.634 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -131,7 +131,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 38 (remaining gas: 1039181.750 units remaining)
+  - location: 38 (remaining gas: 1039180.490 units remaining)
     [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav")
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -142,7 +142,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 41 (remaining gas: 1039181.750 units remaining)
+  - location: 41 (remaining gas: 1039180.490 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -153,7 +153,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 41 (remaining gas: 1039181.740 units remaining)
+  - location: 41 (remaining gas: 1039180.480 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -164,7 +164,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 47 (remaining gas: 1039179.868 units remaining)
+  - location: 47 (remaining gas: 1039178.608 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -175,7 +175,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 35 (remaining gas: 1039179.848 units remaining)
+  - location: 35 (remaining gas: 1039178.588 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
@@ -187,7 +187,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 50 (remaining gas: 1039179.813 units remaining)
+  - location: 50 (remaining gas: 1039178.553 units remaining)
     [ 0
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -198,7 +198,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 51 (remaining gas: 1039179.803 units remaining)
+  - location: 51 (remaining gas: 1039178.543 units remaining)
     [ True
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -209,7 +209,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 52 (remaining gas: 1039179.803 units remaining)
+  - location: 52 (remaining gas: 1039178.543 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -219,7 +219,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 52 (remaining gas: 1039179.793 units remaining)
+  - location: 52 (remaining gas: 1039178.533 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -229,7 +229,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 58 (remaining gas: 1039179.783 units remaining)
+  - location: 58 (remaining gas: 1039178.523 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -248,7 +248,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 59 (remaining gas: 1039179.773 units remaining)
+  - location: 59 (remaining gas: 1039178.513 units remaining)
     [ Unit
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -259,7 +259,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 60 (remaining gas: 1039179.773 units remaining)
+  - location: 60 (remaining gas: 1039178.513 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -269,7 +269,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 62 (remaining gas: 1039179.763 units remaining)
+  - location: 62 (remaining gas: 1039178.503 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -279,7 +279,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 60 (remaining gas: 1039179.743 units remaining)
+  - location: 60 (remaining gas: 1039178.483 units remaining)
     [ Unit
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -290,7 +290,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 63 (remaining gas: 1039179.516 units remaining)
+  - location: 63 (remaining gas: 1039178.256 units remaining)
     [ 0x05030b
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -301,7 +301,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 64 (remaining gas: 1039179.516 units remaining)
+  - location: 64 (remaining gas: 1039178.256 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -311,7 +311,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 66 (remaining gas: 1039179.289 units remaining)
+  - location: 66 (remaining gas: 1039178.029 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -321,7 +321,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 67 (remaining gas: 1039178.869 units remaining)
+  - location: 67 (remaining gas: 1039177.609 units remaining)
     [ (Some Unit)
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -331,7 +331,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 70 (remaining gas: 1039178.869 units remaining)
+  - location: 70 (remaining gas: 1039177.609 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -341,7 +341,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 70 (remaining gas: 1039178.859 units remaining)
+  - location: 70 (remaining gas: 1039177.599 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -351,7 +351,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 76 (remaining gas: 1039178.632 units remaining)
+  - location: 76 (remaining gas: 1039177.372 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -361,7 +361,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 64 (remaining gas: 1039178.612 units remaining)
+  - location: 64 (remaining gas: 1039177.352 units remaining)
     [ 0x05030b
       0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -372,7 +372,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 79 (remaining gas: 1039178.577 units remaining)
+  - location: 79 (remaining gas: 1039177.317 units remaining)
     [ 0
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -382,7 +382,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 80 (remaining gas: 1039178.567 units remaining)
+  - location: 80 (remaining gas: 1039177.307 units remaining)
     [ True
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -392,7 +392,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 81 (remaining gas: 1039178.567 units remaining)
+  - location: 81 (remaining gas: 1039177.307 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -401,7 +401,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 81 (remaining gas: 1039178.557 units remaining)
+  - location: 81 (remaining gas: 1039177.297 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -410,7 +410,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 87 (remaining gas: 1039178.547 units remaining)
+  - location: 87 (remaining gas: 1039177.287 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -427,7 +427,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 88 (remaining gas: 1039178.537 units remaining)
+  - location: 88 (remaining gas: 1039177.277 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -437,7 +437,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 89 (remaining gas: 1039178.537 units remaining)
+  - location: 89 (remaining gas: 1039177.277 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -446,7 +446,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 91 (remaining gas: 1039178.527 units remaining)
+  - location: 91 (remaining gas: 1039177.267 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
             {}
@@ -455,7 +455,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 89 (remaining gas: 1039178.507 units remaining)
+  - location: 89 (remaining gas: 1039177.247 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
@@ -465,7 +465,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 92 (remaining gas: 1039176.020 units remaining)
+  - location: 92 (remaining gas: 1039174.760 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
@@ -475,7 +475,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 93 (remaining gas: 1039176.020 units remaining)
+  - location: 93 (remaining gas: 1039174.760 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
             {}
@@ -484,7 +484,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 95 (remaining gas: 1039173.533 units remaining)
+  - location: 95 (remaining gas: 1039172.273 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair None
             {}
@@ -493,7 +493,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 96 (remaining gas: 1039171.730 units remaining)
+  - location: 96 (remaining gas: 1039170.470 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair None
             {}
@@ -502,7 +502,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 99 (remaining gas: 1039171.730 units remaining)
+  - location: 99 (remaining gas: 1039170.470 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair None
             {}
@@ -511,7 +511,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 99 (remaining gas: 1039171.720 units remaining)
+  - location: 99 (remaining gas: 1039170.460 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair None
             {}
@@ -520,7 +520,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 105 (remaining gas: 1039169.233 units remaining)
+  - location: 105 (remaining gas: 1039167.973 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair None
             {}
@@ -529,7 +529,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 93 (remaining gas: 1039169.213 units remaining)
+  - location: 93 (remaining gas: 1039167.953 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair None
@@ -539,7 +539,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 108 (remaining gas: 1039169.177 units remaining)
+  - location: 108 (remaining gas: 1039167.917 units remaining)
     [ 0
       (Pair None
             {}
@@ -548,7 +548,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 109 (remaining gas: 1039169.167 units remaining)
+  - location: 109 (remaining gas: 1039167.907 units remaining)
     [ True
       (Pair None
             {}
@@ -557,7 +557,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 110 (remaining gas: 1039169.167 units remaining)
+  - location: 110 (remaining gas: 1039167.907 units remaining)
     [ (Pair None
             {}
             {}
@@ -565,7 +565,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 110 (remaining gas: 1039169.157 units remaining)
+  - location: 110 (remaining gas: 1039167.897 units remaining)
     [ (Pair None
             {}
             {}
@@ -573,7 +573,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 116 (remaining gas: 1039169.147 units remaining)
+  - location: 116 (remaining gas: 1039167.887 units remaining)
     [ (Pair None
             {}
             {}
@@ -588,7 +588,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 117 (remaining gas: 1039169.137 units remaining)
+  - location: 117 (remaining gas: 1039167.877 units remaining)
     [ None
       (Pair None
             {}
@@ -597,7 +597,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 118 (remaining gas: 1039169.137 units remaining)
+  - location: 118 (remaining gas: 1039167.877 units remaining)
     [ (Pair None
             {}
             {}
@@ -605,7 +605,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 120 (remaining gas: 1039169.127 units remaining)
+  - location: 120 (remaining gas: 1039167.867 units remaining)
     [ None
       (Pair {}
             {}
@@ -613,7 +613,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 118 (remaining gas: 1039169.107 units remaining)
+  - location: 118 (remaining gas: 1039167.847 units remaining)
     [ None
       None
       (Pair {}
@@ -622,7 +622,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 121 (remaining gas: 1039168.880 units remaining)
+  - location: 121 (remaining gas: 1039167.620 units remaining)
     [ 0x050306
       None
       (Pair {}
@@ -631,7 +631,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 122 (remaining gas: 1039168.880 units remaining)
+  - location: 122 (remaining gas: 1039167.620 units remaining)
     [ None
       (Pair {}
             {}
@@ -639,7 +639,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 124 (remaining gas: 1039168.653 units remaining)
+  - location: 124 (remaining gas: 1039167.393 units remaining)
     [ 0x050306
       (Pair {}
             {}
@@ -647,7 +647,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 125 (remaining gas: 1039168.233 units remaining)
+  - location: 125 (remaining gas: 1039166.973 units remaining)
     [ (Some None)
       (Pair {}
             {}
@@ -655,7 +655,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 129 (remaining gas: 1039168.233 units remaining)
+  - location: 129 (remaining gas: 1039166.973 units remaining)
     [ None
       (Pair {}
             {}
@@ -663,7 +663,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 129 (remaining gas: 1039168.223 units remaining)
+  - location: 129 (remaining gas: 1039166.963 units remaining)
     [ None
       (Pair {}
             {}
@@ -671,7 +671,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 135 (remaining gas: 1039167.996 units remaining)
+  - location: 135 (remaining gas: 1039166.736 units remaining)
     [ 0x050306
       (Pair {}
             {}
@@ -679,7 +679,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 122 (remaining gas: 1039167.976 units remaining)
+  - location: 122 (remaining gas: 1039166.716 units remaining)
     [ 0x050306
       0x050306
       (Pair {}
@@ -688,7 +688,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 138 (remaining gas: 1039167.941 units remaining)
+  - location: 138 (remaining gas: 1039166.681 units remaining)
     [ 0
       (Pair {}
             {}
@@ -696,7 +696,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 139 (remaining gas: 1039167.931 units remaining)
+  - location: 139 (remaining gas: 1039166.671 units remaining)
     [ True
       (Pair {}
             {}
@@ -704,21 +704,21 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 140 (remaining gas: 1039167.931 units remaining)
+  - location: 140 (remaining gas: 1039166.671 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 140 (remaining gas: 1039167.921 units remaining)
+  - location: 140 (remaining gas: 1039166.661 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 146 (remaining gas: 1039167.911 units remaining)
+  - location: 146 (remaining gas: 1039166.651 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
@@ -731,7 +731,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 147 (remaining gas: 1039167.901 units remaining)
+  - location: 147 (remaining gas: 1039166.641 units remaining)
     [ {}
       (Pair {}
             {}
@@ -739,294 +739,294 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 148 (remaining gas: 1039167.901 units remaining)
+  - location: 148 (remaining gas: 1039166.641 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 150 (remaining gas: 1039167.891 units remaining)
+  - location: 150 (remaining gas: 1039166.631 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 148 (remaining gas: 1039167.871 units remaining)
+  - location: 148 (remaining gas: 1039166.611 units remaining)
     [ {}
       {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 151 (remaining gas: 1039167.545 units remaining)
+  - location: 151 (remaining gas: 1039166.285 units remaining)
     [ 0x050200000000
       {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 152 (remaining gas: 1039167.545 units remaining)
+  - location: 152 (remaining gas: 1039166.285 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 154 (remaining gas: 1039167.219 units remaining)
+  - location: 154 (remaining gas: 1039165.959 units remaining)
     [ 0x050200000000
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 155 (remaining gas: 1039166.739 units remaining)
+  - location: 155 (remaining gas: 1039165.479 units remaining)
     [ (Some {})
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 159 (remaining gas: 1039166.739 units remaining)
+  - location: 159 (remaining gas: 1039165.479 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 159 (remaining gas: 1039166.729 units remaining)
+  - location: 159 (remaining gas: 1039165.469 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 165 (remaining gas: 1039166.403 units remaining)
+  - location: 165 (remaining gas: 1039165.143 units remaining)
     [ 0x050200000000
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 152 (remaining gas: 1039166.383 units remaining)
+  - location: 152 (remaining gas: 1039165.123 units remaining)
     [ 0x050200000000
       0x050200000000
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 168 (remaining gas: 1039166.348 units remaining)
+  - location: 168 (remaining gas: 1039165.088 units remaining)
     [ 0
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 169 (remaining gas: 1039166.338 units remaining)
+  - location: 169 (remaining gas: 1039165.078 units remaining)
     [ True
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 170 (remaining gas: 1039166.338 units remaining)
+  - location: 170 (remaining gas: 1039165.078 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 170 (remaining gas: 1039166.328 units remaining)
+  - location: 170 (remaining gas: 1039165.068 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 176 (remaining gas: 1039166.318 units remaining)
+  - location: 176 (remaining gas: 1039165.058 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK })
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 177 (remaining gas: 1039166.308 units remaining)
+  - location: 177 (remaining gas: 1039165.048 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 178 (remaining gas: 1039166.308 units remaining)
+  - location: 178 (remaining gas: 1039165.048 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 180 (remaining gas: 1039166.298 units remaining)
+  - location: 180 (remaining gas: 1039165.038 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 178 (remaining gas: 1039166.278 units remaining)
+  - location: 178 (remaining gas: 1039165.018 units remaining)
     [ {}
       {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 181 (remaining gas: 1039165.952 units remaining)
+  - location: 181 (remaining gas: 1039164.692 units remaining)
     [ 0x050200000000
       {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 182 (remaining gas: 1039165.952 units remaining)
+  - location: 182 (remaining gas: 1039164.692 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 184 (remaining gas: 1039165.626 units remaining)
+  - location: 184 (remaining gas: 1039164.366 units remaining)
     [ 0x050200000000
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 185 (remaining gas: 1039165.146 units remaining)
+  - location: 185 (remaining gas: 1039163.886 units remaining)
     [ (Some {})
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 189 (remaining gas: 1039165.146 units remaining)
+  - location: 189 (remaining gas: 1039163.886 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 189 (remaining gas: 1039165.136 units remaining)
+  - location: 189 (remaining gas: 1039163.876 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 195 (remaining gas: 1039164.810 units remaining)
+  - location: 195 (remaining gas: 1039163.550 units remaining)
     [ 0x050200000000
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 182 (remaining gas: 1039164.790 units remaining)
+  - location: 182 (remaining gas: 1039163.530 units remaining)
     [ 0x050200000000
       0x050200000000
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 198 (remaining gas: 1039164.755 units remaining)
+  - location: 198 (remaining gas: 1039163.495 units remaining)
     [ 0
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 199 (remaining gas: 1039164.745 units remaining)
+  - location: 199 (remaining gas: 1039163.485 units remaining)
     [ True
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 200 (remaining gas: 1039164.745 units remaining)
+  - location: 200 (remaining gas: 1039163.485 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 200 (remaining gas: 1039164.735 units remaining)
+  - location: 200 (remaining gas: 1039163.475 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 206 (remaining gas: 1039164.725 units remaining)
+  - location: 206 (remaining gas: 1039163.465 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK })
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 207 (remaining gas: 1039164.715 units remaining)
+  - location: 207 (remaining gas: 1039163.455 units remaining)
     [ (Pair 40 -10)
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 208 (remaining gas: 1039164.715 units remaining)
+  - location: 208 (remaining gas: 1039163.455 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 210 (remaining gas: 1039164.705 units remaining)
+  - location: 210 (remaining gas: 1039163.445 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 208 (remaining gas: 1039164.685 units remaining)
+  - location: 208 (remaining gas: 1039163.425 units remaining)
     [ (Pair 40 -10)
       (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 211 (remaining gas: 1039164.134 units remaining)
+  - location: 211 (remaining gas: 1039162.874 units remaining)
     [ 0x0507070028004a
       (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 212 (remaining gas: 1039164.134 units remaining)
+  - location: 212 (remaining gas: 1039162.874 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 214 (remaining gas: 1039163.583 units remaining)
+  - location: 214 (remaining gas: 1039162.323 units remaining)
     [ 0x0507070028004a
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 215 (remaining gas: 1039162.883 units remaining)
+  - location: 215 (remaining gas: 1039161.623 units remaining)
     [ (Some (Pair 40 -10))
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 220 (remaining gas: 1039162.883 units remaining)
+  - location: 220 (remaining gas: 1039161.623 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 220 (remaining gas: 1039162.873 units remaining)
+  - location: 220 (remaining gas: 1039161.613 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 226 (remaining gas: 1039162.322 units remaining)
+  - location: 226 (remaining gas: 1039161.062 units remaining)
     [ 0x0507070028004a
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 212 (remaining gas: 1039162.302 units remaining)
+  - location: 212 (remaining gas: 1039161.042 units remaining)
     [ 0x0507070028004a
       0x0507070028004a
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 229 (remaining gas: 1039162.267 units remaining)
+  - location: 229 (remaining gas: 1039161.007 units remaining)
     [ 0
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 230 (remaining gas: 1039162.257 units remaining)
+  - location: 230 (remaining gas: 1039160.997 units remaining)
     [ True
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 231 (remaining gas: 1039162.257 units remaining)
+  - location: 231 (remaining gas: 1039160.997 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 231 (remaining gas: 1039162.247 units remaining)
+  - location: 231 (remaining gas: 1039160.987 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 237 (remaining gas: 1039162.237 units remaining)
+  - location: 237 (remaining gas: 1039160.977 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK })
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 238 (remaining gas: 1039162.227 units remaining)
+  - location: 238 (remaining gas: 1039160.967 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 239 (remaining gas: 1039162.227 units remaining)
+  - location: 239 (remaining gas: 1039160.967 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 241 (remaining gas: 1039162.217 units remaining)
+  - location: 241 (remaining gas: 1039160.957 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 239 (remaining gas: 1039162.197 units remaining)
+  - location: 239 (remaining gas: 1039160.937 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 242 (remaining gas: 1039161.676 units remaining)
+  - location: 242 (remaining gas: 1039160.416 units remaining)
     [ 0x0505080095bbb0d70b
       (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 243 (remaining gas: 1039161.676 units remaining)
+  - location: 243 (remaining gas: 1039160.416 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 245 (remaining gas: 1039161.155 units remaining)
+  - location: 245 (remaining gas: 1039159.895 units remaining)
     [ 0x0505080095bbb0d70b
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 246 (remaining gas: 1039160.514 units remaining)
+  - location: 246 (remaining gas: 1039159.254 units remaining)
     [ (Some (Right "2019-09-09T08:35:33Z"))
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 251 (remaining gas: 1039160.514 units remaining)
+  - location: 251 (remaining gas: 1039159.254 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 251 (remaining gas: 1039160.504 units remaining)
+  - location: 251 (remaining gas: 1039159.244 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 257 (remaining gas: 1039159.983 units remaining)
+  - location: 257 (remaining gas: 1039158.723 units remaining)
     [ 0x0505080095bbb0d70b
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 243 (remaining gas: 1039159.963 units remaining)
+  - location: 243 (remaining gas: 1039158.703 units remaining)
     [ 0x0505080095bbb0d70b
       0x0505080095bbb0d70b
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 260 (remaining gas: 1039159.928 units remaining)
+  - location: 260 (remaining gas: 1039158.668 units remaining)
     [ 0
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 261 (remaining gas: 1039159.918 units remaining)
+  - location: 261 (remaining gas: 1039158.658 units remaining)
     [ True
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 262 (remaining gas: 1039159.918 units remaining)
+  - location: 262 (remaining gas: 1039158.658 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 262 (remaining gas: 1039159.908 units remaining)
+  - location: 262 (remaining gas: 1039158.648 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 268 (remaining gas: 1039159.898 units remaining)
+  - location: 268 (remaining gas: 1039158.638 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK })
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 269 (remaining gas: 1039159.888 units remaining)
+  - location: 269 (remaining gas: 1039158.628 units remaining)
     [ {}
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 270 (remaining gas: 1039159.888 units remaining)
+  - location: 270 (remaining gas: 1039158.628 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 272 (remaining gas: 1039159.878 units remaining)
+  - location: 272 (remaining gas: 1039158.618 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 270 (remaining gas: 1039159.858 units remaining)
+  - location: 270 (remaining gas: 1039158.598 units remaining)
     [ {}
       {}
       { DUP ; DROP ; PACK } ]
-  - location: 273 (remaining gas: 1039159.532 units remaining)
+  - location: 273 (remaining gas: 1039158.272 units remaining)
     [ 0x050200000000
       {}
       { DUP ; DROP ; PACK } ]
-  - location: 274 (remaining gas: 1039159.532 units remaining)
+  - location: 274 (remaining gas: 1039158.272 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 276 (remaining gas: 1039159.206 units remaining)
+  - location: 276 (remaining gas: 1039157.946 units remaining)
     [ 0x050200000000
       { DUP ; DROP ; PACK } ]
-  - location: 277 (remaining gas: 1039158.726 units remaining)
+  - location: 277 (remaining gas: 1039157.466 units remaining)
     [ (Some {})
       { DUP ; DROP ; PACK } ]
-  - location: 282 (remaining gas: 1039158.726 units remaining)
+  - location: 282 (remaining gas: 1039157.466 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 282 (remaining gas: 1039158.716 units remaining)
+  - location: 282 (remaining gas: 1039157.456 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 288 (remaining gas: 1039158.390 units remaining)
+  - location: 288 (remaining gas: 1039157.130 units remaining)
     [ 0x050200000000
       { DUP ; DROP ; PACK } ]
-  - location: 274 (remaining gas: 1039158.370 units remaining)
+  - location: 274 (remaining gas: 1039157.110 units remaining)
     [ 0x050200000000
       0x050200000000
       { DUP ; DROP ; PACK } ]
-  - location: 291 (remaining gas: 1039158.335 units remaining)
+  - location: 291 (remaining gas: 1039157.075 units remaining)
     [ 0
       { DUP ; DROP ; PACK } ]
-  - location: 292 (remaining gas: 1039158.325 units remaining)
+  - location: 292 (remaining gas: 1039157.065 units remaining)
     [ True
       { DUP ; DROP ; PACK } ]
-  - location: 293 (remaining gas: 1039158.325 units remaining)
+  - location: 293 (remaining gas: 1039157.065 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 293 (remaining gas: 1039158.315 units remaining)
+  - location: 293 (remaining gas: 1039157.055 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 299 (remaining gas: 1039158.305 units remaining)
+  - location: 299 (remaining gas: 1039157.045 units remaining)
     [ { DUP ; DROP ; PACK }
       { DUP ; DROP ; PACK } ]
-  - location: 300 (remaining gas: 1039157.168 units remaining)
+  - location: 300 (remaining gas: 1039155.908 units remaining)
     [ 0x05020000000603210320030c
       { DUP ; DROP ; PACK } ]
-  - location: 301 (remaining gas: 1039157.168 units remaining)
+  - location: 301 (remaining gas: 1039155.908 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 303 (remaining gas: 1039156.031 units remaining)
+  - location: 303 (remaining gas: 1039154.771 units remaining)
     [ 0x05020000000603210320030c ]
-  - location: 304 (remaining gas: 1039153.950 units remaining)
+  - location: 304 (remaining gas: 1039152.690 units remaining)
     [ (Some { DUP ; DROP ; PACK }) ]
-  - location: 309 (remaining gas: 1039153.950 units remaining)
+  - location: 309 (remaining gas: 1039152.690 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 309 (remaining gas: 1039153.940 units remaining)
+  - location: 309 (remaining gas: 1039152.680 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 315 (remaining gas: 1039152.803 units remaining)
+  - location: 315 (remaining gas: 1039151.543 units remaining)
     [ 0x05020000000603210320030c ]
-  - location: 301 (remaining gas: 1039152.783 units remaining)
+  - location: 301 (remaining gas: 1039151.523 units remaining)
     [ 0x05020000000603210320030c
       0x05020000000603210320030c ]
-  - location: 318 (remaining gas: 1039152.748 units remaining)
+  - location: 318 (remaining gas: 1039151.488 units remaining)
     [ 0 ]
-  - location: 319 (remaining gas: 1039152.738 units remaining)
+  - location: 319 (remaining gas: 1039151.478 units remaining)
     [ True ]
-  - location: 320 (remaining gas: 1039152.738 units remaining)
+  - location: 320 (remaining gas: 1039151.478 units remaining)
     [  ]
-  - location: 320 (remaining gas: 1039152.728 units remaining)
+  - location: 320 (remaining gas: 1039151.468 units remaining)
     [  ]
-  - location: 326 (remaining gas: 1039152.718 units remaining)
+  - location: 326 (remaining gas: 1039151.458 units remaining)
     [ Unit ]
-  - location: 327 (remaining gas: 1039152.708 units remaining)
+  - location: 327 (remaining gas: 1039151.448 units remaining)
     [ {}
       Unit ]
-  - location: 329 (remaining gas: 1039152.698 units remaining)
+  - location: 329 (remaining gas: 1039151.438 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out
index f43cd33bd8d2c003cbc1f74edb2fcaa50935c1b1..bd0278b8d8942eee2f431db8dae101fc8228c8d8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out
@@ -7,41 +7,41 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039990.844 units remaining)
+  - location: 7 (remaining gas: 1039990.799 units remaining)
     [ (Pair 38 14) ]
-  - location: 7 (remaining gas: 1039990.834 units remaining)
+  - location: 7 (remaining gas: 1039990.789 units remaining)
     [ { UNPAIR ; ADD }
       (Pair 38 14) ]
-  - location: 15 (remaining gas: 1039990.824 units remaining)
+  - location: 15 (remaining gas: 1039990.779 units remaining)
     [ (Pair 38 14)
       { UNPAIR ; ADD } ]
-  - location: 16 (remaining gas: 1039990.814 units remaining)
+  - location: 16 (remaining gas: 1039990.769 units remaining)
     [ 38
       14
       { UNPAIR ; ADD } ]
-  - location: 17 (remaining gas: 1039990.814 units remaining)
+  - location: 17 (remaining gas: 1039990.769 units remaining)
     [ 14
       { UNPAIR ; ADD } ]
-  - location: 19 (remaining gas: 1039990.609 units remaining)
+  - location: 19 (remaining gas: 1039990.564 units remaining)
     [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ]
-  - location: 17 (remaining gas: 1039990.589 units remaining)
+  - location: 17 (remaining gas: 1039990.544 units remaining)
     [ 38
       { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ]
-  - location: 12 (remaining gas: 1039990.579 units remaining)
+  - location: 12 (remaining gas: 1039990.534 units remaining)
     [ 14
       38 ]
-  - location: 12 (remaining gas: 1039990.569 units remaining)
+  - location: 12 (remaining gas: 1039990.524 units remaining)
     [ (Pair 14 38) ]
-  - location: 13 (remaining gas: 1039990.559 units remaining)
+  - location: 13 (remaining gas: 1039990.514 units remaining)
     [ 14
       38 ]
-  - location: 14 (remaining gas: 1039990.524 units remaining)
+  - location: 14 (remaining gas: 1039990.479 units remaining)
     [ 52 ]
-  - location: 20 (remaining gas: 1039990.504 units remaining)
+  - location: 20 (remaining gas: 1039990.459 units remaining)
     [ 52 ]
-  - location: 21 (remaining gas: 1039990.494 units remaining)
+  - location: 21 (remaining gas: 1039990.449 units remaining)
     [ {}
       52 ]
-  - location: 23 (remaining gas: 1039990.484 units remaining)
+  - location: 23 (remaining gas: 1039990.439 units remaining)
     [ (Pair {} 52) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out
index ccca26af8fb076c9e4ac29eb7616c03f595715b8..ed1077d453b031686222d2474a4dd28d38d5fef7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out	
@@ -7,53 +7,53 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039982.586 units remaining)
+  - location: 8 (remaining gas: 1039982.406 units remaining)
     [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ]
-  - location: 8 (remaining gas: 1039982.576 units remaining)
+  - location: 8 (remaining gas: 1039982.396 units remaining)
     [ 4
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 9 (remaining gas: 1039982.566 units remaining)
+  - location: 9 (remaining gas: 1039982.386 units remaining)
     [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL }
       4
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 23 (remaining gas: 1039982.556 units remaining)
+  - location: 23 (remaining gas: 1039982.376 units remaining)
     [ 4
       { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 24 (remaining gas: 1039982.351 units remaining)
+  - location: 24 (remaining gas: 1039982.171 units remaining)
     [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 25 (remaining gas: 1039982.341 units remaining)
+  - location: 25 (remaining gas: 1039982.161 units remaining)
     [ 3
       { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 28 (remaining gas: 1039982.136 units remaining)
+  - location: 28 (remaining gas: 1039981.956 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 29 (remaining gas: 1039982.126 units remaining)
+  - location: 29 (remaining gas: 1039981.946 units remaining)
     [ { 0 ; 1 ; 2 ; 3 }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039982.126 units remaining)
+  - location: 30 (remaining gas: 1039981.946 units remaining)
     [ 0
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039982.126 units remaining)
+  - location: 32 (remaining gas: 1039981.946 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039982.116 units remaining)
+  - location: 34 (remaining gas: 1039981.936 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039982.096 units remaining)
+  - location: 32 (remaining gas: 1039981.916 units remaining)
     [ 0
       { PUSH int 3 ;
         PAIR ;
@@ -61,55 +61,55 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039982.086 units remaining)
+  - location: 16 (remaining gas: 1039981.906 units remaining)
     [ 3
       0 ]
-  - location: 16 (remaining gas: 1039982.076 units remaining)
+  - location: 16 (remaining gas: 1039981.896 units remaining)
     [ (Pair 3 0) ]
-  - location: 16 (remaining gas: 1039982.066 units remaining)
+  - location: 16 (remaining gas: 1039981.886 units remaining)
     [ 4
       (Pair 3 0) ]
-  - location: 16 (remaining gas: 1039982.056 units remaining)
+  - location: 16 (remaining gas: 1039981.876 units remaining)
     [ (Pair 4 3 0) ]
-  - location: 17 (remaining gas: 1039982.046 units remaining)
+  - location: 17 (remaining gas: 1039981.866 units remaining)
     [ 4
       (Pair 3 0) ]
-  - location: 18 (remaining gas: 1039982.046 units remaining)
+  - location: 18 (remaining gas: 1039981.866 units remaining)
     [ (Pair 3 0) ]
-  - location: 20 (remaining gas: 1039982.036 units remaining)
+  - location: 20 (remaining gas: 1039981.856 units remaining)
     [ 3
       0 ]
-  - location: 18 (remaining gas: 1039982.016 units remaining)
+  - location: 18 (remaining gas: 1039981.836 units remaining)
     [ 4
       3
       0 ]
-  - location: 21 (remaining gas: 1039981.981 units remaining)
+  - location: 21 (remaining gas: 1039981.801 units remaining)
     [ 7
       0 ]
-  - location: 22 (remaining gas: 1039981.925 units remaining)
+  - location: 22 (remaining gas: 1039981.745 units remaining)
     [ 0 ]
-  - location: 35 (remaining gas: 1039981.905 units remaining)
+  - location: 35 (remaining gas: 1039981.725 units remaining)
     [ 0
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039981.895 units remaining)
+  - location: 30 (remaining gas: 1039981.715 units remaining)
     [ 1
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039981.895 units remaining)
+  - location: 32 (remaining gas: 1039981.715 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039981.885 units remaining)
+  - location: 34 (remaining gas: 1039981.705 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039981.865 units remaining)
+  - location: 32 (remaining gas: 1039981.685 units remaining)
     [ 1
       { PUSH int 3 ;
         PAIR ;
@@ -117,55 +117,55 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039981.855 units remaining)
+  - location: 16 (remaining gas: 1039981.675 units remaining)
     [ 3
       1 ]
-  - location: 16 (remaining gas: 1039981.845 units remaining)
+  - location: 16 (remaining gas: 1039981.665 units remaining)
     [ (Pair 3 1) ]
-  - location: 16 (remaining gas: 1039981.835 units remaining)
+  - location: 16 (remaining gas: 1039981.655 units remaining)
     [ 4
       (Pair 3 1) ]
-  - location: 16 (remaining gas: 1039981.825 units remaining)
+  - location: 16 (remaining gas: 1039981.645 units remaining)
     [ (Pair 4 3 1) ]
-  - location: 17 (remaining gas: 1039981.815 units remaining)
+  - location: 17 (remaining gas: 1039981.635 units remaining)
     [ 4
       (Pair 3 1) ]
-  - location: 18 (remaining gas: 1039981.815 units remaining)
+  - location: 18 (remaining gas: 1039981.635 units remaining)
     [ (Pair 3 1) ]
-  - location: 20 (remaining gas: 1039981.805 units remaining)
+  - location: 20 (remaining gas: 1039981.625 units remaining)
     [ 3
       1 ]
-  - location: 18 (remaining gas: 1039981.785 units remaining)
+  - location: 18 (remaining gas: 1039981.605 units remaining)
     [ 4
       3
       1 ]
-  - location: 21 (remaining gas: 1039981.750 units remaining)
+  - location: 21 (remaining gas: 1039981.570 units remaining)
     [ 7
       1 ]
-  - location: 22 (remaining gas: 1039981.691 units remaining)
+  - location: 22 (remaining gas: 1039981.511 units remaining)
     [ 7 ]
-  - location: 35 (remaining gas: 1039981.671 units remaining)
+  - location: 35 (remaining gas: 1039981.491 units remaining)
     [ 7
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039981.661 units remaining)
+  - location: 30 (remaining gas: 1039981.481 units remaining)
     [ 2
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039981.661 units remaining)
+  - location: 32 (remaining gas: 1039981.481 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039981.651 units remaining)
+  - location: 34 (remaining gas: 1039981.471 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039981.631 units remaining)
+  - location: 32 (remaining gas: 1039981.451 units remaining)
     [ 2
       { PUSH int 3 ;
         PAIR ;
@@ -173,55 +173,55 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039981.621 units remaining)
+  - location: 16 (remaining gas: 1039981.441 units remaining)
     [ 3
       2 ]
-  - location: 16 (remaining gas: 1039981.611 units remaining)
+  - location: 16 (remaining gas: 1039981.431 units remaining)
     [ (Pair 3 2) ]
-  - location: 16 (remaining gas: 1039981.601 units remaining)
+  - location: 16 (remaining gas: 1039981.421 units remaining)
     [ 4
       (Pair 3 2) ]
-  - location: 16 (remaining gas: 1039981.591 units remaining)
+  - location: 16 (remaining gas: 1039981.411 units remaining)
     [ (Pair 4 3 2) ]
-  - location: 17 (remaining gas: 1039981.581 units remaining)
+  - location: 17 (remaining gas: 1039981.401 units remaining)
     [ 4
       (Pair 3 2) ]
-  - location: 18 (remaining gas: 1039981.581 units remaining)
+  - location: 18 (remaining gas: 1039981.401 units remaining)
     [ (Pair 3 2) ]
-  - location: 20 (remaining gas: 1039981.571 units remaining)
+  - location: 20 (remaining gas: 1039981.391 units remaining)
     [ 3
       2 ]
-  - location: 18 (remaining gas: 1039981.551 units remaining)
+  - location: 18 (remaining gas: 1039981.371 units remaining)
     [ 4
       3
       2 ]
-  - location: 21 (remaining gas: 1039981.516 units remaining)
+  - location: 21 (remaining gas: 1039981.336 units remaining)
     [ 7
       2 ]
-  - location: 22 (remaining gas: 1039981.457 units remaining)
+  - location: 22 (remaining gas: 1039981.277 units remaining)
     [ 14 ]
-  - location: 35 (remaining gas: 1039981.437 units remaining)
+  - location: 35 (remaining gas: 1039981.257 units remaining)
     [ 14
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039981.427 units remaining)
+  - location: 30 (remaining gas: 1039981.247 units remaining)
     [ 3
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039981.427 units remaining)
+  - location: 32 (remaining gas: 1039981.247 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039981.417 units remaining)
+  - location: 34 (remaining gas: 1039981.237 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039981.397 units remaining)
+  - location: 32 (remaining gas: 1039981.217 units remaining)
     [ 3
       { PUSH int 3 ;
         PAIR ;
@@ -229,54 +229,54 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039981.387 units remaining)
+  - location: 16 (remaining gas: 1039981.207 units remaining)
     [ 3
       3 ]
-  - location: 16 (remaining gas: 1039981.377 units remaining)
+  - location: 16 (remaining gas: 1039981.197 units remaining)
     [ (Pair 3 3) ]
-  - location: 16 (remaining gas: 1039981.367 units remaining)
+  - location: 16 (remaining gas: 1039981.187 units remaining)
     [ 4
       (Pair 3 3) ]
-  - location: 16 (remaining gas: 1039981.357 units remaining)
+  - location: 16 (remaining gas: 1039981.177 units remaining)
     [ (Pair 4 3 3) ]
-  - location: 17 (remaining gas: 1039981.347 units remaining)
+  - location: 17 (remaining gas: 1039981.167 units remaining)
     [ 4
       (Pair 3 3) ]
-  - location: 18 (remaining gas: 1039981.347 units remaining)
+  - location: 18 (remaining gas: 1039981.167 units remaining)
     [ (Pair 3 3) ]
-  - location: 20 (remaining gas: 1039981.337 units remaining)
+  - location: 20 (remaining gas: 1039981.157 units remaining)
     [ 3
       3 ]
-  - location: 18 (remaining gas: 1039981.317 units remaining)
+  - location: 18 (remaining gas: 1039981.137 units remaining)
     [ 4
       3
       3 ]
-  - location: 21 (remaining gas: 1039981.282 units remaining)
+  - location: 21 (remaining gas: 1039981.102 units remaining)
     [ 7
       3 ]
-  - location: 22 (remaining gas: 1039981.223 units remaining)
+  - location: 22 (remaining gas: 1039981.043 units remaining)
     [ 21 ]
-  - location: 35 (remaining gas: 1039981.203 units remaining)
+  - location: 35 (remaining gas: 1039981.023 units remaining)
     [ 21
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039981.193 units remaining)
+  - location: 30 (remaining gas: 1039981.013 units remaining)
     [ { 0 ; 7 ; 14 ; 21 }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 36 (remaining gas: 1039981.193 units remaining)
+  - location: 36 (remaining gas: 1039981.013 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 38 (remaining gas: 1039981.183 units remaining)
+  - location: 38 (remaining gas: 1039981.003 units remaining)
     [  ]
-  - location: 36 (remaining gas: 1039981.163 units remaining)
+  - location: 36 (remaining gas: 1039980.983 units remaining)
     [ { 0 ; 7 ; 14 ; 21 } ]
-  - location: 39 (remaining gas: 1039981.153 units remaining)
+  - location: 39 (remaining gas: 1039980.973 units remaining)
     [ {}
       { 0 ; 7 ; 14 ; 21 } ]
-  - location: 41 (remaining gas: 1039981.143 units remaining)
+  - location: 41 (remaining gas: 1039980.963 units remaining)
     [ (Pair {} { 0 ; 7 ; 14 ; 21 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index 6fcb7c9b56dc7a9dd5f9d31f3f0b57b0e3de9ee4..409c7754dcbd2d5d530057197aa1a707f2399c79 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,125 +7,125 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039985.842 units remaining)
+  - location: 9 (remaining gas: 1039985.752 units remaining)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
-  - location: 9 (remaining gas: 1039985.832 units remaining)
+  - location: 9 (remaining gas: 1039985.742 units remaining)
     [ { "c" ; "b" ; "a" } ]
-  - location: 10 (remaining gas: 1039985.822 units remaining)
+  - location: 10 (remaining gas: 1039985.732 units remaining)
     [ {}
       { "c" ; "b" ; "a" } ]
-  - location: 12 (remaining gas: 1039985.812 units remaining)
+  - location: 12 (remaining gas: 1039985.722 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 13 (remaining gas: 1039985.802 units remaining)
+  - location: 13 (remaining gas: 1039985.712 units remaining)
     [ True
       { "c" ; "b" ; "a" }
       {} ]
-  - location: 33 (remaining gas: 1039985.802 units remaining)
+  - location: 33 (remaining gas: 1039985.712 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 18 (remaining gas: 1039985.802 units remaining)
+  - location: 18 (remaining gas: 1039985.712 units remaining)
     [ "c"
       { "b" ; "a" }
       {} ]
-  - location: 20 (remaining gas: 1039985.792 units remaining)
+  - location: 20 (remaining gas: 1039985.702 units remaining)
     [ { "b" ; "a" }
       "c"
       {} ]
-  - location: 21 (remaining gas: 1039985.792 units remaining)
+  - location: 21 (remaining gas: 1039985.702 units remaining)
     [ "c"
       {} ]
-  - location: 23 (remaining gas: 1039985.782 units remaining)
+  - location: 23 (remaining gas: 1039985.692 units remaining)
     [ { "c" } ]
-  - location: 21 (remaining gas: 1039985.762 units remaining)
+  - location: 21 (remaining gas: 1039985.672 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 24 (remaining gas: 1039985.752 units remaining)
+  - location: 24 (remaining gas: 1039985.662 units remaining)
     [ True
       { "b" ; "a" }
       { "c" } ]
-  - location: 18 (remaining gas: 1039985.742 units remaining)
+  - location: 18 (remaining gas: 1039985.652 units remaining)
     [ True
       { "b" ; "a" }
       { "c" } ]
-  - location: 33 (remaining gas: 1039985.732 units remaining)
+  - location: 33 (remaining gas: 1039985.642 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 18 (remaining gas: 1039985.732 units remaining)
+  - location: 18 (remaining gas: 1039985.642 units remaining)
     [ "b"
       { "a" }
       { "c" } ]
-  - location: 20 (remaining gas: 1039985.722 units remaining)
+  - location: 20 (remaining gas: 1039985.632 units remaining)
     [ { "a" }
       "b"
       { "c" } ]
-  - location: 21 (remaining gas: 1039985.722 units remaining)
+  - location: 21 (remaining gas: 1039985.632 units remaining)
     [ "b"
       { "c" } ]
-  - location: 23 (remaining gas: 1039985.712 units remaining)
+  - location: 23 (remaining gas: 1039985.622 units remaining)
     [ { "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039985.692 units remaining)
+  - location: 21 (remaining gas: 1039985.602 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039985.682 units remaining)
+  - location: 24 (remaining gas: 1039985.592 units remaining)
     [ True
       { "a" }
       { "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039985.672 units remaining)
+  - location: 18 (remaining gas: 1039985.582 units remaining)
     [ True
       { "a" }
       { "b" ; "c" } ]
-  - location: 33 (remaining gas: 1039985.662 units remaining)
+  - location: 33 (remaining gas: 1039985.572 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039985.662 units remaining)
+  - location: 18 (remaining gas: 1039985.572 units remaining)
     [ "a"
       {}
       { "b" ; "c" } ]
-  - location: 20 (remaining gas: 1039985.652 units remaining)
+  - location: 20 (remaining gas: 1039985.562 units remaining)
     [ {}
       "a"
       { "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039985.652 units remaining)
+  - location: 21 (remaining gas: 1039985.562 units remaining)
     [ "a"
       { "b" ; "c" } ]
-  - location: 23 (remaining gas: 1039985.642 units remaining)
+  - location: 23 (remaining gas: 1039985.552 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039985.622 units remaining)
+  - location: 21 (remaining gas: 1039985.532 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039985.612 units remaining)
+  - location: 24 (remaining gas: 1039985.522 units remaining)
     [ True
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039985.602 units remaining)
+  - location: 18 (remaining gas: 1039985.512 units remaining)
     [ True
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 33 (remaining gas: 1039985.592 units remaining)
+  - location: 33 (remaining gas: 1039985.502 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039985.592 units remaining)
+  - location: 18 (remaining gas: 1039985.502 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 28 (remaining gas: 1039985.582 units remaining)
+  - location: 28 (remaining gas: 1039985.492 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 30 (remaining gas: 1039985.572 units remaining)
+  - location: 30 (remaining gas: 1039985.482 units remaining)
     [ False
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039985.562 units remaining)
+  - location: 18 (remaining gas: 1039985.472 units remaining)
     [ False
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 33 (remaining gas: 1039985.552 units remaining)
+  - location: 33 (remaining gas: 1039985.462 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 33 (remaining gas: 1039985.542 units remaining)
+  - location: 33 (remaining gas: 1039985.452 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 34 (remaining gas: 1039985.532 units remaining)
+  - location: 34 (remaining gas: 1039985.442 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 36 (remaining gas: 1039985.522 units remaining)
+  - location: 36 (remaining gas: 1039985.432 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out"
index a3dd27fd66e07b3674e93ebdcf5b489d57075eff..98d879389a239f96459d8a98cfe30ad38a61c6c5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out"
@@ -7,44 +7,44 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039986.214 units remaining)
+  - location: 9 (remaining gas: 1039986.124 units remaining)
     [ (Pair {} { "" }) ]
-  - location: 9 (remaining gas: 1039986.204 units remaining)
+  - location: 9 (remaining gas: 1039986.114 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039986.194 units remaining)
+  - location: 10 (remaining gas: 1039986.104 units remaining)
     [ {}
       {} ]
-  - location: 12 (remaining gas: 1039986.184 units remaining)
+  - location: 12 (remaining gas: 1039986.094 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039986.174 units remaining)
+  - location: 13 (remaining gas: 1039986.084 units remaining)
     [ True
       {}
       {} ]
-  - location: 33 (remaining gas: 1039986.174 units remaining)
+  - location: 33 (remaining gas: 1039986.084 units remaining)
     [ {}
       {} ]
-  - location: 18 (remaining gas: 1039986.174 units remaining)
+  - location: 18 (remaining gas: 1039986.084 units remaining)
     [ {} ]
-  - location: 28 (remaining gas: 1039986.164 units remaining)
+  - location: 28 (remaining gas: 1039986.074 units remaining)
     [ {}
       {} ]
-  - location: 30 (remaining gas: 1039986.154 units remaining)
+  - location: 30 (remaining gas: 1039986.064 units remaining)
     [ False
       {}
       {} ]
-  - location: 18 (remaining gas: 1039986.144 units remaining)
+  - location: 18 (remaining gas: 1039986.054 units remaining)
     [ False
       {}
       {} ]
-  - location: 33 (remaining gas: 1039986.134 units remaining)
+  - location: 33 (remaining gas: 1039986.044 units remaining)
     [ {}
       {} ]
-  - location: 33 (remaining gas: 1039986.124 units remaining)
+  - location: 33 (remaining gas: 1039986.034 units remaining)
     [ {} ]
-  - location: 34 (remaining gas: 1039986.114 units remaining)
+  - location: 34 (remaining gas: 1039986.024 units remaining)
     [ {}
       {} ]
-  - location: 36 (remaining gas: 1039986.104 units remaining)
+  - location: 36 (remaining gas: 1039986.014 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out
index f991e2593dce3a96e1fe9bece34bc0ac150af1d0..541f5bf69bea7ab547ffc359681a4bf516cbb5c1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out	
@@ -7,87 +7,87 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039959.876 units remaining)
+  - location: 13 (remaining gas: 1039959.831 units remaining)
     [ (Pair (Left (Left 0)) Unit) ]
-  - location: 13 (remaining gas: 1039959.866 units remaining)
+  - location: 13 (remaining gas: 1039959.821 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039959.856 units remaining)
+  - location: 14 (remaining gas: 1039959.811 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ]
-  - location: 15 (remaining gas: 1039958.700 units remaining)
+  - location: 15 (remaining gas: 1039958.655 units remaining)
     [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 16 (remaining gas: 1039958.690 units remaining)
+  - location: 16 (remaining gas: 1039958.645 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi"
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 17 (remaining gas: 1039957.567 units remaining)
+  - location: 17 (remaining gas: 1039957.522 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 18 (remaining gas: 1039957.557 units remaining)
+  - location: 18 (remaining gas: 1039957.512 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 19 (remaining gas: 1039957.557 units remaining)
+  - location: 19 (remaining gas: 1039957.512 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 21 (remaining gas: 1039957.547 units remaining)
+  - location: 21 (remaining gas: 1039957.502 units remaining)
     [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 19 (remaining gas: 1039957.527 units remaining)
+  - location: 19 (remaining gas: 1039957.482 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 24 (remaining gas: 1039957.492 units remaining)
+  - location: 24 (remaining gas: 1039957.447 units remaining)
     [ -1
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 25 (remaining gas: 1039957.482 units remaining)
+  - location: 25 (remaining gas: 1039957.437 units remaining)
     [ True
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 26 (remaining gas: 1039957.482 units remaining)
+  - location: 26 (remaining gas: 1039957.437 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 26 (remaining gas: 1039957.472 units remaining)
+  - location: 26 (remaining gas: 1039957.427 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 32 (remaining gas: 1039957.462 units remaining)
+  - location: 32 (remaining gas: 1039957.417 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi"
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 33 (remaining gas: 1039956.339 units remaining)
+  - location: 33 (remaining gas: 1039956.294 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 36 (remaining gas: 1039956.304 units remaining)
+  - location: 36 (remaining gas: 1039956.259 units remaining)
     [ 0 ]
-  - location: 37 (remaining gas: 1039956.294 units remaining)
+  - location: 37 (remaining gas: 1039956.249 units remaining)
     [ True ]
-  - location: 38 (remaining gas: 1039956.294 units remaining)
+  - location: 38 (remaining gas: 1039956.249 units remaining)
     [  ]
-  - location: 38 (remaining gas: 1039956.284 units remaining)
+  - location: 38 (remaining gas: 1039956.239 units remaining)
     [  ]
-  - location: 44 (remaining gas: 1039956.274 units remaining)
+  - location: 44 (remaining gas: 1039956.229 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ]
-  - location: 48 (remaining gas: 1039956.264 units remaining)
+  - location: 48 (remaining gas: 1039956.219 units remaining)
     [  ]
-  - location: 49 (remaining gas: 1039956.254 units remaining)
+  - location: 49 (remaining gas: 1039956.209 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ]
-  - location: 53 (remaining gas: 1039956.244 units remaining)
+  - location: 53 (remaining gas: 1039956.199 units remaining)
     [  ]
-  - location: 54 (remaining gas: 1039956.234 units remaining)
+  - location: 54 (remaining gas: 1039956.189 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ]
-  - location: 60 (remaining gas: 1039956.224 units remaining)
+  - location: 60 (remaining gas: 1039956.179 units remaining)
     [  ]
-  - location: 61 (remaining gas: 1039956.214 units remaining)
+  - location: 61 (remaining gas: 1039956.169 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ]
-  - location: 65 (remaining gas: 1039956.204 units remaining)
+  - location: 65 (remaining gas: 1039956.159 units remaining)
     [  ]
-  - location: 66 (remaining gas: 1039956.194 units remaining)
+  - location: 66 (remaining gas: 1039956.149 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 76 (remaining gas: 1039956.184 units remaining)
+  - location: 76 (remaining gas: 1039956.139 units remaining)
     [  ]
-  - location: 77 (remaining gas: 1039956.174 units remaining)
+  - location: 77 (remaining gas: 1039956.129 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 87 (remaining gas: 1039956.164 units remaining)
+  - location: 87 (remaining gas: 1039956.119 units remaining)
     [  ]
-  - location: 88 (remaining gas: 1039956.154 units remaining)
+  - location: 88 (remaining gas: 1039956.109 units remaining)
     [ Unit ]
-  - location: 89 (remaining gas: 1039956.144 units remaining)
+  - location: 89 (remaining gas: 1039956.099 units remaining)
     [ {}
       Unit ]
-  - location: 91 (remaining gas: 1039956.134 units remaining)
+  - location: 91 (remaining gas: 1039956.089 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out"
index 4b2a9c58b5d0f81c400eebb4ba0ea1cb9f42025f..0aa78bfe9da804aca6f849c72f6c63c78bb22d7c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out"	
@@ -7,43 +7,43 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039989.071 units remaining)
+  - location: 9 (remaining gas: 1039988.936 units remaining)
     [ (Pair "" "hello" 0) ]
-  - location: 9 (remaining gas: 1039989.061 units remaining)
+  - location: 9 (remaining gas: 1039988.926 units remaining)
     [ (Pair "" "hello" 0)
       (Pair "" "hello" 0) ]
-  - location: 10 (remaining gas: 1039989.051 units remaining)
+  - location: 10 (remaining gas: 1039988.916 units remaining)
     [ (Pair "hello" 0)
       (Pair "" "hello" 0) ]
-  - location: 11 (remaining gas: 1039989.051 units remaining)
+  - location: 11 (remaining gas: 1039988.916 units remaining)
     [ (Pair "" "hello" 0) ]
-  - location: 13 (remaining gas: 1039989.041 units remaining)
+  - location: 13 (remaining gas: 1039988.906 units remaining)
     [ "" ]
-  - location: 11 (remaining gas: 1039989.021 units remaining)
+  - location: 11 (remaining gas: 1039988.886 units remaining)
     [ (Pair "hello" 0)
       "" ]
-  - location: 15 (remaining gas: 1039989.011 units remaining)
+  - location: 15 (remaining gas: 1039988.876 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       "" ]
-  - location: 16 (remaining gas: 1039989.001 units remaining)
+  - location: 16 (remaining gas: 1039988.866 units remaining)
     [ "hello"
       (Pair "hello" 0)
       "" ]
-  - location: 17 (remaining gas: 1039988.991 units remaining)
+  - location: 17 (remaining gas: 1039988.856 units remaining)
     [ (Pair "hello" 0)
       "" ]
-  - location: 18 (remaining gas: 1039988.981 units remaining)
+  - location: 18 (remaining gas: 1039988.846 units remaining)
     [ 0
       "" ]
-  - location: 19 (remaining gas: 1039988.971 units remaining)
+  - location: 19 (remaining gas: 1039988.836 units remaining)
     [ ""
       0 ]
-  - location: 20 (remaining gas: 1039988.961 units remaining)
+  - location: 20 (remaining gas: 1039988.826 units remaining)
     [ (Pair "" 0) ]
-  - location: 21 (remaining gas: 1039988.951 units remaining)
+  - location: 21 (remaining gas: 1039988.816 units remaining)
     [ {}
       (Pair "" 0) ]
-  - location: 23 (remaining gas: 1039988.941 units remaining)
+  - location: 23 (remaining gas: 1039988.806 units remaining)
     [ (Pair {} "" 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out"
index 46f23622d08f430123f1eb4da2253b5a1580fdc5..a6f48edaae997ca58d3220eac26b6e91032b7ac3 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out"	
@@ -7,43 +7,43 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039989.041 units remaining)
+  - location: 9 (remaining gas: 1039988.906 units remaining)
     [ (Pair "abc" "hello" 0) ]
-  - location: 9 (remaining gas: 1039989.031 units remaining)
+  - location: 9 (remaining gas: 1039988.896 units remaining)
     [ (Pair "abc" "hello" 0)
       (Pair "abc" "hello" 0) ]
-  - location: 10 (remaining gas: 1039989.021 units remaining)
+  - location: 10 (remaining gas: 1039988.886 units remaining)
     [ (Pair "hello" 0)
       (Pair "abc" "hello" 0) ]
-  - location: 11 (remaining gas: 1039989.021 units remaining)
+  - location: 11 (remaining gas: 1039988.886 units remaining)
     [ (Pair "abc" "hello" 0) ]
-  - location: 13 (remaining gas: 1039989.011 units remaining)
+  - location: 13 (remaining gas: 1039988.876 units remaining)
     [ "abc" ]
-  - location: 11 (remaining gas: 1039988.991 units remaining)
+  - location: 11 (remaining gas: 1039988.856 units remaining)
     [ (Pair "hello" 0)
       "abc" ]
-  - location: 15 (remaining gas: 1039988.981 units remaining)
+  - location: 15 (remaining gas: 1039988.846 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       "abc" ]
-  - location: 16 (remaining gas: 1039988.971 units remaining)
+  - location: 16 (remaining gas: 1039988.836 units remaining)
     [ "hello"
       (Pair "hello" 0)
       "abc" ]
-  - location: 17 (remaining gas: 1039988.961 units remaining)
+  - location: 17 (remaining gas: 1039988.826 units remaining)
     [ (Pair "hello" 0)
       "abc" ]
-  - location: 18 (remaining gas: 1039988.951 units remaining)
+  - location: 18 (remaining gas: 1039988.816 units remaining)
     [ 0
       "abc" ]
-  - location: 19 (remaining gas: 1039988.941 units remaining)
+  - location: 19 (remaining gas: 1039988.806 units remaining)
     [ "abc"
       0 ]
-  - location: 20 (remaining gas: 1039988.931 units remaining)
+  - location: 20 (remaining gas: 1039988.796 units remaining)
     [ (Pair "abc" 0) ]
-  - location: 21 (remaining gas: 1039988.921 units remaining)
+  - location: 21 (remaining gas: 1039988.786 units remaining)
     [ {}
       (Pair "abc" 0) ]
-  - location: 23 (remaining gas: 1039988.911 units remaining)
+  - location: 23 (remaining gas: 1039988.776 units remaining)
     [ (Pair {} "abc" 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out"
index 194c1cb8eeda4b755ae13031905380eadcd1c2c8..dc23f1aee816a17d3fb41172f272b73256035766 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out"	
@@ -7,43 +7,43 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039989.021 units remaining)
+  - location: 9 (remaining gas: 1039988.886 units remaining)
     [ (Pair "world" "hello" 0) ]
-  - location: 9 (remaining gas: 1039989.011 units remaining)
+  - location: 9 (remaining gas: 1039988.876 units remaining)
     [ (Pair "world" "hello" 0)
       (Pair "world" "hello" 0) ]
-  - location: 10 (remaining gas: 1039989.001 units remaining)
+  - location: 10 (remaining gas: 1039988.866 units remaining)
     [ (Pair "hello" 0)
       (Pair "world" "hello" 0) ]
-  - location: 11 (remaining gas: 1039989.001 units remaining)
+  - location: 11 (remaining gas: 1039988.866 units remaining)
     [ (Pair "world" "hello" 0) ]
-  - location: 13 (remaining gas: 1039988.991 units remaining)
+  - location: 13 (remaining gas: 1039988.856 units remaining)
     [ "world" ]
-  - location: 11 (remaining gas: 1039988.971 units remaining)
+  - location: 11 (remaining gas: 1039988.836 units remaining)
     [ (Pair "hello" 0)
       "world" ]
-  - location: 15 (remaining gas: 1039988.961 units remaining)
+  - location: 15 (remaining gas: 1039988.826 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       "world" ]
-  - location: 16 (remaining gas: 1039988.951 units remaining)
+  - location: 16 (remaining gas: 1039988.816 units remaining)
     [ "hello"
       (Pair "hello" 0)
       "world" ]
-  - location: 17 (remaining gas: 1039988.941 units remaining)
+  - location: 17 (remaining gas: 1039988.806 units remaining)
     [ (Pair "hello" 0)
       "world" ]
-  - location: 18 (remaining gas: 1039988.931 units remaining)
+  - location: 18 (remaining gas: 1039988.796 units remaining)
     [ 0
       "world" ]
-  - location: 19 (remaining gas: 1039988.921 units remaining)
+  - location: 19 (remaining gas: 1039988.786 units remaining)
     [ "world"
       0 ]
-  - location: 20 (remaining gas: 1039988.911 units remaining)
+  - location: 20 (remaining gas: 1039988.776 units remaining)
     [ (Pair "world" 0) ]
-  - location: 21 (remaining gas: 1039988.901 units remaining)
+  - location: 21 (remaining gas: 1039988.766 units remaining)
     [ {}
       (Pair "world" 0) ]
-  - location: 23 (remaining gas: 1039988.891 units remaining)
+  - location: 23 (remaining gas: 1039988.756 units remaining)
     [ (Pair {} "world" 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out"
index ae91ab2cf8762ea27c9933a6f1e8e17347ad5afc..9b9675acbae7e2b79e298fe818886112bfb4bcf8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out"	
@@ -7,40 +7,40 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039989.643 units remaining)
+  - location: 9 (remaining gas: 1039989.508 units remaining)
     [ (Pair 1 "hello" 0) ]
-  - location: 9 (remaining gas: 1039989.633 units remaining)
+  - location: 9 (remaining gas: 1039989.498 units remaining)
     [ (Pair 1 "hello" 0)
       (Pair 1 "hello" 0) ]
-  - location: 10 (remaining gas: 1039989.623 units remaining)
+  - location: 10 (remaining gas: 1039989.488 units remaining)
     [ (Pair "hello" 0)
       (Pair 1 "hello" 0) ]
-  - location: 11 (remaining gas: 1039989.623 units remaining)
+  - location: 11 (remaining gas: 1039989.488 units remaining)
     [ (Pair 1 "hello" 0) ]
-  - location: 13 (remaining gas: 1039989.613 units remaining)
+  - location: 13 (remaining gas: 1039989.478 units remaining)
     [ 1 ]
-  - location: 11 (remaining gas: 1039989.593 units remaining)
+  - location: 11 (remaining gas: 1039989.458 units remaining)
     [ (Pair "hello" 0)
       1 ]
-  - location: 15 (remaining gas: 1039989.583 units remaining)
+  - location: 15 (remaining gas: 1039989.448 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       1 ]
-  - location: 16 (remaining gas: 1039989.573 units remaining)
+  - location: 16 (remaining gas: 1039989.438 units remaining)
     [ 0
       (Pair "hello" 0)
       1 ]
-  - location: 17 (remaining gas: 1039989.563 units remaining)
+  - location: 17 (remaining gas: 1039989.428 units remaining)
     [ (Pair "hello" 0)
       1 ]
-  - location: 18 (remaining gas: 1039989.553 units remaining)
+  - location: 18 (remaining gas: 1039989.418 units remaining)
     [ "hello"
       1 ]
-  - location: 19 (remaining gas: 1039989.543 units remaining)
+  - location: 19 (remaining gas: 1039989.408 units remaining)
     [ (Pair "hello" 1) ]
-  - location: 20 (remaining gas: 1039989.533 units remaining)
+  - location: 20 (remaining gas: 1039989.398 units remaining)
     [ {}
       (Pair "hello" 1) ]
-  - location: 22 (remaining gas: 1039989.523 units remaining)
+  - location: 22 (remaining gas: 1039989.388 units remaining)
     [ (Pair {} "hello" 1) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out"
index d0f09469a8022b7968b119ea531a2420f800ee54..425e19d2d24740414d0f0f4aa51b6d49f94e1c9f 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out"	
@@ -7,40 +7,40 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039989.643 units remaining)
+  - location: 9 (remaining gas: 1039989.508 units remaining)
     [ (Pair 3 "hello" 500) ]
-  - location: 9 (remaining gas: 1039989.633 units remaining)
+  - location: 9 (remaining gas: 1039989.498 units remaining)
     [ (Pair 3 "hello" 500)
       (Pair 3 "hello" 500) ]
-  - location: 10 (remaining gas: 1039989.623 units remaining)
+  - location: 10 (remaining gas: 1039989.488 units remaining)
     [ (Pair "hello" 500)
       (Pair 3 "hello" 500) ]
-  - location: 11 (remaining gas: 1039989.623 units remaining)
+  - location: 11 (remaining gas: 1039989.488 units remaining)
     [ (Pair 3 "hello" 500) ]
-  - location: 13 (remaining gas: 1039989.613 units remaining)
+  - location: 13 (remaining gas: 1039989.478 units remaining)
     [ 3 ]
-  - location: 11 (remaining gas: 1039989.593 units remaining)
+  - location: 11 (remaining gas: 1039989.458 units remaining)
     [ (Pair "hello" 500)
       3 ]
-  - location: 15 (remaining gas: 1039989.583 units remaining)
+  - location: 15 (remaining gas: 1039989.448 units remaining)
     [ (Pair "hello" 500)
       (Pair "hello" 500)
       3 ]
-  - location: 16 (remaining gas: 1039989.573 units remaining)
+  - location: 16 (remaining gas: 1039989.438 units remaining)
     [ 500
       (Pair "hello" 500)
       3 ]
-  - location: 17 (remaining gas: 1039989.563 units remaining)
+  - location: 17 (remaining gas: 1039989.428 units remaining)
     [ (Pair "hello" 500)
       3 ]
-  - location: 18 (remaining gas: 1039989.553 units remaining)
+  - location: 18 (remaining gas: 1039989.418 units remaining)
     [ "hello"
       3 ]
-  - location: 19 (remaining gas: 1039989.543 units remaining)
+  - location: 19 (remaining gas: 1039989.408 units remaining)
     [ (Pair "hello" 3) ]
-  - location: 20 (remaining gas: 1039989.533 units remaining)
+  - location: 20 (remaining gas: 1039989.398 units remaining)
     [ {}
       (Pair "hello" 3) ]
-  - location: 22 (remaining gas: 1039989.523 units remaining)
+  - location: 22 (remaining gas: 1039989.388 units remaining)
     [ (Pair {} "hello" 3) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out"
index a5d0362a8d3ae6830c00a438927bd255822a3ca8..825e0ae6c1e50dca863939660e26cdb8b2645c99 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out"	
@@ -7,40 +7,40 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039989.643 units remaining)
+  - location: 9 (remaining gas: 1039989.508 units remaining)
     [ (Pair 100 "hello" 7) ]
-  - location: 9 (remaining gas: 1039989.633 units remaining)
+  - location: 9 (remaining gas: 1039989.498 units remaining)
     [ (Pair 100 "hello" 7)
       (Pair 100 "hello" 7) ]
-  - location: 10 (remaining gas: 1039989.623 units remaining)
+  - location: 10 (remaining gas: 1039989.488 units remaining)
     [ (Pair "hello" 7)
       (Pair 100 "hello" 7) ]
-  - location: 11 (remaining gas: 1039989.623 units remaining)
+  - location: 11 (remaining gas: 1039989.488 units remaining)
     [ (Pair 100 "hello" 7) ]
-  - location: 13 (remaining gas: 1039989.613 units remaining)
+  - location: 13 (remaining gas: 1039989.478 units remaining)
     [ 100 ]
-  - location: 11 (remaining gas: 1039989.593 units remaining)
+  - location: 11 (remaining gas: 1039989.458 units remaining)
     [ (Pair "hello" 7)
       100 ]
-  - location: 15 (remaining gas: 1039989.583 units remaining)
+  - location: 15 (remaining gas: 1039989.448 units remaining)
     [ (Pair "hello" 7)
       (Pair "hello" 7)
       100 ]
-  - location: 16 (remaining gas: 1039989.573 units remaining)
+  - location: 16 (remaining gas: 1039989.438 units remaining)
     [ 7
       (Pair "hello" 7)
       100 ]
-  - location: 17 (remaining gas: 1039989.563 units remaining)
+  - location: 17 (remaining gas: 1039989.428 units remaining)
     [ (Pair "hello" 7)
       100 ]
-  - location: 18 (remaining gas: 1039989.553 units remaining)
+  - location: 18 (remaining gas: 1039989.418 units remaining)
     [ "hello"
       100 ]
-  - location: 19 (remaining gas: 1039989.543 units remaining)
+  - location: 19 (remaining gas: 1039989.408 units remaining)
     [ (Pair "hello" 100) ]
-  - location: 20 (remaining gas: 1039989.533 units remaining)
+  - location: 20 (remaining gas: 1039989.398 units remaining)
     [ {}
       (Pair "hello" 100) ]
-  - location: 22 (remaining gas: 1039989.523 units remaining)
+  - location: 22 (remaining gas: 1039989.388 units remaining)
     [ (Pair {} "hello" 100) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out"
index 3b2808b71eaab4e73a270a40d93db098e72550c1..b5a3c617d824c78eda8530196abb8b26a955be9d 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out"	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039985.643 units remaining)
+  - location: 11 (remaining gas: 1039985.508 units remaining)
     [ (Pair "" { "Hello" ; "World" } None) ]
-  - location: 11 (remaining gas: 1039985.633 units remaining)
+  - location: 11 (remaining gas: 1039985.498 units remaining)
     [ (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 12 (remaining gas: 1039985.623 units remaining)
+  - location: 12 (remaining gas: 1039985.488 units remaining)
     [ (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 13 (remaining gas: 1039985.613 units remaining)
+  - location: 13 (remaining gas: 1039985.478 units remaining)
     [ ""
       (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 14 (remaining gas: 1039985.613 units remaining)
+  - location: 14 (remaining gas: 1039985.478 units remaining)
     [ (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 17 (remaining gas: 1039985.603 units remaining)
+  - location: 17 (remaining gas: 1039985.468 units remaining)
     [ (Pair { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 18 (remaining gas: 1039985.593 units remaining)
+  - location: 18 (remaining gas: 1039985.458 units remaining)
     [ { "Hello" ; "World" }
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 14 (remaining gas: 1039985.573 units remaining)
+  - location: 14 (remaining gas: 1039985.438 units remaining)
     [ ""
       { "Hello" ; "World" }
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 19 (remaining gas: 1039985.458 units remaining)
+  - location: 19 (remaining gas: 1039985.323 units remaining)
     [ False
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 20 (remaining gas: 1039985.448 units remaining)
+  - location: 20 (remaining gas: 1039985.313 units remaining)
     [ (Some False)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 21 (remaining gas: 1039985.448 units remaining)
+  - location: 21 (remaining gas: 1039985.313 units remaining)
     [ (Pair "" { "Hello" ; "World" } None) ]
-  - location: 24 (remaining gas: 1039985.438 units remaining)
+  - location: 24 (remaining gas: 1039985.303 units remaining)
     [ (Pair { "Hello" ; "World" } None) ]
-  - location: 25 (remaining gas: 1039985.428 units remaining)
+  - location: 25 (remaining gas: 1039985.293 units remaining)
     [ { "Hello" ; "World" } ]
-  - location: 21 (remaining gas: 1039985.408 units remaining)
+  - location: 21 (remaining gas: 1039985.273 units remaining)
     [ (Some False)
       { "Hello" ; "World" } ]
-  - location: 26 (remaining gas: 1039985.398 units remaining)
+  - location: 26 (remaining gas: 1039985.263 units remaining)
     [ { "Hello" ; "World" }
       (Some False) ]
-  - location: 27 (remaining gas: 1039985.388 units remaining)
+  - location: 27 (remaining gas: 1039985.253 units remaining)
     [ (Pair { "Hello" ; "World" } (Some False)) ]
-  - location: 28 (remaining gas: 1039985.378 units remaining)
+  - location: 28 (remaining gas: 1039985.243 units remaining)
     [ {}
       (Pair { "Hello" ; "World" } (Some False)) ]
-  - location: 30 (remaining gas: 1039985.368 units remaining)
+  - location: 30 (remaining gas: 1039985.233 units remaining)
     [ (Pair {} { "Hello" ; "World" } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out"
index 98b5ee3bdab5cbeb7adcf54a1591867ed348cee8..2f401ffb0f4fc1bf8442f3bb197aa3ced0424c55 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out"	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039986.008 units remaining)
+  - location: 11 (remaining gas: 1039985.873 units remaining)
     [ (Pair "Hi" { "Hi" } None) ]
-  - location: 11 (remaining gas: 1039985.998 units remaining)
+  - location: 11 (remaining gas: 1039985.863 units remaining)
     [ (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 12 (remaining gas: 1039985.988 units remaining)
+  - location: 12 (remaining gas: 1039985.853 units remaining)
     [ (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 13 (remaining gas: 1039985.978 units remaining)
+  - location: 13 (remaining gas: 1039985.843 units remaining)
     [ "Hi"
       (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 14 (remaining gas: 1039985.978 units remaining)
+  - location: 14 (remaining gas: 1039985.843 units remaining)
     [ (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 17 (remaining gas: 1039985.968 units remaining)
+  - location: 17 (remaining gas: 1039985.833 units remaining)
     [ (Pair { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 18 (remaining gas: 1039985.958 units remaining)
+  - location: 18 (remaining gas: 1039985.823 units remaining)
     [ { "Hi" }
       (Pair "Hi" { "Hi" } None) ]
-  - location: 14 (remaining gas: 1039985.938 units remaining)
+  - location: 14 (remaining gas: 1039985.803 units remaining)
     [ "Hi"
       { "Hi" }
       (Pair "Hi" { "Hi" } None) ]
-  - location: 19 (remaining gas: 1039985.819 units remaining)
+  - location: 19 (remaining gas: 1039985.684 units remaining)
     [ True
       (Pair "Hi" { "Hi" } None) ]
-  - location: 20 (remaining gas: 1039985.809 units remaining)
+  - location: 20 (remaining gas: 1039985.674 units remaining)
     [ (Some True)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 21 (remaining gas: 1039985.809 units remaining)
+  - location: 21 (remaining gas: 1039985.674 units remaining)
     [ (Pair "Hi" { "Hi" } None) ]
-  - location: 24 (remaining gas: 1039985.799 units remaining)
+  - location: 24 (remaining gas: 1039985.664 units remaining)
     [ (Pair { "Hi" } None) ]
-  - location: 25 (remaining gas: 1039985.789 units remaining)
+  - location: 25 (remaining gas: 1039985.654 units remaining)
     [ { "Hi" } ]
-  - location: 21 (remaining gas: 1039985.769 units remaining)
+  - location: 21 (remaining gas: 1039985.634 units remaining)
     [ (Some True)
       { "Hi" } ]
-  - location: 26 (remaining gas: 1039985.759 units remaining)
+  - location: 26 (remaining gas: 1039985.624 units remaining)
     [ { "Hi" }
       (Some True) ]
-  - location: 27 (remaining gas: 1039985.749 units remaining)
+  - location: 27 (remaining gas: 1039985.614 units remaining)
     [ (Pair { "Hi" } (Some True)) ]
-  - location: 28 (remaining gas: 1039985.739 units remaining)
+  - location: 28 (remaining gas: 1039985.604 units remaining)
     [ {}
       (Pair { "Hi" } (Some True)) ]
-  - location: 30 (remaining gas: 1039985.729 units remaining)
+  - location: 30 (remaining gas: 1039985.594 units remaining)
     [ (Pair {} { "Hi" } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out"
index 649d1080e19ca1367bc56f7607dfe29b526f2cce..1291f770a1dc31b29dcc9b06adbd14296b344619 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out"	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039986.276 units remaining)
+  - location: 11 (remaining gas: 1039986.141 units remaining)
     [ (Pair "Hi" {} None) ]
-  - location: 11 (remaining gas: 1039986.266 units remaining)
+  - location: 11 (remaining gas: 1039986.131 units remaining)
     [ (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 12 (remaining gas: 1039986.256 units remaining)
+  - location: 12 (remaining gas: 1039986.121 units remaining)
     [ (Pair "Hi" {} None)
       (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 13 (remaining gas: 1039986.246 units remaining)
+  - location: 13 (remaining gas: 1039986.111 units remaining)
     [ "Hi"
       (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 14 (remaining gas: 1039986.246 units remaining)
+  - location: 14 (remaining gas: 1039986.111 units remaining)
     [ (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 17 (remaining gas: 1039986.236 units remaining)
+  - location: 17 (remaining gas: 1039986.101 units remaining)
     [ (Pair {} None)
       (Pair "Hi" {} None) ]
-  - location: 18 (remaining gas: 1039986.226 units remaining)
+  - location: 18 (remaining gas: 1039986.091 units remaining)
     [ {}
       (Pair "Hi" {} None) ]
-  - location: 14 (remaining gas: 1039986.206 units remaining)
+  - location: 14 (remaining gas: 1039986.071 units remaining)
     [ "Hi"
       {}
       (Pair "Hi" {} None) ]
-  - location: 19 (remaining gas: 1039986.089 units remaining)
+  - location: 19 (remaining gas: 1039985.954 units remaining)
     [ False
       (Pair "Hi" {} None) ]
-  - location: 20 (remaining gas: 1039986.079 units remaining)
+  - location: 20 (remaining gas: 1039985.944 units remaining)
     [ (Some False)
       (Pair "Hi" {} None) ]
-  - location: 21 (remaining gas: 1039986.079 units remaining)
+  - location: 21 (remaining gas: 1039985.944 units remaining)
     [ (Pair "Hi" {} None) ]
-  - location: 24 (remaining gas: 1039986.069 units remaining)
+  - location: 24 (remaining gas: 1039985.934 units remaining)
     [ (Pair {} None) ]
-  - location: 25 (remaining gas: 1039986.059 units remaining)
+  - location: 25 (remaining gas: 1039985.924 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039986.039 units remaining)
+  - location: 21 (remaining gas: 1039985.904 units remaining)
     [ (Some False)
       {} ]
-  - location: 26 (remaining gas: 1039986.029 units remaining)
+  - location: 26 (remaining gas: 1039985.894 units remaining)
     [ {}
       (Some False) ]
-  - location: 27 (remaining gas: 1039986.019 units remaining)
+  - location: 27 (remaining gas: 1039985.884 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 28 (remaining gas: 1039986.009 units remaining)
+  - location: 28 (remaining gas: 1039985.874 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 30 (remaining gas: 1039985.999 units remaining)
+  - location: 30 (remaining gas: 1039985.864 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out"
index 67d0b063c94a1867622307b757e0c31389eaba17..fe7762301322933154e3eff89911da174e1d7378 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.563 units remaining)
+  - location: 9 (remaining gas: 1039992.518 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ]
-  - location: 9 (remaining gas: 1039992.553 units remaining)
+  - location: 9 (remaining gas: 1039992.508 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 10 (remaining gas: 1039992.543 units remaining)
+  - location: 10 (remaining gas: 1039992.498 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100)
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 11 (remaining gas: 1039992.533 units remaining)
+  - location: 11 (remaining gas: 1039992.488 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 12 (remaining gas: 1039992.533 units remaining)
+  - location: 12 (remaining gas: 1039992.488 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 14 (remaining gas: 1039992.523 units remaining)
+  - location: 14 (remaining gas: 1039992.478 units remaining)
     [ -100 ]
-  - location: 12 (remaining gas: 1039992.503 units remaining)
+  - location: 12 (remaining gas: 1039992.458 units remaining)
     [ "1970-01-01T00:01:40Z"
       -100 ]
-  - location: 15 (remaining gas: 1039992.468 units remaining)
+  - location: 15 (remaining gas: 1039992.423 units remaining)
     [ "1970-01-01T00:03:20Z" ]
-  - location: 16 (remaining gas: 1039992.458 units remaining)
+  - location: 16 (remaining gas: 1039992.413 units remaining)
     [ {}
       "1970-01-01T00:03:20Z" ]
-  - location: 18 (remaining gas: 1039992.448 units remaining)
+  - location: 18 (remaining gas: 1039992.403 units remaining)
     [ (Pair {} "1970-01-01T00:03:20Z") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out"
index dcec2117010e712b99f6e7a42630ac7a2f099884..d0d523869e4eb873fd1feb3a8fb903eea7cd5b8a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.563 units remaining)
+  - location: 9 (remaining gas: 1039992.518 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ]
-  - location: 9 (remaining gas: 1039992.553 units remaining)
+  - location: 9 (remaining gas: 1039992.508 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 10 (remaining gas: 1039992.543 units remaining)
+  - location: 10 (remaining gas: 1039992.498 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100)
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 11 (remaining gas: 1039992.533 units remaining)
+  - location: 11 (remaining gas: 1039992.488 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 12 (remaining gas: 1039992.533 units remaining)
+  - location: 12 (remaining gas: 1039992.488 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 14 (remaining gas: 1039992.523 units remaining)
+  - location: 14 (remaining gas: 1039992.478 units remaining)
     [ 100 ]
-  - location: 12 (remaining gas: 1039992.503 units remaining)
+  - location: 12 (remaining gas: 1039992.458 units remaining)
     [ "1970-01-01T00:01:40Z"
       100 ]
-  - location: 15 (remaining gas: 1039992.468 units remaining)
+  - location: 15 (remaining gas: 1039992.423 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 16 (remaining gas: 1039992.458 units remaining)
+  - location: 16 (remaining gas: 1039992.413 units remaining)
     [ {}
       "1970-01-01T00:00:00Z" ]
-  - location: 18 (remaining gas: 1039992.448 units remaining)
+  - location: 18 (remaining gas: 1039992.403 units remaining)
     [ (Pair {} "1970-01-01T00:00:00Z") ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out
index 86f92c5173810c4733c9d9b0f8bf9138c09321be..bf3f8015eac7a889a235ca6b477b98f6e646eb32 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.563 units remaining)
+  - location: 9 (remaining gas: 1039992.518 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ]
-  - location: 9 (remaining gas: 1039992.553 units remaining)
+  - location: 9 (remaining gas: 1039992.508 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 10 (remaining gas: 1039992.543 units remaining)
+  - location: 10 (remaining gas: 1039992.498 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000)
       (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 11 (remaining gas: 1039992.533 units remaining)
+  - location: 11 (remaining gas: 1039992.488 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 12 (remaining gas: 1039992.533 units remaining)
+  - location: 12 (remaining gas: 1039992.488 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 14 (remaining gas: 1039992.523 units remaining)
+  - location: 14 (remaining gas: 1039992.478 units remaining)
     [ 2000000000000000000 ]
-  - location: 12 (remaining gas: 1039992.503 units remaining)
+  - location: 12 (remaining gas: 1039992.458 units remaining)
     [ "1970-01-01T00:01:40Z"
       2000000000000000000 ]
-  - location: 15 (remaining gas: 1039992.468 units remaining)
+  - location: 15 (remaining gas: 1039992.423 units remaining)
     [ -1999999999999999900 ]
-  - location: 16 (remaining gas: 1039992.458 units remaining)
+  - location: 16 (remaining gas: 1039992.413 units remaining)
     [ {}
       -1999999999999999900 ]
-  - location: 18 (remaining gas: 1039992.448 units remaining)
+  - location: 18 (remaining gas: 1039992.403 units remaining)
     [ (Pair {} -1999999999999999900) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out
index 34f277ac41179d8fac59b3e50bf29e4e2dcba291..25051b1cab8538102a37a1cc0faa28366d23cf9f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out	
@@ -7,65 +7,65 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039983.005 units remaining)
+  - location: 12 (remaining gas: 1039982.870 units remaining)
     [ (Pair (Pair 2000000 1000000) None) ]
-  - location: 12 (remaining gas: 1039982.995 units remaining)
+  - location: 12 (remaining gas: 1039982.860 units remaining)
     [ (Pair 2000000 1000000) ]
-  - location: 13 (remaining gas: 1039982.985 units remaining)
+  - location: 13 (remaining gas: 1039982.850 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 14 (remaining gas: 1039982.975 units remaining)
+  - location: 14 (remaining gas: 1039982.840 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 15 (remaining gas: 1039982.965 units remaining)
+  - location: 15 (remaining gas: 1039982.830 units remaining)
     [ 2000000
       (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 16 (remaining gas: 1039982.965 units remaining)
+  - location: 16 (remaining gas: 1039982.830 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 18 (remaining gas: 1039982.955 units remaining)
+  - location: 18 (remaining gas: 1039982.820 units remaining)
     [ 1000000
       (Pair 2000000 1000000) ]
-  - location: 16 (remaining gas: 1039982.935 units remaining)
+  - location: 16 (remaining gas: 1039982.800 units remaining)
     [ 2000000
       1000000
       (Pair 2000000 1000000) ]
-  - location: 19 (remaining gas: 1039982.915 units remaining)
+  - location: 19 (remaining gas: 1039982.780 units remaining)
     [ 3000000
       (Pair 2000000 1000000) ]
-  - location: 20 (remaining gas: 1039982.915 units remaining)
+  - location: 20 (remaining gas: 1039982.780 units remaining)
     [ (Pair 2000000 1000000) ]
-  - location: 22 (remaining gas: 1039982.905 units remaining)
+  - location: 22 (remaining gas: 1039982.770 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 23 (remaining gas: 1039982.895 units remaining)
+  - location: 23 (remaining gas: 1039982.760 units remaining)
     [ 2000000
       (Pair 2000000 1000000) ]
-  - location: 24 (remaining gas: 1039982.895 units remaining)
+  - location: 24 (remaining gas: 1039982.760 units remaining)
     [ (Pair 2000000 1000000) ]
-  - location: 26 (remaining gas: 1039982.885 units remaining)
+  - location: 26 (remaining gas: 1039982.750 units remaining)
     [ 1000000 ]
-  - location: 24 (remaining gas: 1039982.865 units remaining)
+  - location: 24 (remaining gas: 1039982.730 units remaining)
     [ 2000000
       1000000 ]
-  - location: 27 (remaining gas: 1039982.850 units remaining)
+  - location: 27 (remaining gas: 1039982.715 units remaining)
     [ (Some 1000000) ]
-  - location: 29 (remaining gas: 1039982.850 units remaining)
+  - location: 29 (remaining gas: 1039982.715 units remaining)
     [ 1000000 ]
-  - location: 29 (remaining gas: 1039982.840 units remaining)
+  - location: 29 (remaining gas: 1039982.705 units remaining)
     [ 1000000 ]
-  - location: 20 (remaining gas: 1039982.820 units remaining)
+  - location: 20 (remaining gas: 1039982.685 units remaining)
     [ 3000000
       1000000 ]
-  - location: 35 (remaining gas: 1039982.810 units remaining)
+  - location: 35 (remaining gas: 1039982.675 units remaining)
     [ (Pair 3000000 1000000) ]
-  - location: 36 (remaining gas: 1039982.800 units remaining)
+  - location: 36 (remaining gas: 1039982.665 units remaining)
     [ (Some (Pair 3000000 1000000)) ]
-  - location: 37 (remaining gas: 1039982.790 units remaining)
+  - location: 37 (remaining gas: 1039982.655 units remaining)
     [ {}
       (Some (Pair 3000000 1000000)) ]
-  - location: 39 (remaining gas: 1039982.780 units remaining)
+  - location: 39 (remaining gas: 1039982.645 units remaining)
     [ (Pair {} (Some (Pair 3000000 1000000))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out
index 12400407a76cd702abd7ca2b1b137f7c5752ed5b..37390661961e31a8628f72c914cf2717dc38e195 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out	
@@ -7,65 +7,65 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039983.005 units remaining)
+  - location: 12 (remaining gas: 1039982.870 units remaining)
     [ (Pair (Pair 2310000 1010000) None) ]
-  - location: 12 (remaining gas: 1039982.995 units remaining)
+  - location: 12 (remaining gas: 1039982.860 units remaining)
     [ (Pair 2310000 1010000) ]
-  - location: 13 (remaining gas: 1039982.985 units remaining)
+  - location: 13 (remaining gas: 1039982.850 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 14 (remaining gas: 1039982.975 units remaining)
+  - location: 14 (remaining gas: 1039982.840 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 15 (remaining gas: 1039982.965 units remaining)
+  - location: 15 (remaining gas: 1039982.830 units remaining)
     [ 2310000
       (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 16 (remaining gas: 1039982.965 units remaining)
+  - location: 16 (remaining gas: 1039982.830 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 18 (remaining gas: 1039982.955 units remaining)
+  - location: 18 (remaining gas: 1039982.820 units remaining)
     [ 1010000
       (Pair 2310000 1010000) ]
-  - location: 16 (remaining gas: 1039982.935 units remaining)
+  - location: 16 (remaining gas: 1039982.800 units remaining)
     [ 2310000
       1010000
       (Pair 2310000 1010000) ]
-  - location: 19 (remaining gas: 1039982.915 units remaining)
+  - location: 19 (remaining gas: 1039982.780 units remaining)
     [ 3320000
       (Pair 2310000 1010000) ]
-  - location: 20 (remaining gas: 1039982.915 units remaining)
+  - location: 20 (remaining gas: 1039982.780 units remaining)
     [ (Pair 2310000 1010000) ]
-  - location: 22 (remaining gas: 1039982.905 units remaining)
+  - location: 22 (remaining gas: 1039982.770 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 23 (remaining gas: 1039982.895 units remaining)
+  - location: 23 (remaining gas: 1039982.760 units remaining)
     [ 2310000
       (Pair 2310000 1010000) ]
-  - location: 24 (remaining gas: 1039982.895 units remaining)
+  - location: 24 (remaining gas: 1039982.760 units remaining)
     [ (Pair 2310000 1010000) ]
-  - location: 26 (remaining gas: 1039982.885 units remaining)
+  - location: 26 (remaining gas: 1039982.750 units remaining)
     [ 1010000 ]
-  - location: 24 (remaining gas: 1039982.865 units remaining)
+  - location: 24 (remaining gas: 1039982.730 units remaining)
     [ 2310000
       1010000 ]
-  - location: 27 (remaining gas: 1039982.850 units remaining)
+  - location: 27 (remaining gas: 1039982.715 units remaining)
     [ (Some 1300000) ]
-  - location: 29 (remaining gas: 1039982.850 units remaining)
+  - location: 29 (remaining gas: 1039982.715 units remaining)
     [ 1300000 ]
-  - location: 29 (remaining gas: 1039982.840 units remaining)
+  - location: 29 (remaining gas: 1039982.705 units remaining)
     [ 1300000 ]
-  - location: 20 (remaining gas: 1039982.820 units remaining)
+  - location: 20 (remaining gas: 1039982.685 units remaining)
     [ 3320000
       1300000 ]
-  - location: 35 (remaining gas: 1039982.810 units remaining)
+  - location: 35 (remaining gas: 1039982.675 units remaining)
     [ (Pair 3320000 1300000) ]
-  - location: 36 (remaining gas: 1039982.800 units remaining)
+  - location: 36 (remaining gas: 1039982.665 units remaining)
     [ (Some (Pair 3320000 1300000)) ]
-  - location: 37 (remaining gas: 1039982.790 units remaining)
+  - location: 37 (remaining gas: 1039982.655 units remaining)
     [ {}
       (Some (Pair 3320000 1300000)) ]
-  - location: 39 (remaining gas: 1039982.780 units remaining)
+  - location: 39 (remaining gas: 1039982.645 units remaining)
     [ (Pair {} (Some (Pair 3320000 1300000))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out"
index fe34347160dba01bbbb0f952580f1fb61ac94c0c..d24845001ee71cb6d58cc04d2f248e5a68c51fce 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out"	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039667.653 units remaining)
+  - location: 9 (remaining gas: 1039667.608 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ]
-  - location: 9 (remaining gas: 1039667.643 units remaining)
+  - location: 9 (remaining gas: 1039667.598 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ]
-  - location: 10 (remaining gas: 1039667.038 units remaining)
+  - location: 10 (remaining gas: 1039666.993 units remaining)
     [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ]
-  - location: 11 (remaining gas: 1039446.492 units remaining)
+  - location: 11 (remaining gas: 1039446.447 units remaining)
     [ 4000000000000 ]
-  - location: 12 (remaining gas: 1039446.492 units remaining)
+  - location: 12 (remaining gas: 1039446.447 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039236.106 units remaining)
+  - location: 14 (remaining gas: 1039236.061 units remaining)
     [ 20000000000000 ]
-  - location: 12 (remaining gas: 1039236.086 units remaining)
+  - location: 12 (remaining gas: 1039236.041 units remaining)
     [ 4000000000000
       20000000000000 ]
-  - location: 15 (remaining gas: 1039236.076 units remaining)
+  - location: 15 (remaining gas: 1039236.031 units remaining)
     [ (Pair 4000000000000 20000000000000) ]
-  - location: 16 (remaining gas: 1039236.066 units remaining)
+  - location: 16 (remaining gas: 1039236.021 units remaining)
     [ {}
       (Pair 4000000000000 20000000000000) ]
-  - location: 18 (remaining gas: 1039236.056 units remaining)
+  - location: 18 (remaining gas: 1039236.011 units remaining)
     [ (Pair {} 4000000000000 20000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out
index 8ea5490b4403485f098db5edcecba7f8707a356a..8ceb226253bb2a1b8f04ab099b936508959896c4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out
@@ -7,53 +7,53 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (remaining gas: 1039980.231 units remaining)
+  - location: 15 (remaining gas: 1039979.916 units remaining)
     [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
                   0x05070707070100000004746f746f020000000800030007000900010200000006000100020003)
             Unit) ]
-  - location: 15 (remaining gas: 1039980.221 units remaining)
+  - location: 15 (remaining gas: 1039979.906 units remaining)
     [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
             0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) ]
-  - location: 16 (remaining gas: 1039980.211 units remaining)
+  - location: 16 (remaining gas: 1039979.896 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 17 (remaining gas: 1039980.211 units remaining)
+  - location: 17 (remaining gas: 1039979.896 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 19 (remaining gas: 1039980.201 units remaining)
+  - location: 19 (remaining gas: 1039979.886 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 17 (remaining gas: 1039980.181 units remaining)
+  - location: 17 (remaining gas: 1039979.866 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 20 (remaining gas: 1039977.741 units remaining)
+  - location: 20 (remaining gas: 1039977.426 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 23 (remaining gas: 1039977.706 units remaining)
+  - location: 23 (remaining gas: 1039977.391 units remaining)
     [ 0
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 24 (remaining gas: 1039977.696 units remaining)
+  - location: 24 (remaining gas: 1039977.381 units remaining)
     [ True
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 25 (remaining gas: 1039977.696 units remaining)
+  - location: 25 (remaining gas: 1039977.381 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 25 (remaining gas: 1039977.686 units remaining)
+  - location: 25 (remaining gas: 1039977.371 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 31 (remaining gas: 1039974.948 units remaining)
+  - location: 31 (remaining gas: 1039974.633 units remaining)
     [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) ]
-  - location: 40 (remaining gas: 1039974.948 units remaining)
+  - location: 40 (remaining gas: 1039974.633 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ]
-  - location: 40 (remaining gas: 1039974.938 units remaining)
+  - location: 40 (remaining gas: 1039974.623 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ]
-  - location: 46 (remaining gas: 1039974.928 units remaining)
+  - location: 46 (remaining gas: 1039974.613 units remaining)
     [  ]
-  - location: 47 (remaining gas: 1039974.918 units remaining)
+  - location: 47 (remaining gas: 1039974.603 units remaining)
     [ Unit ]
-  - location: 48 (remaining gas: 1039974.908 units remaining)
+  - location: 48 (remaining gas: 1039974.593 units remaining)
     [ {}
       Unit ]
-  - location: 50 (remaining gas: 1039974.898 units remaining)
+  - location: 50 (remaining gas: 1039974.583 units remaining)
     [ (Pair {} Unit) ]
 
 Runtime error in contract [CONTRACT_HASH]:
@@ -68,38 +68,38 @@ At line 4 characters 14 to 26,
 script reached FAILWITH instruction
 with Unit
 trace
-  - location: 15 (remaining gas: 1039980.231 units remaining)
+  - location: 15 (remaining gas: 1039979.916 units remaining)
     [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
                   0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004)
             Unit) ]
-  - location: 15 (remaining gas: 1039980.221 units remaining)
+  - location: 15 (remaining gas: 1039979.906 units remaining)
     [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
             0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) ]
-  - location: 16 (remaining gas: 1039980.211 units remaining)
+  - location: 16 (remaining gas: 1039979.896 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 17 (remaining gas: 1039980.211 units remaining)
+  - location: 17 (remaining gas: 1039979.896 units remaining)
     [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 19 (remaining gas: 1039980.201 units remaining)
+  - location: 19 (remaining gas: 1039979.886 units remaining)
     [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 17 (remaining gas: 1039980.181 units remaining)
+  - location: 17 (remaining gas: 1039979.866 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 20 (remaining gas: 1039977.741 units remaining)
+  - location: 20 (remaining gas: 1039977.426 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 23 (remaining gas: 1039977.706 units remaining)
+  - location: 23 (remaining gas: 1039977.391 units remaining)
     [ -1
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 24 (remaining gas: 1039977.696 units remaining)
+  - location: 24 (remaining gas: 1039977.381 units remaining)
     [ False
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 25 (remaining gas: 1039977.696 units remaining)
+  - location: 25 (remaining gas: 1039977.381 units remaining)
     [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 29 (remaining gas: 1039977.686 units remaining)
+  - location: 29 (remaining gas: 1039977.371 units remaining)
     [ Unit
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
 Fatal error:
diff --git a/tezt/tests/expected/views.ml/Alpha- Run views.out b/tezt/tests/expected/views.ml/Alpha- Run views.out
index f9c4b06ee1b9095785f865880ed161c8fc3ba4e6..d9850471712fff41e7f9aeedf901301485df9182 100644
--- a/tezt/tests/expected/views.ml/Alpha- Run views.out	
+++ b/tezt/tests/expected/views.ml/Alpha- Run views.out	
@@ -88,7 +88,7 @@ code {
      }
    ' --init None --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 1448.165 units (will add 100 for safety)
+Estimated gas: 1448.210 units (will add 100 for safety)
 Estimated storage: 465 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'oomEQ4fr8YZ9WL8DigAEok4vcqCbXd4ooHiuuThJxAChAWyYNBH'
@@ -133,7 +133,7 @@ This sequence of operations was run:
           KT1NF5f9FWtVX4w23xt9hxvmyfa4gsbcQ8tX
         Storage size: 208 bytes
         Paid storage size diff: 208 bytes
-        Consumed gas: 1448.165
+        Consumed gas: 1448.210
         Balance updates:
           tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.052
           storage fees ........................... +ꜩ0.052
@@ -145,7 +145,7 @@ Contract memorized as check_caller.
 
 ./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1NF5f9FWtVX4w23xt9hxvmyfa4gsbcQ8tX --burn-cap 1 --arg '"KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"'
 Node is bootstrapped.
-Estimated gas: 4413.659 units (will add 100 for safety)
+Estimated gas: 4413.704 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is 'opLqAhX2JyHnvXaR1YmpqgSTgNma4yuatH3ZE4hSga1ECtyhEJq'
@@ -171,7 +171,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: None
       Storage size: 208 bytes
-      Consumed gas: 4414.400
+      Consumed gas: 4414.445
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1
         KT1NF5f9FWtVX4w23xt9hxvmyfa4gsbcQ8tX ... +ꜩ1
@@ -215,7 +215,7 @@ This sequence of operations was run:
 
 ./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1NF5f9FWtVX4w23xt9hxvmyfa4gsbcQ8tX --burn-cap 1 --arg '"KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"'
 Node is bootstrapped.
-Estimated gas: 4416.916 units (will add 100 for safety)
+Estimated gas: 4416.961 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 'oogwwFSWXWWhRkinAJTgvwobyhUZgrgfmHooA4ciQV4b4Ji9tEL'
@@ -242,7 +242,7 @@ This sequence of operations was run:
       Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78)
       Storage size: 235 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 4417.657
+      Consumed gas: 4417.702
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675