From de79c859aa443b56bb652509e0241c8ef1778a7a Mon Sep 17 00:00:00 2001
From: Jun Furuse <jun.furuse@dailambda.jp>
Date: Sun, 10 Sep 2023 01:06:31 +0900
Subject: [PATCH] Proto: updates the gas code for Michelson_v1_gas

---
 .../lib_protocol/gas_parameters.json          |   4 +-
 .../lib_protocol/michelson_v1_gas.ml          |   6 +-
 .../lib_protocol/michelson_v1_gas_costs.ml    | 153 ------------------
 .../michelson_v1_gas_costs_generated.ml       | 103 ++++++++++++
 ... add-approve-transfer-remove liquidity.out |  38 ++---
 .../Alpha- Test trades.out                    |  38 ++---
 ...hain opcodes- test_big_map_origination.out |   4 +-
 ...- Contract onchain opcodes- test_slice.out |   4 +-
 ...act onchain opcodes- test_split_string.out |   8 +-
 ...ract onchain opcodes- test_store_input.out |  12 +-
 ...nat--storage495706788--input453441034-.out |   2 +-
 ..._nat--storage56274299--input453441034-.out |   2 +-
 ..._nat--storage56274299--input564400327-.out |   2 +-
 ..._nat--storage56274299--input654274102-.out |   2 +-
 ...nat--storage690637660--input453441034-.out |   4 +-
 ...nat--storage806237530--input453441034-.out |   4 +-
 ...ng--storage109689253--input1071610051-.out |   2 +-
 ...ing--storage109689253--input700475845-.out |   2 +-
 ...ing--storage109689253--input905318451-.out |   2 +-
 ...ing--storage495706788--input700475845-.out |   4 +-
 ...ing--storage915708427--input700475845-.out |   4 +-
 ...ing--storage936682951--input905318451-.out |   4 +-
 ...t-2--storage921624073--input186507116-.out |   2 +-
 ...are--storage125992234--input125992234-.out |   2 +-
 ...llo--storage457300675--input392583650-.out |   2 +-
 ...llo--storage457300675--input457300675-.out |   2 +-
 ...llo--storage457300675--input640104625-.out |   2 +-
 ...list--storage79230375--input264787654-.out |   2 +-
 ...list--storage79230375--input316676251-.out |   2 +-
 ...list--storage79230375--input457300675-.out |   2 +-
 ...all--storage921624073--input315650912-.out |   6 +-
 ..._all--storage921624073--input51111414-.out |  16 +-
 ...all--storage921624073--input545734274-.out |   6 +-
 ...all--storage921624073--input917967660-.out |  16 +-
 ...all--storage921624073--input964818218-.out |   6 +-
 ...mit--storage125992234--input125992234-.out |   2 +-
 ...map--storage457300675--input125992234-.out |   4 +-
 ...cat--storage398998998--input246262487-.out |   2 +-
 ...ncat--storage398998998--input79230375-.out |   2 +-
 ...ap--storage1026405794--input329240220-.out |   4 +-
 ...map--storage382368661--input329240220-.out |   4 +-
 ...map--storage496578814--input329240220-.out |   4 +-
 ...map--storage496578814--input507231566-.out |   4 +-
 ...map--storage547821324--input329240220-.out |   4 +-
 ...map--storage796012494--input156280093-.out |   4 +-
 ...map--storage796012494--input228164856-.out |   4 +-
 ...lue--storage139236239--input329240220-.out |   4 +-
 ...alue--storage139236239--input79230375-.out |   4 +-
 ...lue--storage329396864--input156280093-.out |   4 +-
 ...tring--storage151303925--input3431716-.out |   2 +-
 ...ing--storage151303925--input535018041-.out |   2 +-
 ...ome--storage398998998--input288201633-.out |   2 +-
 ...ome--storage398998998--input921624073-.out |   2 +-
 ...right--storage4177631--input202098045-.out |   2 +-
 ..._right--storage4177631--input44576556-.out |   2 +-
 ...cat--storage717096222--input457300675-.out |   2 +-
 ...cat--storage717096222--input546523343-.out |   2 +-
 ..._id--storage528921618--input264787654-.out |   2 +-
 ..._id--storage528921618--input457300675-.out |   2 +-
 ..._id--storage528921618--input656499821-.out |   2 +-
 ...map--storage528921618--input264787654-.out |   2 +-
 ...map--storage528921618--input457300675-.out |   2 +-
 ...map--storage528921618--input656499821-.out |   2 +-
 ...eft--storage528921618--input457300675-.out |   2 +-
 ...eft--storage528921618--input851203613-.out |   2 +-
 ...id--storage457300675--input1027566226-.out |   2 +-
 ..._id--storage457300675--input276660554-.out |   2 +-
 ..._id--storage457300675--input599923743-.out |   2 +-
 ...er--storage1011138251--input403579222-.out |   2 +-
 ...er--storage1011138251--input532072758-.out |   2 +-
 ...map--storage794999348--input152441147-.out |   6 +-
 ..._map--storage88008216--input798141440-.out |   4 +-
 ...nat--storage495706788--input453441034-.out |   2 +-
 ..._nat--storage56274299--input453441034-.out |   4 +-
 ..._nat--storage56274299--input564400327-.out |   4 +-
 ..._nat--storage56274299--input654274102-.out |   4 +-
 ...nat--storage690637660--input453441034-.out |   4 +-
 ...nat--storage806237530--input453441034-.out |   4 +-
 ...ng--storage109689253--input1071610051-.out |   4 +-
 ...ing--storage109689253--input700475845-.out |   4 +-
 ...ing--storage109689253--input905318451-.out |   4 +-
 ...ing--storage495706788--input700475845-.out |   4 +-
 ...ing--storage915708427--input700475845-.out |   4 +-
 ...ing--storage936682951--input905318451-.out |   4 +-
 ...size--storage492856247--input15265129-.out |   2 +-
 ...ize--storage492856247--input158311065-.out |   2 +-
 ...ize--storage492856247--input456982702-.out |   2 +-
 ...mul--storage125992234--input125992234-.out |   8 +-
 ...rev--storage125992234--input305844558-.out |   4 +-
 ...rev--storage125992234--input646365167-.out |   4 +-
 ...ty--storage125992234--input1028781121-.out |   6 +-
 ...rse--storage528921618--input457300675-.out |   2 +-
 ...rse--storage528921618--input851203613-.out |   2 +-
 ...oop--storage528921618--input457300675-.out |   2 +-
 ...oop--storage528921618--input851203613-.out |   2 +-
 ...car--storage224747103--input620760059-.out |   2 +-
 ...car--storage224747103--input717096222-.out |   2 +-
 ..._car--storage224747103--input79230375-.out |   2 +-
 ...cdr--storage205576101--input654274102-.out |   2 +-
 ...cdr--storage224747103--input453441034-.out |   2 +-
 ...cdr--storage611418174--input967284912-.out |   2 +-
 ..._id--storage457300675--input264787654-.out |   2 +-
 ..._id--storage457300675--input989507347-.out |   2 +-
 ...ter--storage492856247--input701684511-.out |   2 +-
 ...ter--storage492856247--input802622031-.out |   2 +-
 ...mber--storage495706788--input33757838-.out |   4 +-
 ...mber--storage550087893--input79230375-.out |   4 +-
 ...mber--storage605111220--input33757838-.out |   4 +-
 ...ize--storage492856247--input403499055-.out |   2 +-
 ...ize--storage492856247--input469078912-.out |   2 +-
 ...ize--storage492856247--input802622031-.out |   2 +-
 ...lice--storage351480851--input65907686-.out |   2 +-
 ...ice--storage364922380--input198821575-.out |   2 +-
 ...ice--storage364922380--input359592843-.out |   2 +-
 ...ice--storage364922380--input551316239-.out |   2 +-
 ...ice--storage364922380--input722749044-.out |   2 +-
 ...ice--storage364922380--input839234860-.out |   2 +-
 ...ice--storage364922380--input919180079-.out |   2 +-
 ...id--storage921624073--input1016369050-.out |   2 +-
 ...r_id--storage921624073--input93477117-.out |   2 +-
 ...Michelson opcodes- big_map_contract_io.out |  66 ++++----
 ...est Michelson opcodes- check_signature.out |   4 +-
 ...Michelson opcodes- map_map_side_effect.out |  10 +-
 ...a- test Michelson opcodes- pack_unpack.out |   6 +-
 .../Alpha- Tc scripts.out                     | 138 ++++++++--------
 ...lpha- hash data ... of type ... (good).out |  12 +-
 .../Alpha- Ticket updates in receipt.out      |   6 +-
 .../Alpha- Create and remove tickets.out      |  16 +-
 ...rt-contract rollup should succeed with.out |   4 +-
 ...rom implicit accounts must be rejected.out |  12 +-
 ...inated contracts and implicit accounts.out |  26 +--
 ... implicit accounts with some Tez along.out |   8 +-
 ...icit accounts with the wrong type must.out |   8 +-
 ...ts from contracts to implicit accounts.out |   8 +-
 .../Alpha- Send tickets in bigmap.out         |  10 +-
 ... contract storage to implicit accounts.out |  22 +--
 ...rom implicit accounts must be rejected.out |   8 +-
 ...rt-contract rollup should succeed with.out |   4 +-
 ...accounts or originated contracts accep.out |  12 +-
 ...rom implicit accounts must be rejected.out |  12 +-
 ... tx kernel should run e2e (kernel_e2e).out |   8 +-
 .../expected/views.ml/Alpha- Run views.out    |  20 +--
 142 files changed, 540 insertions(+), 590 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/gas_parameters.json b/src/proto_alpha/lib_protocol/gas_parameters.json
index d6a512f7be66..70c0bc74e595 100644
--- a/src/proto_alpha/lib_protocol/gas_parameters.json
+++ b/src/proto_alpha/lib_protocol/gas_parameters.json
@@ -457,8 +457,8 @@
     "translator/Parsing_Data_size_int_bytes": 16.14268057774883,
     "translator/Parsing_Data_size_string_bytes": 68.94873206863673,
     "translator/Parsing_Data_size_traversal": 80.36344489900098,
-    "translator/TY_EQ/coeff": 60,
-    "translator/TY_EQ/intercept": 0,
+    "translator/TY_EQ/coeff": 21.8805791266,
+    "translator/TY_EQ/intercept": 31.1882471167,
     "translator/UNPARSE_TYPE/coeff": 20,
     "translator/UNPARSE_TYPE/intercept": 0,
     "translator/Unparsing_Code_gas_coeff": 0.5923099246608585,
diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
index 0866f4ab1924..0551852e986f 100644
--- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
+++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
@@ -595,20 +595,20 @@ module Cost_of = struct
     let map_mem (type k v) (elt : k) (map : (k, v) Script_typed_ir.map) =
       let (module Box) = Script_map.get_module map in
       let per_elt_cost = Box.OPS.key_size elt in
-      Michelson_v1_gas_costs.cost_N_IMap_mem' per_elt_cost Box.size
+      Michelson_v1_gas_costs.cost_N_IMap_mem per_elt_cost Box.size
 
     let map_get = map_mem
 
     let map_update (type k v) (elt : k) (map : (k, v) Script_typed_ir.map) =
       let (module Box) = Script_map.get_module map in
       let per_elt_cost = Box.OPS.key_size elt in
-      Michelson_v1_gas_costs.cost_N_IMap_update' per_elt_cost Box.size
+      Michelson_v1_gas_costs.cost_N_IMap_update per_elt_cost Box.size
 
     let map_get_and_update (type k v) (elt : k)
         (map : (k, v) Script_typed_ir.map) =
       let (module Box) = Script_map.get_module map in
       let per_elt_cost = Box.OPS.key_size elt in
-      Michelson_v1_gas_costs.cost_N_IMap_get_and_update' per_elt_cost Box.size
+      Michelson_v1_gas_costs.cost_N_IMap_get_and_update per_elt_cost Box.size
 
     let view_get (elt : Script_string.t) (m : Script_typed_ir.view_map) =
       map_get elt m
diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs.ml
index 9111c142b919..fc383be25ba6 100644
--- a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs.ml
+++ b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs.ml
@@ -37,13 +37,6 @@ module S = Saturation_repr
    be replaced by the generated versions.
 *)
 
-(* generated code is not usable: not possible to generate the same coeff *)
-(* model N_IPairing_check_bls12_381 *)
-(* when benchmarking, compile bls12-381 without ADX *)
-let cost_N_IPairing_check_bls12_381 size =
-  let open S.Syntax in
-  S.safe_int 450_000 + (S.safe_int 342_500 * S.safe_int size)
-
 (* generated code is not usable: the const is not on a grid point *)
 (* model N_ILsl_nat *)
 (* Allocates at most [size + 256] bytes *)
@@ -52,13 +45,6 @@ let cost_N_ILsl_nat size =
   let v0 = S.safe_int size in
   S.safe_int 128 + (v0 lsr 1)
 
-(* generated code is not usable: the const is not on a grid point *)
-(* model CHECK_PRINTABLE *)
-(* Inferred: fun size -> (0. + (1.42588022179 * size)) *)
-let cost_CHECK_PRINTABLE size =
-  let open S.Syntax in
-  S.safe_int 14 + (S.safe_int 10 * S.safe_int size)
-
 (* generated code is not usable: the actual code and the model differ *)
 (* model N_ILsl_bytes *)
 (* Allocates [size + shift / 8] bytes *)
@@ -69,138 +55,6 @@ let cost_N_ILsl_bytes size shift =
   let v0 = S.safe_int shift in
   S.safe_int 65 + (v1 lsr 1) + (v1 lsr 2) + (v0 lsr 4)
 
-(* generated code is not usable: the actual code and the model differ *)
-(* Model N_ICompare *)
-(* Approximating 0.024413 x term *)
-let cost_N_ICompare size1 size2 =
-  let open S.Syntax in
-  let v0 = S.safe_int (Compare.Int.min size1 size2) in
-  S.safe_int 35 + ((v0 lsr 6) + (v0 lsr 7))
-
-(* generated code is not usable: the actual code and the model differ *)
-(* used for big_map_get *)
-(* model N_IMap_get *)
-(* Approximating 0.048359 x term *)
-let cost_N_IMap_get size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let v0 = size1 * log2 size2 in
-  S.safe_int 45 + (v0 lsr 5) + (v0 lsr 6)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* used for big_map_get_and_update *)
-(* model N_IMap_get_and_update *)
-(* Approximating 0.145661 x term *)
-let cost_N_IMap_get_and_update size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let v0 = size1 * log2 size2 in
-  S.safe_int 75 + (v0 lsr 3) + (v0 lsr 6)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* used for map_get_and_update *)
-(* model N_IMap_get_and_update *)
-let cost_N_IMap_get_and_update' size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let intercept = S.safe_int 80 in
-  (* The 3 factor reflects the update vs mem overhead as benchmarked
-     on non-structured data *)
-  intercept + (S.safe_int 3 * log2 size2 * size1)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* used for bigmap_update *)
-(* model N_IMap_update *)
-(* Approximating 0.097072 x term *)
-let cost_N_IMap_update size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let v0 = size1 * log2 size2 in
-  S.safe_int 55 + (v0 lsr 4) + (v0 lsr 5)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* used for map_update *)
-(* model N_IMap_update *)
-let cost_N_IMap_update' size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let intercept = S.safe_int 80 in
-  (* The 2 factor reflects the update vs mem overhead as benchmarked
-     on non-structured data *)
-  intercept + (S.safe_int 2 * log2 size2 * size1)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* used for bigmap_mem *)
-(* model N_IMap_mem *)
-(* Approximating 0.048446 x term *)
-let cost_N_IMap_mem size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let v0 = size1 * log2 size2 in
-  S.safe_int 45 + (v0 lsr 5) + (v0 lsr 6)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* used for map_mem *)
-(* model N_IMap_mem *)
-let cost_N_IMap_mem' size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let intercept = S.safe_int 80 in
-  intercept + (log2 size2 * size1)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* model interpreter/N_ISet_mem *)
-let cost_N_ISet_mem size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let intercept = S.safe_int 115 in
-  intercept + (log2 size2 * size1)
-
-(* generated code is not usable: the actual code and the model differ *)
-let cost_N_ISet_update size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let intercept = S.safe_int 130 in
-  (* The 2 factor reflects the update vs mem overhead as benchmarked
-     on non-structured data *)
-  intercept + (S.safe_int 2 * log2 size2 * size1)
-
-let cost_mul size1 size2 =
-  let open S.Syntax in
-  let a = S.safe_int size1 + S.safe_int size2 in
-  let v0 = a * log2 a in
-  S.safe_int 55 + (v0 lsr 1) + (v0 lsr 2) + (v0 lsr 4)
-
-(* generated code is not usable: the actual code and the model differ *)
-(* model N_IMul_int *)
-(* Approximating 0.857931 x term *)
-let cost_N_IMul_int = cost_mul
-
-(* generated code is not usable: the actual code and the model differ *)
-(* model N_IMul_nat *)
-(* Approximating 0.861823 x term *)
-let cost_N_IMul_nat = cost_mul
-
-(* generated code is not usable: not possible to generate the same coeff *)
-(* model interpreter/N_ISapling_verify_update *)
-(* fun size1 -> fun size2 -> ((432200.469784 + (5738377.05148 * size1)) + (4634026.28586 * size2)) *)
-let cost_N_ISapling_verify_update size1 size2 =
-  let open S.Syntax in
-  let size1 = S.safe_int size1 in
-  let size2 = S.safe_int size2 in
-  let v1 = size1 in
-  let v0 = size2 in
-  S.safe_int 432500 + (v1 * S.safe_int 5740000) + (v0 * S.safe_int 4635000)
-
 (* ------------------------------------------------------------------------ *)
 
 (* N_ISapling_verify_update_with_blake2b
@@ -238,13 +92,6 @@ let cost_N_KList_enter_body xs size_ys =
       S.safe_int 30 + (v0 + (v0 lsr 1) + (v0 lsr 2) + (v0 lsr 4))
   | _ :: _ -> S.safe_int 30
 
-(* model translator/TY_EQ *)
-(* fun size -> (31.1882471167 + (21.8805791266 * size)) *)
-let cost_TY_EQ size =
-  let open S.Syntax in
-  let v0 = size in
-  S.safe_int 35 + (v0 * S.safe_int 22)
-
 (* model PARSE_TYPE
    This is the cost of one iteration of parse_ty, extracted by hand from the
    parameter fit for the PARSE_TYPE benchmark. *)
diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml
index 82f20fc91f64..f0a937dcbd50 100644
--- a/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml
+++ b/src/proto_alpha/lib_protocol/michelson_v1_gas_costs_generated.ml
@@ -121,6 +121,13 @@ let cost_BLS_FR_FROM_Z = S.safe_int 180
 (* 82.8933333333 *)
 let cost_BLS_FR_TO_Z = S.safe_int 85
 
+(* model encoding/CHECK_PRINTABLE *)
+(* fun size -> (14. + (10. * size)) *)
+let cost_CHECK_PRINTABLE size =
+  let size = S.safe_int size in
+  let v0 = size in
+  S.safe_int 15 + (v0 * S.safe_int 10)
+
 (* model encoding/DECODING_BLS_FR *)
 (* 120. *)
 let cost_DECODING_BLS_FR = S.safe_int 120
@@ -506,6 +513,14 @@ let cost_N_IComb_set size =
   let v0 = size in
   S.safe_int 30 + ((v0 lsr 5) + ((v0 lsr 2) + v0))
 
+(* model interpreter/N_ICompare *)
+(* fun size1 -> fun size2 -> (35. + (0.0234375 * (sat_sub (min size1 size2) 1))) *)
+let cost_N_ICompare size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v0 = S.sub (S.min size1 size2) (S.safe_int 1) in
+  S.safe_int 35 + ((v0 lsr 6) + (v0 lsr 7))
+
 (* model interpreter/N_IConcat_bytes_pair *)
 (* fun size1 -> fun size2 -> 45. + (0.5 * (size1 + size2)) *)
 let cost_N_IConcat_bytes_pair size1 size2 =
@@ -815,6 +830,22 @@ let cost_N_ILsr_nat size =
 (* 10. *)
 let cost_N_ILt = S.safe_int 10
 
+(* model interpreter/N_IMap_get *)
+(* fun size1 -> fun size2 -> (45. + (0.046875 * (size1 * (log2 (1 + size2))))) *)
+let cost_N_IMap_get size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v0 = size1 * log2 (S.safe_int 1 + size2) in
+  S.safe_int 45 + ((v0 lsr 5) + (v0 lsr 6))
+
+(* model interpreter/N_IMap_get_and_update *)
+(* fun size1 -> fun size2 -> (75. + (0.140625 * (size1 * (log2 (1 + size2))))) *)
+let cost_N_IMap_get_and_update size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v0 = size1 * log2 (S.safe_int 1 + size2) in
+  S.safe_int 75 + ((v0 lsr 3) + (v0 lsr 6))
+
 (* model interpreter/N_IMap_iter *)
 (* fun size -> 50. + (7.625 * size) *)
 let cost_N_IMap_iter size =
@@ -829,10 +860,26 @@ let cost_N_IMap_map size =
   let v0 = size in
   S.safe_int 40 + ((v0 lsr 1) + (v0 * S.safe_int 8))
 
+(* model interpreter/N_IMap_mem *)
+(* fun size1 -> fun size2 -> (45. + (0.046875 * (size1 * (log2 (1 + size2))))) *)
+let cost_N_IMap_mem size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v0 = size1 * log2 (S.safe_int 1 + size2) in
+  S.safe_int 45 + ((v0 lsr 5) + (v0 lsr 6))
+
 (* model interpreter/N_IMap_size *)
 (* 10. *)
 let cost_N_IMap_size = S.safe_int 10
 
+(* model interpreter/N_IMap_update *)
+(* fun size1 -> fun size2 -> (55. + (0.09375 * (size1 * (log2 (1 + size2))))) *)
+let cost_N_IMap_update size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v0 = size1 * log2 (S.safe_int 1 + size2) in
+  S.safe_int 55 + ((v0 lsr 4) + (v0 lsr 5))
+
 (* model interpreter/N_IMin_block_time *)
 (* 20. *)
 let cost_N_IMin_block_time = S.safe_int 20
@@ -863,6 +910,24 @@ let cost_N_IMul_bls12_381_z_fr size =
   let v0 = size in
   S.safe_int 265 + ((v0 lsr 4) + v0)
 
+(* model interpreter/N_IMul_int *)
+(* fun size1 -> fun size2 -> let a = (size1 + size2) in ((0.8125 * (a * (log2 (1 + a)))) + 55.) *)
+let cost_N_IMul_int size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let a = size1 + size2 in
+  let v0 = a * log2 (S.safe_int 1 + a) in
+  (v0 lsr 1) + (v0 lsr 2) + (v0 lsr 4) + S.safe_int 55
+
+(* model interpreter/N_IMul_nat *)
+(* fun size1 -> fun size2 -> let a = (size1 + size2) in ((0.8125 * (a * (log2 (1 + a)))) + 55.) *)
+let cost_N_IMul_nat size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let a = size1 + size2 in
+  let v0 = a * log2 (S.safe_int 1 + a) in
+  (v0 lsr 1) + (v0 lsr 2) + (v0 lsr 4) + S.safe_int 55
+
 (* model interpreter/N_IMul_nattez *)
 (* 50. *)
 let cost_N_IMul_nattez = S.safe_int 50
@@ -971,6 +1036,13 @@ let cost_N_IOr_nat size1 size2 =
   let v0 = S.max size1 size2 in
   S.safe_int 35 + (v0 lsr 1)
 
+(* model interpreter/N_IPairing_check_bls12_381 *)
+(* fun size -> (450000. + (342500. * size)) *)
+let cost_N_IPairing_check_bls12_381 size =
+  let size = S.safe_int size in
+  let v0 = size in
+  S.safe_int 450000 + (v0 * S.safe_int 344064)
+
 (* model interpreter/N_IPush *)
 (* 10. *)
 let cost_N_IPush = S.safe_int 10
@@ -987,6 +1059,15 @@ let cost_N_IRight = S.safe_int 10
 (* 300. *)
 let cost_N_ISapling_empty_state = S.safe_int 300
 
+(* model interpreter/N_ISapling_verify_update *)
+(* fun size1 -> fun size2 -> ((432500. + (5740000. * size1)) + (4636500. * size2)) *)
+let cost_N_ISapling_verify_update size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v1 = size1 in
+  let v0 = size2 in
+  S.safe_int 432500 + (v1 * S.safe_int 5767168) + (v0 * S.safe_int 4718592)
+
 (* model interpreter/N_ISelf *)
 (* 10. *)
 let cost_N_ISelf = S.safe_int 10
@@ -1010,10 +1091,26 @@ let cost_N_ISet_iter size =
   let v0 = size in
   S.safe_int 50 + ((v0 lsr 3) + ((v0 lsr 1) + (v0 * S.safe_int 7)))
 
+(* model interpreter/N_ISet_mem *)
+(* fun size1 -> fun size2 -> (39.3805426747 + (0.0564536354586 * (size1 * (log2 (1 + size2))))) *)
+let cost_N_ISet_mem size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v0 = size1 * log2 (S.safe_int 1 + size2) in
+  S.safe_int 40 + ((v0 lsr 5) + (v0 lsr 6) + (v0 lsr 7) + (v0 lsr 9))
+
 (* model interpreter/N_ISet_size *)
 (* 10. *)
 let cost_N_ISet_size = S.safe_int 10
 
+(* model interpreter/N_ISet_update *)
+(* fun size1 -> fun size2 -> (49.8905426747 + (0.140036207663 * (size1 * (log2 (1 + size2))))) *)
+let cost_N_ISet_update size1 size2 =
+  let size1 = S.safe_int size1 in
+  let size2 = S.safe_int size2 in
+  let v0 = size1 * log2 (S.safe_int 1 + size2) in
+  S.safe_int 50 + ((v0 lsr 3) + (v0 lsr 6))
+
 (* model interpreter/N_ISha256 *)
 (* fun size -> 600. + (4.75 * size) *)
 let cost_N_ISha256 size =
@@ -1255,6 +1352,12 @@ let cost_Parsing_Data_size size1 size2 size3 =
   + ((v1 lsr 1) + (v1 * S.safe_int 16))
   + (v0 * S.safe_int 70)
 
+(* model translator/TY_EQ *)
+(* fun size -> (31.1882471167 + (21.8805791266 * size)) *)
+let cost_TY_EQ size =
+  let v0 = size in
+  S.safe_int 35 + (v0 * S.safe_int 22)
+
 (* model translator/UNPARSE_TYPE *)
 (* fun size -> 0. + (20. * size) *)
 let cost_UNPARSE_TYPE size =
diff --git a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out
index b937d210a661..cd9ec1cd3f98 100644
--- a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out	
+++ b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test add-approve-transfer-remove liquidity.out	
@@ -11,7 +11,7 @@ Pair 1
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint mintOrBurn --arg '(Pair 100000000 "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2375.506 units (will add 100 for safety)
+Estimated gas: 2375.517 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'opNV92qwY7YfY6exkBrJqnJyotKXFbxHdXEk7xNQFNsPRQ7TEjF'
@@ -42,7 +42,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2375.870
+      Consumed gas: 2375.881
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -50,7 +50,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2377.209 units (will add 100 for safety)
+Estimated gas: 2377.220 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'op968yui6vHCCztECXMB24FEWbMUHed9jQkXbhL5WGM8wXJw96Q'
@@ -82,7 +82,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2053 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.573
+      Consumed gas: 2377.584
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -90,7 +90,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap2 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2377.209 units (will add 100 for safety)
+Estimated gas: 2377.220 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'op8vSFsuf9xDtpELfAXrAD31oBWvx4kvW2QWoEBUKqsiADKYgZB'
@@ -122,7 +122,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2124 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.573
+      Consumed gas: 2377.584
       Balance updates:
         tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -130,7 +130,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap3 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2377.209 units (will add 100 for safety)
+Estimated gas: 2377.220 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'opG2xrHRo7XfsfQ6ury6ArfyEJ7SbyhGtpuMS5nTuqjV78pJbh8'
@@ -162,7 +162,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2195 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.573
+      Consumed gas: 2377.584
       Balance updates:
         tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -170,7 +170,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 9001 from bootstrap1 to KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 --burn-cap 10 --entrypoint addLiquidity --arg '(Pair "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" 0 1000000000 "2050-01-01T00:00:00Z")'
 Node is bootstrapped.
-Estimated gas: 9497.441 units (will add 100 for safety)
+Estimated gas: 9497.488 units (will add 100 for safety)
 Estimated storage: 147 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'onsvTjspvs6n3R9fbuQ1ZDvzEibrTJyZaxvrn4hwAEz135CrT5k'
@@ -227,7 +227,7 @@ This sequence of operations was run:
             Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 21598
           Storage size: 2264 bytes
           Paid storage size diff: 69 bytes
-          Consumed gas: 3690.945
+          Consumed gas: 3690.965
           Balance updates:
             tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01725
             storage fees ........................... +ꜩ0.01725
@@ -244,7 +244,7 @@ This sequence of operations was run:
             Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2159730
           Storage size: 2050 bytes
           Paid storage size diff: 72 bytes
-          Consumed gas: 2300.339
+          Consumed gas: 2300.350
           Balance updates:
             tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.018
             storage fees ........................... +ꜩ0.018
@@ -252,7 +252,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1AafHA1C1vk959wvHWBispY9Y2f3fxBUUo from bootstrap1 --entrypoint approve --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 1000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2376.988 units (will add 100 for safety)
+Estimated gas: 2376.999 units (will add 100 for safety)
 Estimated storage: 68 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'ootV3zW3k66DvpHiUBoAVhb5dvGaFXD1vFcjNiHvLTJhpSTvk41'
@@ -284,7 +284,7 @@ This sequence of operations was run:
               0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] to 1000
       Storage size: 2118 bytes
       Paid storage size diff: 68 bytes
-      Consumed gas: 2377.351
+      Consumed gas: 2377.362
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.017
         storage fees ........................... +ꜩ0.017
@@ -292,7 +292,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1AafHA1C1vk959wvHWBispY9Y2f3fxBUUo from bootstrap2 --entrypoint transfer --arg '(Pair "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 1000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 3741.832 units (will add 100 for safety)
+Estimated gas: 3741.852 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is 'oo8sACXKDiJJ27gt8kko7jDvywwUS3oLr8ZVEPJ2Kz8HtkQMBya'
@@ -327,12 +327,12 @@ This sequence of operations was run:
         Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2158730
         Set map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 1000
       Storage size: 2118 bytes
-      Consumed gas: 3742.196
+      Consumed gas: 3742.216
 
 
 ./octez-client --mode mockup call KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 from bootstrap2 --entrypoint removeLiquidity --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 1000 0 0 "2050-01-01T00:00:00Z")' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 9102.531 units (will add 100 for safety)
+Estimated gas: 9102.578 units (will add 100 for safety)
 Estimated storage: 67 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'oocZ2DJUHkYB3mFFwk3enBtC39BKNEu6pvyLC7dwnsa6NiDUbJA'
@@ -364,7 +364,7 @@ This sequence of operations was run:
           0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ;
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4635 bytes
-      Consumed gas: 1452.092
+      Consumed gas: 1452.097
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
@@ -378,7 +378,7 @@ This sequence of operations was run:
           Updated big_maps:
             Unset map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c]
           Storage size: 2050 bytes
-          Consumed gas: 2500.298
+          Consumed gas: 2500.309
         Internal Transaction:
           Amount: ꜩ0
           From: KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5
@@ -394,7 +394,7 @@ This sequence of operations was run:
             Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10
           Storage size: 2331 bytes
           Paid storage size diff: 67 bytes
-          Consumed gas: 2994.290
+          Consumed gas: 2994.305
           Balance updates:
             tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01675
             storage fees ........................... +ꜩ0.01675
diff --git a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out
index 9bcd80d45762..24323c4f03b0 100644
--- a/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out	
+++ b/tezt/tests/expected/contract_liquidity_baking.ml/Alpha- Test trades.out	
@@ -11,7 +11,7 @@ Pair 1
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint mintOrBurn --arg '(Pair 100000000 "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2375.506 units (will add 100 for safety)
+Estimated gas: 2375.517 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'opNV92qwY7YfY6exkBrJqnJyotKXFbxHdXEk7xNQFNsPRQ7TEjF'
@@ -42,7 +42,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2375.870
+      Consumed gas: 2375.881
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -50,7 +50,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap1 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2377.209 units (will add 100 for safety)
+Estimated gas: 2377.220 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'op968yui6vHCCztECXMB24FEWbMUHed9jQkXbhL5WGM8wXJw96Q'
@@ -82,7 +82,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2053 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.573
+      Consumed gas: 2377.584
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -90,7 +90,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap2 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2377.209 units (will add 100 for safety)
+Estimated gas: 2377.220 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'op8vSFsuf9xDtpELfAXrAD31oBWvx4kvW2QWoEBUKqsiADKYgZB'
@@ -122,7 +122,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2124 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.573
+      Consumed gas: 2377.584
       Balance updates:
         tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -130,7 +130,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap3 --entrypoint approve --arg '(Pair "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5" 1000000000)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 2377.209 units (will add 100 for safety)
+Estimated gas: 2377.220 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'opG2xrHRo7XfsfQ6ury6ArfyEJ7SbyhGtpuMS5nTuqjV78pJbh8'
@@ -162,7 +162,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2195 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.573
+      Consumed gas: 2377.584
       Balance updates:
         tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
@@ -170,7 +170,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 9001 from bootstrap1 to KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 --burn-cap 10 --entrypoint addLiquidity --arg '(Pair "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" 0 1000000000 "2050-01-01T00:00:00Z")'
 Node is bootstrapped.
-Estimated gas: 9497.441 units (will add 100 for safety)
+Estimated gas: 9497.488 units (will add 100 for safety)
 Estimated storage: 147 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'onsvTjspvs6n3R9fbuQ1ZDvzEibrTJyZaxvrn4hwAEz135CrT5k'
@@ -227,7 +227,7 @@ This sequence of operations was run:
             Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 21598
           Storage size: 2264 bytes
           Paid storage size diff: 69 bytes
-          Consumed gas: 3690.945
+          Consumed gas: 3690.965
           Balance updates:
             tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.01725
             storage fees ........................... +ꜩ0.01725
@@ -244,7 +244,7 @@ This sequence of operations was run:
             Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2159730
           Storage size: 2050 bytes
           Paid storage size diff: 72 bytes
-          Consumed gas: 2300.339
+          Consumed gas: 2300.350
           Balance updates:
             tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.018
             storage fees ........................... +ꜩ0.018
@@ -252,7 +252,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 9001 from bootstrap2 to KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 --burn-cap 10 --entrypoint xtzToToken --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" 0 "2050-01-01T00:00:00Z")'
 Node is bootstrapped.
-Estimated gas: 6070.370 units (will add 100 for safety)
+Estimated gas: 6070.421 units (will add 100 for safety)
 Estimated storage: 327 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'oogc3Wbh8bGJdTZYeAaKP7YmR9nmp51JCCYPeEc3hqBZ27jKzaK'
@@ -285,7 +285,7 @@ This sequence of operations was run:
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4636 bytes
       Paid storage size diff: 1 bytes
-      Consumed gas: 920.227
+      Consumed gas: 920.247
       Balance updates:
         tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.00025
         storage fees ........................... +ꜩ0.00025
@@ -307,7 +307,7 @@ This sequence of operations was run:
             Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10788
           Storage size: 2333 bytes
           Paid storage size diff: 69 bytes
-          Consumed gas: 2994.324
+          Consumed gas: 2994.339
           Balance updates:
             tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.01725
             storage fees ........................... +ꜩ0.01725
@@ -326,7 +326,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1VqarPDicMFn1ejmQqqshUkUXTCTXwmkCN from bootstrap2 --entrypoint transfer --arg '(Pair "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" 100)' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 3075.578 units (will add 100 for safety)
+Estimated gas: 3075.593 units (will add 100 for safety)
 Estimated storage: 68 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is 'opCvYgUossHCJMw2bwAuZsKVWZPerUVdvQWEo2JpoM7SAWmX5LU'
@@ -360,7 +360,7 @@ This sequence of operations was run:
         Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10688
       Storage size: 2401 bytes
       Paid storage size diff: 68 bytes
-      Consumed gas: 3075.942
+      Consumed gas: 3075.957
       Balance updates:
         tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN ... -ꜩ0.017
         storage fees ........................... +ꜩ0.017
@@ -368,7 +368,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup call KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5 from bootstrap3 --entrypoint tokenToXtz --arg '(Pair "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" 100 0 "2050-01-01T00:00:00Z")' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 7067.386 units (will add 100 for safety)
+Estimated gas: 7067.428 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is 'opSJtQyATVZNAw8iVpDX7V7RU82Q3Kczsjn262NH2jsSJSqzMt6'
@@ -400,7 +400,7 @@ This sequence of operations was run:
           0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ;
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4636 bytes
-      Consumed gas: 920.732
+      Consumed gas: 920.738
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
@@ -418,7 +418,7 @@ This sequence of operations was run:
             Unset map(0)[0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6]
             Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 10910
           Storage size: 2333 bytes
-          Consumed gas: 3890.761
+          Consumed gas: 3890.781
         Internal Transaction:
           Amount: ꜩ164.584923
           From: KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5
diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_big_map_origination.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_big_map_origination.out
index 3cd20c24b3c3..83ccf3fe08bd 100644
--- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_big_map_origination.out	
+++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_big_map_origination.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract originate_big_map transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/originate_big_map.tz --init '{Elt 0 0}' --burn-cap 10 --force
 Node is bootstrapped.
-Estimated gas: 813.246 units (will add 100 for safety)
+Estimated gas: 813.249 units (will add 100 for safety)
 Estimated storage: 403 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -36,7 +36,7 @@ This sequence of operations was run:
           New map(4) of type (big_map int int)
           Set map(4)[0] to 0
         Paid storage size diff: 146 bytes
-        Consumed gas: 813.213
+        Consumed gas: 813.216
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0365
           storage fees ........................... +ꜩ0.0365
diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out
index ce655ae16c4f..f59e583b179c 100644
--- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out	
+++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_slice.out	
@@ -417,7 +417,7 @@ Fatal error:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
 Node is bootstrapped.
-Estimated gas: 1625.178 units (will add 100 for safety)
+Estimated gas: 1625.177 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 '[OPERATION_HASH]'
@@ -445,7 +445,7 @@ This sequence of operations was run:
       Updated storage:
         0x0103fe5753baadb56a4836e34571ce4cbe82158ee40eba872b848f709699019725ba
       Storage size: 578 bytes
-      Consumed gas: 1525.660
+      Consumed gas: 1525.659
       Internal operations:
         Internal Transaction:
           Amount: ꜩ1
diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out
index a99540ae2e9a..13dea81cffaf 100644
--- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out	
+++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_split_string.out	
@@ -67,7 +67,7 @@ Contract memorized as split_string.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"abc"'
 Node is bootstrapped.
-Estimated gas: 1319.890 units (will add 100 for safety)
+Estimated gas: 1319.891 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 '[OPERATION_HASH]'
@@ -94,7 +94,7 @@ This sequence of operations was run:
       Updated storage: { "a" ; "b" ; "c" }
       Storage size: 272 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 1320.383
+      Consumed gas: 1320.384
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
@@ -105,7 +105,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"def"'
 Node is bootstrapped.
-Estimated gas: 1322.578 units (will add 100 for safety)
+Estimated gas: 1322.582 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 '[OPERATION_HASH]'
@@ -132,7 +132,7 @@ This sequence of operations was run:
       Updated storage: { "a" ; "b" ; "c" ; "d" ; "e" ; "f" }
       Storage size: 290 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 1323.071
+      Consumed gas: 1323.075
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
diff --git a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out
index 923b5fceba75..4a2d23ec90c1 100644
--- a/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out	
+++ b/tezt/tests/expected/contract_onchain_opcodes.ml/Alpha- Contract onchain opcodes- test_store_input.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract store_input transferring 0 from bootstrap1 running michelson_test_scripts/opcodes/store_input.tz --init '""' --burn-cap 10 --force
 Node is bootstrapped.
-Estimated gas: 578.286 units (will add 100 for safety)
+Estimated gas: 578.287 units (will add 100 for safety)
 Estimated storage: 298 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -33,7 +33,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 41 bytes
         Paid storage size diff: 41 bytes
-        Consumed gas: 578.253
+        Consumed gas: 578.254
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.01025
           storage fees ........................... +ꜩ0.01025
@@ -45,7 +45,7 @@ Contract memorized as store_input.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"abcdefg"'
 Node is bootstrapped.
-Estimated gas: 1277.538 units (will add 100 for safety)
+Estimated gas: 1277.540 units (will add 100 for safety)
 Estimated storage: 7 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -72,7 +72,7 @@ This sequence of operations was run:
       Updated storage: "abcdefg"
       Storage size: 48 bytes
       Paid storage size diff: 7 bytes
-      Consumed gas: 1278.160
+      Consumed gas: 1278.162
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.00175
         storage fees ........................... +ꜩ0.00175
@@ -83,7 +83,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 10 --arg '"xyz"'
 Node is bootstrapped.
-Estimated gas: 1277.554 units (will add 100 for safety)
+Estimated gas: 1277.556 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -109,7 +109,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: "xyz"
       Storage size: 44 bytes
-      Consumed gas: 1278.176
+      Consumed gas: 1278.178
 
 
 ./octez-client --mode mockup get contract storage for '[CONTRACT_HASH]'
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage495706788--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage495706788--input453441034-.out
index 3de3f279359a..e1a66ff03182 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage495706788--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage495706788--input453441034-.out	
@@ -23,7 +23,7 @@ trace
     [ 1
       {}
       {} ]
-  - location: 17 (just consumed gas: 0.720)
+  - location: 17 (just consumed gas: 0.722)
     [ False
       {} ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input453441034-.out
index 94a3a3882c41..f3e56ea6ccb2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input453441034-.out	
@@ -9,7 +9,7 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (just consumed gas: 11.546)
+  - location: 12 (just consumed gas: 11.552)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 1
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input564400327-.out
index 158d06c02f65..4317e1e1ff67 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input564400327-.out	
@@ -9,7 +9,7 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (just consumed gas: 11.546)
+  - location: 12 (just consumed gas: 11.552)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 2
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input654274102-.out
index 42b98c6389c9..7326ce98d4e0 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage56274299--input654274102-.out	
@@ -9,7 +9,7 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (just consumed gas: 11.546)
+  - location: 12 (just consumed gas: 11.552)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 3
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage690637660--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage690637660--input453441034-.out
index b632d23c6dcf..306a16b8ea1f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage690637660--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage690637660--input453441034-.out	
@@ -8,7 +8,7 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[1] to 0
 trace
-  - location: 12 (just consumed gas: 10.576)
+  - location: 12 (just consumed gas: 10.579)
     [ (Pair 1 { Elt 1 0 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 1
@@ -24,7 +24,7 @@ trace
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (just consumed gas: 0.722)
+  - location: 17 (just consumed gas: 0.723)
     [ True
       { Elt 1 0 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage806237530--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage806237530--input453441034-.out
index 6e4ac1ec5e5b..3507a510cf14 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage806237530--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_nat--storage806237530--input453441034-.out	
@@ -8,7 +8,7 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[0] to 1
 trace
-  - location: 12 (just consumed gas: 10.551)
+  - location: 12 (just consumed gas: 10.554)
     [ (Pair 1 { Elt 0 1 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 1
@@ -24,7 +24,7 @@ trace
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (just consumed gas: 0.722)
+  - location: 17 (just consumed gas: 0.723)
     [ False
       { Elt 0 1 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input1071610051-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input1071610051-.out
index 87a88fd614ad..c7a54a9c50be 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input1071610051-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input1071610051-.out	
@@ -9,7 +9,7 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (just consumed gas: 11.702)
+  - location: 12 (just consumed gas: 11.711)
     [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "baz"
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input700475845-.out
index fb9fd50d02d6..b261020b0695 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input700475845-.out	
@@ -9,7 +9,7 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (just consumed gas: 11.702)
+  - location: 12 (just consumed gas: 11.711)
     [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "bar"
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input905318451-.out
index eae6ae03afd1..f922b59c19df 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage109689253--input905318451-.out	
@@ -9,7 +9,7 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (just consumed gas: 11.702)
+  - location: 12 (just consumed gas: 11.711)
     [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "foo"
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage495706788--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage495706788--input700475845-.out
index ff3f593d7dba..cc71853ad8cf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage495706788--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage495706788--input700475845-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   New map(4) of type (big_map string nat)
 trace
-  - location: 12 (just consumed gas: 9.688)
+  - location: 12 (just consumed gas: 9.689)
     [ (Pair "bar" {} None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "bar"
@@ -23,7 +23,7 @@ trace
     [ "bar"
       {}
       {} ]
-  - location: 17 (just consumed gas: 0.732)
+  - location: 17 (just consumed gas: 0.734)
     [ False
       {} ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage915708427--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage915708427--input700475845-.out
index 73ecc84b6463..b1c8564b7227 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage915708427--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage915708427--input700475845-.out	
@@ -8,7 +8,7 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["foo"] to 1
 trace
-  - location: 12 (just consumed gas: 10.676)
+  - location: 12 (just consumed gas: 10.681)
     [ (Pair "bar" { Elt "foo" 1 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "bar"
@@ -24,7 +24,7 @@ trace
     [ "bar"
       { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 17 (just consumed gas: 0.734)
+  - location: 17 (just consumed gas: 0.735)
     [ False
       { Elt "foo" 1 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage936682951--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage936682951--input905318451-.out
index f3a2b0247e2a..ef651b134941 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage936682951--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -big_map_mem_string--storage936682951--input905318451-.out	
@@ -8,7 +8,7 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["foo"] to 0
 trace
-  - location: 12 (just consumed gas: 10.676)
+  - location: 12 (just consumed gas: 10.681)
     [ (Pair "foo" { Elt "foo" 0 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "foo"
@@ -24,7 +24,7 @@ trace
     [ "foo"
       { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 17 (just consumed gas: 0.734)
+  - location: 17 (just consumed gas: 0.735)
     [ True
       { Elt "foo" 0 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set-2--storage921624073--input186507116-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set-2--storage921624073--input186507116-.out
index beeb682e95da..b200682c8d7c 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set-2--storage921624073--input186507116-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -comb-set-2--storage921624073--input186507116-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (just consumed gas: 12.493)
+  - location: 16 (just consumed gas: 12.494)
     [ (Pair (Pair 1 4 2 Unit) None) ]
   - location: 16 (just consumed gas: 0.010)
     [ (Pair 1 4 2 Unit) ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out
index a00e831396b6..a86cfeca29e2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -compare--storage125992234--input125992234-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (just consumed gas: 198.104)
+  - location: 7 (just consumed gas: 198.113)
     [ (Pair Unit Unit) ]
   - location: 7 (just consumed gas: 0.010)
     [  ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input392583650-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input392583650-.out
index c5fc6ea9fa96..f8a51225eb88 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input392583650-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input392583650-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 6.628)
+  - location: 9 (just consumed gas: 6.631)
     [ (Pair { "test1" ; "test2" } {}) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "test1" ; "test2" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input457300675-.out
index 4c22d376c921..d3bb26b51ea7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 6.300)
+  - location: 9 (just consumed gas: 6.301)
     [ (Pair {} {}) ]
   - location: 9 (just consumed gas: 0.010)
     [ {} ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input640104625-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input640104625-.out
index 3a3a9179fb68..31b1cc1fb3cd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input640104625-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_hello--storage457300675--input640104625-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 6.474)
+  - location: 9 (just consumed gas: 6.476)
     [ (Pair { "World!" } {}) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "World!" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input264787654-.out
index 00e9420f3650..04988adfd3f9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input264787654-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 10.758)
+  - location: 8 (just consumed gas: 10.763)
     [ (Pair { "a" ; "b" ; "c" } "") ]
   - location: 8 (just consumed gas: 0.010)
     [ { "a" ; "b" ; "c" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input316676251-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input316676251-.out
index ba4c8990d858..d6382adce26b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input316676251-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input316676251-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 10.962)
+  - location: 8 (just consumed gas: 10.968)
     [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ]
   - location: 8 (just consumed gas: 0.010)
     [ { "Hello" ; " " ; "World" ; "!" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input457300675-.out
index b0e8b45d3dbe..1cf06033213a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -concat_list--storage79230375--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 10.386)
+  - location: 8 (just consumed gas: 10.388)
     [ (Pair {} "") ]
   - location: 8 (just consumed gas: 0.010)
     [ {} ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input315650912-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input315650912-.out
index 2f6517247c0f..dd903bb9b411 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input315650912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input315650912-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 31.960)
+  - location: 12 (just consumed gas: 31.962)
     [ (Pair (Pair { "B" } { "B" }) None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair { "B" } { "B" }) ]
@@ -67,7 +67,7 @@ trace
       True
       {}
       { "B" } ]
-  - location: 33 (just consumed gas: 0.132)
+  - location: 33 (just consumed gas: 0.050)
     [ { "B" }
       { "B" } ]
   - location: 21 (just consumed gas: 0.035)
@@ -130,7 +130,7 @@ trace
       { "B" }
       { "B" }
       True ]
-  - location: 57 (just consumed gas: 0.117)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" }
       True ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input51111414-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input51111414-.out
index ebecb7b679bb..c1e482a578e1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input51111414-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input51111414-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 32.640)
+  - location: 12 (just consumed gas: 32.647)
     [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
@@ -67,7 +67,7 @@ trace
       True
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (just consumed gas: 0.132)
+  - location: 33 (just consumed gas: 0.050)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
   - location: 21 (just consumed gas: 0.025)
@@ -105,7 +105,7 @@ trace
       True
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (just consumed gas: 0.134)
+  - location: 33 (just consumed gas: 0.050)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
   - location: 21 (just consumed gas: 0.025)
@@ -143,7 +143,7 @@ trace
       True
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (just consumed gas: 0.146)
+  - location: 33 (just consumed gas: 0.051)
     [ { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
   - location: 21 (just consumed gas: 0.025)
@@ -181,7 +181,7 @@ trace
       True
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (just consumed gas: 0.136)
+  - location: 33 (just consumed gas: 0.050)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
   - location: 21 (just consumed gas: 0.035)
@@ -244,7 +244,7 @@ trace
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (just consumed gas: 0.118)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
@@ -309,7 +309,7 @@ trace
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (just consumed gas: 0.118)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
@@ -374,7 +374,7 @@ trace
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (just consumed gas: 0.127)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input545734274-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input545734274-.out
index 7c50f02e50b4..2454c325c221 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input545734274-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input545734274-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 31.960)
+  - location: 12 (just consumed gas: 31.962)
     [ (Pair (Pair { "A" } { "B" }) None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair { "A" } { "B" }) ]
@@ -67,7 +67,7 @@ trace
       True
       {}
       { "B" } ]
-  - location: 33 (just consumed gas: 0.132)
+  - location: 33 (just consumed gas: 0.050)
     [ { "A" }
       { "B" } ]
   - location: 21 (just consumed gas: 0.035)
@@ -130,7 +130,7 @@ trace
       { "A" }
       { "A" }
       True ]
-  - location: 57 (just consumed gas: 0.117)
+  - location: 57 (just consumed gas: 0.040)
     [ False
       { "A" }
       True ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input917967660-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input917967660-.out
index 3f8e2ac848ac..4a46d61ed8bb 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input917967660-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input917967660-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 32.640)
+  - location: 12 (just consumed gas: 32.647)
     [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
@@ -67,7 +67,7 @@ trace
       True
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (just consumed gas: 0.132)
+  - location: 33 (just consumed gas: 0.050)
     [ { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
   - location: 21 (just consumed gas: 0.025)
@@ -105,7 +105,7 @@ trace
       True
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (just consumed gas: 0.134)
+  - location: 33 (just consumed gas: 0.050)
     [ { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
   - location: 21 (just consumed gas: 0.025)
@@ -143,7 +143,7 @@ trace
       True
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (just consumed gas: 0.154)
+  - location: 33 (just consumed gas: 0.051)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
   - location: 21 (just consumed gas: 0.035)
@@ -206,7 +206,7 @@ trace
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (just consumed gas: 0.118)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
@@ -271,7 +271,7 @@ trace
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (just consumed gas: 0.118)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
@@ -336,7 +336,7 @@ trace
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (just consumed gas: 0.127)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
@@ -401,7 +401,7 @@ trace
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (just consumed gas: 0.118)
+  - location: 57 (just consumed gas: 0.040)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input964818218-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input964818218-.out
index 1a5fbc264f45..8f42d856693e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input964818218-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -contains_all--storage921624073--input964818218-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 31.960)
+  - location: 12 (just consumed gas: 31.962)
     [ (Pair (Pair { "c" } { "B" }) None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair { "c" } { "B" }) ]
@@ -67,7 +67,7 @@ trace
       True
       {}
       { "B" } ]
-  - location: 33 (just consumed gas: 0.132)
+  - location: 33 (just consumed gas: 0.050)
     [ { "c" }
       { "B" } ]
   - location: 21 (just consumed gas: 0.035)
@@ -130,7 +130,7 @@ trace
       { "c" }
       { "c" }
       True ]
-  - location: 57 (just consumed gas: 0.117)
+  - location: 57 (just consumed gas: 0.040)
     [ False
       { "c" }
       True ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out
index b30b52ec0962..f69670dd8a5d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -emit--storage125992234--input125992234-.out	
@@ -16,7 +16,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (just consumed gas: 13.013)
+  - location: 7 (just consumed gas: 13.014)
     [ (Pair Unit Unit) ]
   - location: 7 (just consumed gas: 0.010)
     [  ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -empty_map--storage457300675--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -empty_map--storage457300675--input125992234-.out
index c4a40638800e..200f3d102e69 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -empty_map--storage457300675--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -empty_map--storage457300675--input125992234-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 8.198)
+  - location: 9 (just consumed gas: 8.200)
     [ (Pair Unit {}) ]
   - location: 9 (just consumed gas: 0.010)
     [  ]
@@ -23,7 +23,7 @@ trace
     [ "hello"
       (Some "world")
       {} ]
-  - location: 20 (just consumed gas: 0.090)
+  - location: 20 (just consumed gas: 0.055)
     [ { Elt "hello" "world" } ]
   - location: 21 (just consumed gas: 0.010)
     [ {}
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input246262487-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input246262487-.out
index 8548fcfc0f6a..660075790185 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input246262487-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input246262487-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (just consumed gas: 10.832)
+  - location: 7 (just consumed gas: 10.835)
     [ (Pair "test" "?") ]
   - location: 7 (just consumed gas: 0.010)
     [ "test" ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input79230375-.out
index f2897ddaf896..15b336d856ef 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -exec_concat--storage398998998--input79230375-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (just consumed gas: 10.792)
+  - location: 7 (just consumed gas: 10.795)
     [ (Pair "" "?") ]
   - location: 7 (just consumed gas: 0.010)
     [ "" ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage1026405794--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage1026405794--input329240220-.out
index 3ec41f992f18..4057ac477535 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage1026405794--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage1026405794--input329240220-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (just consumed gas: 8.037)
+  - location: 13 (just consumed gas: 8.004)
     [ (Pair "hello" None { Elt "hello" 4 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -21,7 +21,7 @@ trace
     [ "hello"
       None
       { Elt "hello" 4 } ]
-  - location: 17 (just consumed gas: 0.110)
+  - location: 17 (just consumed gas: 0.076)
     [ (Some 4)
       {} ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage382368661--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage382368661--input329240220-.out
index 50797a9ec29e..000e049eab1f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage382368661--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage382368661--input329240220-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (just consumed gas: 7.783)
+  - location: 13 (just consumed gas: 7.784)
     [ (Pair "hello" (Some 4) {}) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -21,7 +21,7 @@ trace
     [ "hello"
       (Some 4)
       {} ]
-  - location: 17 (just consumed gas: 0.095)
+  - location: 17 (just consumed gas: 0.076)
     [ None
       { Elt "hello" 4 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input329240220-.out
index 304cf7681f80..ac83dda66e48 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input329240220-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (just consumed gas: 8.137)
+  - location: 13 (just consumed gas: 8.104)
     [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -21,7 +21,7 @@ trace
     [ "hello"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (just consumed gas: 0.110)
+  - location: 17 (just consumed gas: 0.076)
     [ (Some 4)
       { Elt "hello" 5 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input507231566-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input507231566-.out
index 82bb0b6f7ca4..c0ef2da8dca7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input507231566-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage496578814--input507231566-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (just consumed gas: 8.107)
+  - location: 13 (just consumed gas: 8.074)
     [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hi"
@@ -21,7 +21,7 @@ trace
     [ "hi"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (just consumed gas: 0.092)
+  - location: 17 (just consumed gas: 0.075)
     [ None
       { Elt "hello" 4 ; Elt "hi" 5 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage547821324--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage547821324--input329240220-.out
index 9ebcbcaae107..ebce06705749 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage547821324--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage547821324--input329240220-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (just consumed gas: 7.683)
+  - location: 13 (just consumed gas: 7.684)
     [ (Pair "hello" None {}) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -21,7 +21,7 @@ trace
     [ "hello"
       None
       {} ]
-  - location: 17 (just consumed gas: 0.095)
+  - location: 17 (just consumed gas: 0.076)
     [ None
       {} ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input156280093-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input156280093-.out
index 83336a6def8d..e73dbf1b9b19 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input156280093-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input156280093-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (just consumed gas: 8.292)
+  - location: 13 (just consumed gas: 8.239)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "1"
@@ -21,7 +21,7 @@ trace
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (just consumed gas: 0.089)
+  - location: 17 (just consumed gas: 0.075)
     [ (Some 1)
       { Elt "2" 2 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input228164856-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input228164856-.out
index 50da4b931138..35eb65fe1211 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input228164856-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_and_update_map--storage796012494--input228164856-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (just consumed gas: 8.292)
+  - location: 13 (just consumed gas: 8.239)
     [ (Pair "2" None { Elt "1" 1 ; Elt "2" 2 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "2"
@@ -21,7 +21,7 @@ trace
     [ "2"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (just consumed gas: 0.089)
+  - location: 17 (just consumed gas: 0.075)
     [ (Some 2)
       { Elt "1" 1 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input329240220-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input329240220-.out
index b8e1b0bc8a83..cb2cd390ea57 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input329240220-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input329240220-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 10.589)
+  - location: 12 (just consumed gas: 10.557)
     [ (Pair "hello" None { Elt "hello" "hi" }) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair "hello" None { Elt "hello" "hi" })
@@ -28,7 +28,7 @@ trace
     [ "hello"
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (just consumed gas: 0.090)
+  - location: 20 (just consumed gas: 0.045)
     [ (Some "hi")
       { Elt "hello" "hi" } ]
   - location: 21 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input79230375-.out
index 5e0012006cca..e302e35b4af1 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage139236239--input79230375-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 10.539)
+  - location: 12 (just consumed gas: 10.507)
     [ (Pair "" None { Elt "hello" "hi" }) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair "" None { Elt "hello" "hi" })
@@ -28,7 +28,7 @@ trace
     [ ""
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (just consumed gas: 0.080)
+  - location: 20 (just consumed gas: 0.045)
     [ None
       { Elt "hello" "hi" } ]
   - location: 21 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage329396864--input156280093-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage329396864--input156280093-.out
index bd18ca90e56f..6d5f6561a446 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage329396864--input156280093-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -get_map_value--storage329396864--input156280093-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 10.898)
+  - location: 12 (just consumed gas: 10.847)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" })
@@ -28,7 +28,7 @@ trace
     [ "1"
       { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 20 (just consumed gas: 0.083)
+  - location: 20 (just consumed gas: 0.045)
     [ (Some "one")
       { Elt "1" "one" ; Elt "2" "two" } ]
   - location: 21 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input3431716-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input3431716-.out
index 01080e91964c..220de110c99a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input3431716-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input3431716-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (just consumed gas: 4.840)
+  - location: 7 (just consumed gas: 4.841)
     [ (Pair "abcdefg" 0x00) ]
   - location: 7 (just consumed gas: 0.010)
     [ "abcdefg" ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input535018041-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input535018041-.out
index ecf29280da34..32cb65990888 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input535018041-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -hash_string--storage151303925--input535018041-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (just consumed gas: 4.820)
+  - location: 7 (just consumed gas: 4.821)
     [ (Pair "12345" 0x00) ]
   - location: 7 (just consumed gas: 0.010)
     [ "12345" ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input288201633-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input288201633-.out
index 203894ea4173..3c3591818c66 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input288201633-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input288201633-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 6.313)
+  - location: 8 (just consumed gas: 6.316)
     [ (Pair (Some "hello") "?") ]
   - location: 8 (just consumed gas: 0.010)
     [ (Some "hello") ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input921624073-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input921624073-.out
index 398cafeb8366..7762fee9d61a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input921624073-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -if_some--storage398998998--input921624073-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 6.149)
+  - location: 8 (just consumed gas: 6.151)
     [ (Pair None "?") ]
   - location: 8 (just consumed gas: 0.010)
     [ None ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input202098045-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input202098045-.out
index 053ff61cde6b..79b3366c5596 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input202098045-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input202098045-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 6.989)
+  - location: 11 (just consumed gas: 6.990)
     [ (Pair (Left True) (Left "X")) ]
   - location: 11 (just consumed gas: 0.010)
     [ (Left True) ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input44576556-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input44576556-.out
index e26cc10594af..31eb428d525e 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input44576556-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -left_right--storage4177631--input44576556-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 7.013)
+  - location: 11 (just consumed gas: 7.015)
     [ (Pair (Right "a") (Left "X")) ]
   - location: 11 (just consumed gas: 0.010)
     [ (Right "a") ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input457300675-.out
index 216cf076ae73..df2a83ddd292 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 5.566)
+  - location: 8 (just consumed gas: 5.567)
     [ (Pair {} "abc") ]
   - location: 8 (just consumed gas: 0.010)
     [ {}
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input546523343-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input546523343-.out
index f90aaa2eded7..37b1cc607483 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input546523343-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_concat--storage717096222--input546523343-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 5.938)
+  - location: 8 (just consumed gas: 5.942)
     [ (Pair { "d" ; "e" ; "f" } "abc") ]
   - location: 8 (just consumed gas: 0.010)
     [ { "d" ; "e" ; "f" }
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input264787654-.out
index a2d333802a41..d525f1b77701 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input264787654-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 4.414)
+  - location: 9 (just consumed gas: 4.418)
     [ (Pair { "a" ; "b" ; "c" } { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "a" ; "b" ; "c" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input457300675-.out
index b85dbfe9a29d..fa1c1a5507b3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 4.042)
+  - location: 9 (just consumed gas: 4.043)
     [ (Pair {} { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ {} ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input656499821-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input656499821-.out
index c72fb89f0945..22a90510871b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input656499821-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id--storage528921618--input656499821-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 4.414)
+  - location: 9 (just consumed gas: 4.418)
     [ (Pair { "1" ; "2" ; "3" } { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "1" ; "2" ; "3" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input264787654-.out
index 298046509b3a..1e5e23779406 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input264787654-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 5.373)
+  - location: 9 (just consumed gas: 5.377)
     [ (Pair { "a" ; "b" ; "c" } { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "a" ; "b" ; "c" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input457300675-.out
index 0b1de678c93c..52c2860d11ed 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 5.001)
+  - location: 9 (just consumed gas: 5.002)
     [ (Pair {} { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ {} ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input656499821-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input656499821-.out
index e5c35fa49aa2..1c38acf3aa18 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input656499821-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -list_id_map--storage528921618--input656499821-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 5.373)
+  - location: 9 (just consumed gas: 5.377)
     [ (Pair { "1" ; "2" ; "3" } { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "1" ; "2" ; "3" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input457300675-.out
index 3ea28ad19c9d..a4e7b9776225 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 16.606)
+  - location: 9 (just consumed gas: 16.607)
     [ (Pair {} { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ {} ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input851203613-.out
index 4bae63dbf143..02dd60049dbf 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -loop_left--storage528921618--input851203613-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 16.978)
+  - location: 9 (just consumed gas: 16.982)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "c" ; "b" ; "a" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input1027566226-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input1027566226-.out
index 60a189a67e65..5e38e8376884 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input1027566226-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input1027566226-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 4.604)
+  - location: 11 (just consumed gas: 4.579)
     [ (Pair { Elt 0 0 } {}) ]
   - location: 11 (just consumed gas: 0.010)
     [ { Elt 0 0 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input276660554-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input276660554-.out
index b9af0cd30032..1d9043d35ce5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input276660554-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input276660554-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 4.919)
+  - location: 11 (just consumed gas: 4.869)
     [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ]
   - location: 11 (just consumed gas: 0.010)
     [ { Elt 0 0 ; Elt 3 4 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input599923743-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input599923743-.out
index c223d34d9581..db3bf102f716 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input599923743-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_id--storage457300675--input599923743-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 4.604)
+  - location: 11 (just consumed gas: 4.579)
     [ (Pair { Elt 0 1 } {}) ]
   - location: 11 (just consumed gas: 0.010)
     [ { Elt 0 1 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input403579222-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input403579222-.out
index d8cf759289c9..8c9398dc463a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input403579222-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input403579222-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 18.382)
+  - location: 11 (just consumed gas: 18.332)
     [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ]
   - location: 11 (just consumed gas: 0.010)
     [ { Elt 1 1 ; Elt 2 100 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input532072758-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input532072758-.out
index 355dd16d5814..b562b8c1a727 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input532072758-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_iter--storage1011138251--input532072758-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 18.382)
+  - location: 11 (just consumed gas: 18.332)
     [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ]
   - location: 11 (just consumed gas: 0.010)
     [ { Elt 0 100 ; Elt 2 100 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage794999348--input152441147-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage794999348--input152441147-.out
index 195db759a002..2200f4d81e47 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage794999348--input152441147-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage794999348--input152441147-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 9.739)
+  - location: 9 (just consumed gas: 9.673)
     [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ]
   - location: 9 (just consumed gas: 0.010)
     [ 15
@@ -33,7 +33,7 @@ trace
   - location: 17 (just consumed gas: 0.035)
     [ 20
       15 ]
-  - location: 11 (just consumed gas: 0.181)
+  - location: 11 (just consumed gas: 0.150)
     [ (Pair "foo" 1)
       15 ]
   - location: 13 (just consumed gas: 0.010)
@@ -51,7 +51,7 @@ trace
   - location: 17 (just consumed gas: 0.035)
     [ 16
       15 ]
-  - location: 11 (just consumed gas: 0.197)
+  - location: 11 (just consumed gas: 0.160)
     [ { Elt "bar" 20 ; Elt "foo" 16 }
       15 ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage88008216--input798141440-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage88008216--input798141440-.out
index 3d1d32d50841..ea1537e9bdcc 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage88008216--input798141440-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_map--storage88008216--input798141440-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 9.368)
+  - location: 9 (just consumed gas: 9.338)
     [ (Pair 10 { Elt "foo" 1 }) ]
   - location: 9 (just consumed gas: 0.010)
     [ 10
@@ -33,7 +33,7 @@ trace
   - location: 17 (just consumed gas: 0.035)
     [ 11
       10 ]
-  - location: 11 (just consumed gas: 0.191)
+  - location: 11 (just consumed gas: 0.160)
     [ { Elt "foo" 11 }
       10 ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage495706788--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage495706788--input453441034-.out
index 728f6203d7e5..ce49c16c0e80 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage495706788--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage495706788--input453441034-.out	
@@ -23,7 +23,7 @@ trace
     [ 1
       {}
       {} ]
-  - location: 17 (just consumed gas: 0.080)
+  - location: 17 (just consumed gas: 0.045)
     [ False
       {} ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input453441034-.out
index 7c86d00ebfd6..2c71cb52a8ac 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input453441034-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.739)
+  - location: 12 (just consumed gas: 9.689)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 1
@@ -23,7 +23,7 @@ trace
     [ 1
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (just consumed gas: 0.080)
+  - location: 17 (just consumed gas: 0.045)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input564400327-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input564400327-.out
index 599c867895b0..09f6a5a41418 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input564400327-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input564400327-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.739)
+  - location: 12 (just consumed gas: 9.689)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 2
@@ -23,7 +23,7 @@ trace
     [ 2
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (just consumed gas: 0.080)
+  - location: 17 (just consumed gas: 0.045)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input654274102-.out
index eb5b5c7d6d40..3168bcffee39 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage56274299--input654274102-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.739)
+  - location: 12 (just consumed gas: 9.689)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 3
@@ -23,7 +23,7 @@ trace
     [ 3
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (just consumed gas: 0.080)
+  - location: 17 (just consumed gas: 0.045)
     [ False
       { Elt 1 4 ; Elt 2 11 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage690637660--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage690637660--input453441034-.out
index dd444fa9ed60..a9391e36ee06 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage690637660--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage690637660--input453441034-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.424)
+  - location: 12 (just consumed gas: 9.399)
     [ (Pair 1 { Elt 1 0 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 1
@@ -23,7 +23,7 @@ trace
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (just consumed gas: 0.080)
+  - location: 17 (just consumed gas: 0.045)
     [ True
       { Elt 1 0 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage806237530--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage806237530--input453441034-.out
index 4e98dd5c82f5..d8471acdd61f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage806237530--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_nat--storage806237530--input453441034-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.424)
+  - location: 12 (just consumed gas: 9.399)
     [ (Pair 1 { Elt 0 1 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ 1
@@ -23,7 +23,7 @@ trace
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (just consumed gas: 0.080)
+  - location: 17 (just consumed gas: 0.045)
     [ False
       { Elt 0 1 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input1071610051-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input1071610051-.out
index d0298344fecc..a8114e8bd21f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input1071610051-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input1071610051-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.889)
+  - location: 12 (just consumed gas: 9.824)
     [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "baz"
@@ -23,7 +23,7 @@ trace
     [ "baz"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (just consumed gas: 0.089)
+  - location: 17 (just consumed gas: 0.045)
     [ False
       { Elt "bar" 4 ; Elt "foo" 11 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input700475845-.out
index b95673a4ae06..516812d40bd9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input700475845-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.889)
+  - location: 12 (just consumed gas: 9.824)
     [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "bar"
@@ -23,7 +23,7 @@ trace
     [ "bar"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (just consumed gas: 0.089)
+  - location: 17 (just consumed gas: 0.045)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input905318451-.out
index 4e635dded23e..39f199947b86 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage109689253--input905318451-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.889)
+  - location: 12 (just consumed gas: 9.824)
     [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "foo"
@@ -23,7 +23,7 @@ trace
     [ "foo"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (just consumed gas: 0.089)
+  - location: 17 (just consumed gas: 0.045)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage495706788--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage495706788--input700475845-.out
index 7fa6c5a74ab0..be16759d1e51 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage495706788--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage495706788--input700475845-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.188)
+  - location: 12 (just consumed gas: 9.189)
     [ (Pair "bar" {} None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "bar"
@@ -23,7 +23,7 @@ trace
     [ "bar"
       {}
       {} ]
-  - location: 17 (just consumed gas: 0.083)
+  - location: 17 (just consumed gas: 0.045)
     [ False
       {} ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage915708427--input700475845-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage915708427--input700475845-.out
index 9874ec70e226..3d6ce798f433 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage915708427--input700475845-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage915708427--input700475845-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.518)
+  - location: 12 (just consumed gas: 9.489)
     [ (Pair "bar" { Elt "foo" 1 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "bar"
@@ -23,7 +23,7 @@ trace
     [ "bar"
       { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 17 (just consumed gas: 0.086)
+  - location: 17 (just consumed gas: 0.045)
     [ False
       { Elt "foo" 1 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage936682951--input905318451-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage936682951--input905318451-.out
index 46c2853a5605..e97c464d0265 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage936682951--input905318451-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_mem_string--storage936682951--input905318451-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (just consumed gas: 9.518)
+  - location: 12 (just consumed gas: 9.489)
     [ (Pair "foo" { Elt "foo" 0 } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ "foo"
@@ -23,7 +23,7 @@ trace
     [ "foo"
       { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 17 (just consumed gas: 0.086)
+  - location: 17 (just consumed gas: 0.045)
     [ True
       { Elt "foo" 0 } ]
   - location: 18 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input15265129-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input15265129-.out
index 727ee2b48eda..a8ae62f44b28 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input15265129-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input15265129-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 4.721)
+  - location: 9 (just consumed gas: 4.695)
     [ (Pair { Elt "a" 1 } 111) ]
   - location: 9 (just consumed gas: 0.010)
     [ { Elt "a" 1 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input158311065-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input158311065-.out
index 5a275754d58b..2858c429253a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input158311065-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input158311065-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 5.409)
+  - location: 9 (just consumed gas: 5.325)
     [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ]
   - location: 9 (just consumed gas: 0.010)
     [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input456982702-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input456982702-.out
index b60cf22bbe3e..5d21a9b2ef8f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input456982702-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -map_size--storage492856247--input456982702-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 6.448)
+  - location: 9 (just consumed gas: 6.270)
     [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } 111) ]
   - location: 9 (just consumed gas: 0.010)
     [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out
index 66b50162b8d3..1d5523080efd 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -mul--storage125992234--input125992234-.out	
@@ -54,7 +54,7 @@ trace
   - location: 50 (just consumed gas: 0.010)
     [ -7987
       10 ]
-  - location: 53 (just consumed gas: 0.061)
+  - location: 53 (just consumed gas: 0.064)
     [ -79870 ]
   - location: 54 (just consumed gas: 0.010)
     [ -79870
@@ -72,7 +72,7 @@ trace
   - location: 69 (just consumed gas: 0.010)
     [ -7987
       10 ]
-  - location: 72 (just consumed gas: 0.061)
+  - location: 72 (just consumed gas: 0.064)
     [ -79870 ]
   - location: 73 (just consumed gas: 0.010)
     [ -79870
@@ -90,7 +90,7 @@ trace
   - location: 88 (just consumed gas: 0.010)
     [ 7987
       -10 ]
-  - location: 91 (just consumed gas: 0.061)
+  - location: 91 (just consumed gas: 0.064)
     [ -79870 ]
   - location: 92 (just consumed gas: 0.010)
     [ -79870
@@ -108,7 +108,7 @@ trace
   - location: 107 (just consumed gas: 0.010)
     [ 7987
       10 ]
-  - location: 110 (just consumed gas: 0.061)
+  - location: 110 (just consumed gas: 0.064)
     [ 79870 ]
   - location: 111 (just consumed gas: 0.010)
     [ 79870
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out
index 438175a629df..502ef6416616 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input305844558-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (just consumed gas: 146.860)
+  - location: 16 (just consumed gas: 146.861)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (just consumed gas: 0.680)
+  - location: 73 (just consumed gas: 0.681)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out
index ca2068481ffb..1036bd6e302b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev--storage125992234--input646365167-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (just consumed gas: 146.860)
+  - location: 16 (just consumed gas: 146.861)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (just consumed gas: 0.680)
+  - location: 73 (just consumed gas: 0.681)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out
index e2911c095756..ecf1154377b6 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -packunpack_rev_cty--storage125992234--input1028781121-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 28 (just consumed gas: 255.512)
+  - location: 28 (just consumed gas: 255.382)
     [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
                   Unit
                   "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -901,7 +901,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 185 (just consumed gas: 0.756)
+  - location: 185 (just consumed gas: 0.674)
     [ (Some { True })
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
@@ -1129,7 +1129,7 @@ trace
   - location: 276 (just consumed gas: 1.467)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       { PACK } ]
-  - location: 277 (just consumed gas: 1.658)
+  - location: 277 (just consumed gas: 1.610)
     [ (Some { Elt 0 "foo" ; Elt 1 "bar" })
       { PACK } ]
   - location: 282 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input457300675-.out
index f098ab44357d..906196d1bd01 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 6.771)
+  - location: 9 (just consumed gas: 6.772)
     [ (Pair {} { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ {} ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input851203613-.out
index aef720507ed8..7d892579c33d 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse--storage528921618--input851203613-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 7.143)
+  - location: 9 (just consumed gas: 7.147)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "c" ; "b" ; "a" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input457300675-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input457300675-.out
index f40229b02a04..e12f47fc9958 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input457300675-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input457300675-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 13.490)
+  - location: 9 (just consumed gas: 13.491)
     [ (Pair {} { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ {} ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input851203613-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input851203613-.out
index 1dc3a9066d0d..92f55a1781da 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input851203613-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -reverse_loop--storage528921618--input851203613-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 13.862)
+  - location: 9 (just consumed gas: 13.866)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "c" ; "b" ; "a" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input620760059-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input620760059-.out
index c0463caf0876..6a3b0b9248e3 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input620760059-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input620760059-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 10.804)
+  - location: 9 (just consumed gas: 10.806)
     [ (Pair "world" "hello" 0) ]
   - location: 9 (just consumed gas: 0.010)
     [ (Pair "world" "hello" 0)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input717096222-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input717096222-.out
index 9762e8230adb..2c72a4dafb79 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input717096222-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input717096222-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 10.784)
+  - location: 9 (just consumed gas: 10.786)
     [ (Pair "abc" "hello" 0) ]
   - location: 9 (just consumed gas: 0.010)
     [ (Pair "abc" "hello" 0)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input79230375-.out
index 4c69cbe9d6a9..e00fc5bd9a0a 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_car--storage224747103--input79230375-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 10.754)
+  - location: 9 (just consumed gas: 10.756)
     [ (Pair "" "hello" 0) ]
   - location: 9 (just consumed gas: 0.010)
     [ (Pair "" "hello" 0)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage205576101--input654274102-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage205576101--input654274102-.out
index d0ccad11f9e7..e8e089e18b26 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage205576101--input654274102-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage205576101--input654274102-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 10.181)
+  - location: 9 (just consumed gas: 10.182)
     [ (Pair 3 "hello" 500) ]
   - location: 9 (just consumed gas: 0.010)
     [ (Pair 3 "hello" 500)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage224747103--input453441034-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage224747103--input453441034-.out
index d1a07082f549..39b42e60f1ea 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage224747103--input453441034-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage224747103--input453441034-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 10.181)
+  - location: 9 (just consumed gas: 10.182)
     [ (Pair 1 "hello" 0) ]
   - location: 9 (just consumed gas: 0.010)
     [ (Pair 1 "hello" 0)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage611418174--input967284912-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage611418174--input967284912-.out
index 7a2cdf5105d1..7cc71953c0ea 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage611418174--input967284912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_cdr--storage611418174--input967284912-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 10.181)
+  - location: 9 (just consumed gas: 10.182)
     [ (Pair 100 "hello" 7) ]
   - location: 9 (just consumed gas: 0.010)
     [ (Pair 100 "hello" 7)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input264787654-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input264787654-.out
index 9fff7ef7c284..8e0318e601ce 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input264787654-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input264787654-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 4.772)
+  - location: 9 (just consumed gas: 4.523)
     [ (Pair { "a" ; "b" ; "c" } {}) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "a" ; "b" ; "c" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input989507347-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input989507347-.out
index 14c1c90fa041..b16d9e7995b9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input989507347-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_id--storage457300675--input989507347-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 4.555)
+  - location: 9 (just consumed gas: 4.375)
     [ (Pair { "asdf" ; "bcde" } {}) ]
   - location: 9 (just consumed gas: 0.010)
     [ { "asdf" ; "bcde" } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input701684511-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input701684511-.out
index 776414519176..855ff431f635 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input701684511-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input701684511-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 7.621)
+  - location: 8 (just consumed gas: 7.301)
     [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ]
   - location: 8 (just consumed gas: 0.010)
     [ { -100 ; 1 ; 2 ; 3 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input802622031-.out
index 3e1ccc8592e6..9e76c0c38f0f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_iter--storage492856247--input802622031-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 6.826)
+  - location: 8 (just consumed gas: 6.746)
     [ (Pair { 1 } 111) ]
   - location: 8 (just consumed gas: 0.010)
     [ { 1 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage495706788--input33757838-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage495706788--input33757838-.out
index 8caef983449b..bf761af4cbc8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage495706788--input33757838-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage495706788--input33757838-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 13.622)
+  - location: 11 (just consumed gas: 13.623)
     [ (Pair "Hi" {} None) ]
   - location: 11 (just consumed gas: 0.010)
     [ (Pair "Hi" {} None)
@@ -33,7 +33,7 @@ trace
     [ "Hi"
       {}
       (Pair "Hi" {} None) ]
-  - location: 19 (just consumed gas: 0.117)
+  - location: 19 (just consumed gas: 0.040)
     [ False
       (Pair "Hi" {} None) ]
   - location: 20 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage550087893--input79230375-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage550087893--input79230375-.out
index 517cd3088b1d..6318e3d132b7 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage550087893--input79230375-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage550087893--input79230375-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 14.255)
+  - location: 11 (just consumed gas: 14.070)
     [ (Pair "" { "Hello" ; "World" } None) ]
   - location: 11 (just consumed gas: 0.010)
     [ (Pair "" { "Hello" ; "World" } None)
@@ -33,7 +33,7 @@ trace
     [ ""
       { "Hello" ; "World" }
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 19 (just consumed gas: 0.115)
+  - location: 19 (just consumed gas: 0.040)
     [ False
       (Pair "" { "Hello" ; "World" } None) ]
   - location: 20 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage605111220--input33757838-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage605111220--input33757838-.out
index faac129ac0f6..159d170104f9 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage605111220--input33757838-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_member--storage605111220--input33757838-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 13.890)
+  - location: 11 (just consumed gas: 13.808)
     [ (Pair "Hi" { "Hi" } None) ]
   - location: 11 (just consumed gas: 0.010)
     [ (Pair "Hi" { "Hi" } None)
@@ -33,7 +33,7 @@ trace
     [ "Hi"
       { "Hi" }
       (Pair "Hi" { "Hi" } None) ]
-  - location: 19 (just consumed gas: 0.119)
+  - location: 19 (just consumed gas: 0.040)
     [ True
       (Pair "Hi" { "Hi" } None) ]
   - location: 20 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input403499055-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input403499055-.out
index 8a5e6cf5d467..5ab1d8091a1b 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input403499055-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input403499055-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 5.841)
+  - location: 8 (just consumed gas: 5.361)
     [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ]
   - location: 8 (just consumed gas: 0.010)
     [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input469078912-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input469078912-.out
index d0e407750176..7a5212c8e6d8 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input469078912-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input469078912-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 5.046)
+  - location: 8 (just consumed gas: 4.806)
     [ (Pair { 1 ; 2 ; 3 } 111) ]
   - location: 8 (just consumed gas: 0.010)
     [ { 1 ; 2 ; 3 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input802622031-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input802622031-.out
index 2e51f8767afb..577194268410 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input802622031-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -set_size--storage492856247--input802622031-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 4.516)
+  - location: 8 (just consumed gas: 4.436)
     [ (Pair { 1 } 111) ]
   - location: 8 (just consumed gas: 0.010)
     [ { 1 } ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage351480851--input65907686-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage351480851--input65907686-.out
index 352dd593016f..dfb6de1cce14 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage351480851--input65907686-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage351480851--input65907686-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (just consumed gas: 69.135)
+  - location: 10 (just consumed gas: 69.136)
     [ (Pair (Pair 1 10000)
             (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ]
   - location: 10 (just consumed gas: 0.010)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input198821575-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input198821575-.out
index 19c950f3428d..481fb0f9ecf2 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input198821575-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input198821575-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (just consumed gas: 9.165)
+  - location: 10 (just consumed gas: 9.166)
     [ (Pair (Pair 1 1) (Some "Foo")) ]
   - location: 10 (just consumed gas: 0.010)
     [ (Pair 1 1)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input359592843-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input359592843-.out
index 05adc2909ace..54c726019203 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input359592843-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input359592843-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (just consumed gas: 9.165)
+  - location: 10 (just consumed gas: 9.166)
     [ (Pair (Pair 10 5) (Some "Foo")) ]
   - location: 10 (just consumed gas: 0.010)
     [ (Pair 10 5)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input551316239-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input551316239-.out
index 93f56b7f755a..b6e2b8c54413 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input551316239-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input551316239-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (just consumed gas: 9.165)
+  - location: 10 (just consumed gas: 9.166)
     [ (Pair (Pair 0 0) (Some "Foo")) ]
   - location: 10 (just consumed gas: 0.010)
     [ (Pair 0 0)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input722749044-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input722749044-.out
index be4f9e011b3e..dde3b0860f24 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input722749044-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input722749044-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (just consumed gas: 9.165)
+  - location: 10 (just consumed gas: 9.166)
     [ (Pair (Pair 0 10) (Some "Foo")) ]
   - location: 10 (just consumed gas: 0.010)
     [ (Pair 0 10)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input839234860-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input839234860-.out
index d4e1995a8ff3..c18d1dd8bf2f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input839234860-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input839234860-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (just consumed gas: 9.165)
+  - location: 10 (just consumed gas: 9.166)
     [ (Pair (Pair 1 3) (Some "Foo")) ]
   - location: 10 (just consumed gas: 0.010)
     [ (Pair 1 3)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input919180079-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input919180079-.out
index d5bd1397be3a..88011a258a9f 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input919180079-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -slice--storage364922380--input919180079-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (just consumed gas: 9.165)
+  - location: 10 (just consumed gas: 9.166)
     [ (Pair (Pair 0 2) (Some "Foo")) ]
   - location: 10 (just consumed gas: 0.010)
     [ (Pair 0 2)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input1016369050-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input1016369050-.out
index 2eb7847312f9..ab53b430c7ba 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input1016369050-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input1016369050-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 4.407)
+  - location: 8 (just consumed gas: 4.408)
     [ (Pair "abcd" None) ]
   - location: 8 (just consumed gas: 0.010)
     [ "abcd" ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input93477117-.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input93477117-.out
index 3f246ad505f2..730951ea18b5 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input93477117-.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- opcodes -str_id--storage921624073--input93477117-.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (just consumed gas: 4.417)
+  - location: 8 (just consumed gas: 4.418)
     [ (Pair "Hello" None) ]
   - location: 8 (just consumed gas: 0.010)
     [ "Hello" ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out
index 9d1e1b536a78..e60d4a49ff74 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- big_map_contract_io.out	
@@ -8,7 +8,7 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["hello"] to "hi"
 trace
-  - location: 12 (just consumed gas: 12.324)
+  - location: 12 (just consumed gas: 12.330)
     [ (Pair "hello" { Elt "hello" "hi" } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair "hello" { Elt "hello" "hi" } None)
@@ -29,7 +29,7 @@ trace
     [ "hello"
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (just consumed gas: 0.756)
+  - location: 20 (just consumed gas: 0.757)
     [ (Some "hi")
       { Elt "hello" "hi" } ]
   - location: 21 (just consumed gas: 0.010)
@@ -53,7 +53,7 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["hello"] to "hi"
 trace
-  - location: 12 (just consumed gas: 12.274)
+  - location: 12 (just consumed gas: 12.280)
     [ (Pair "" { Elt "hello" "hi" } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair "" { Elt "hello" "hi" } None)
@@ -74,7 +74,7 @@ trace
     [ ""
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (just consumed gas: 0.700)
+  - location: 20 (just consumed gas: 0.701)
     [ None
       { Elt "hello" "hi" } ]
   - location: 21 (just consumed gas: 0.010)
@@ -99,7 +99,7 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "one"
 trace
-  - location: 12 (just consumed gas: 13.236)
+  - location: 12 (just consumed gas: 13.247)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
   - location: 12 (just consumed gas: 0.010)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None)
@@ -145,7 +145,7 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (just consumed gas: 11.728)
+  - location: 15 (just consumed gas: 11.738)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ]
   - location: 15 (just consumed gas: 0.010)
     [ {}
@@ -181,7 +181,7 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "two"
 trace
-  - location: 15 (just consumed gas: 12.178)
+  - location: 15 (just consumed gas: 12.163)
     [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
   - location: 15 (just consumed gas: 0.010)
     [ { Elt "1" (Some "two") }
@@ -230,7 +230,7 @@ big_map diff
   Set map(4)["3"] to "three"
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (just consumed gas: 12.198)
+  - location: 15 (just consumed gas: 12.183)
     [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
   - location: 15 (just consumed gas: 0.010)
     [ { Elt "3" (Some "three") }
@@ -279,7 +279,7 @@ big_map diff
   Unset map(4)["3"]
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (just consumed gas: 12.034)
+  - location: 15 (just consumed gas: 12.018)
     [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
   - location: 15 (just consumed gas: 0.010)
     [ { Elt "3" None }
@@ -327,7 +327,7 @@ big_map diff
   Unset map(4)["2"]
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (just consumed gas: 12.034)
+  - location: 15 (just consumed gas: 12.018)
     [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
   - location: 15 (just consumed gas: 0.010)
     [ { Elt "2" None }
@@ -375,7 +375,7 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "two"
 trace
-  - location: 15 (just consumed gas: 12.178)
+  - location: 15 (just consumed gas: 12.163)
     [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
   - location: 15 (just consumed gas: 0.010)
     [ { Elt "1" (Some "two") }
@@ -422,7 +422,7 @@ big_map diff
   New map(4) of type (big_map string nat)
   Unset map(4)["hello"]
 trace
-  - location: 13 (just consumed gas: 8.183)
+  - location: 13 (just consumed gas: 8.184)
     [ (Pair "hello" None {}) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -436,7 +436,7 @@ trace
     [ "hello"
       None
       {} ]
-  - location: 17 (just consumed gas: 0.787)
+  - location: 17 (just consumed gas: 0.792)
     [ None
       {} ]
   - location: 18 (just consumed gas: 0.010)
@@ -457,7 +457,7 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["hello"] to 4
 trace
-  - location: 13 (just consumed gas: 8.283)
+  - location: 13 (just consumed gas: 8.284)
     [ (Pair "hello" (Some 4) {}) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -471,7 +471,7 @@ trace
     [ "hello"
       (Some 4)
       {} ]
-  - location: 17 (just consumed gas: 0.787)
+  - location: 17 (just consumed gas: 0.792)
     [ None
       { Elt "hello" 4 } ]
   - location: 18 (just consumed gas: 0.010)
@@ -492,7 +492,7 @@ big_map diff
   New map(4) of type (big_map string nat)
   Unset map(4)["hello"]
 trace
-  - location: 13 (just consumed gas: 9.213)
+  - location: 13 (just consumed gas: 9.218)
     [ (Pair "hello" None { Elt "hello" 4 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -506,7 +506,7 @@ trace
     [ "hello"
       None
       { Elt "hello" 4 } ]
-  - location: 17 (just consumed gas: 0.792)
+  - location: 17 (just consumed gas: 0.796)
     [ (Some 4)
       {} ]
   - location: 18 (just consumed gas: 0.010)
@@ -527,7 +527,7 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["hello"] to 5
 trace
-  - location: 13 (just consumed gas: 9.313)
+  - location: 13 (just consumed gas: 9.318)
     [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hello"
@@ -541,7 +541,7 @@ trace
     [ "hello"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (just consumed gas: 0.792)
+  - location: 17 (just consumed gas: 0.796)
     [ (Some 4)
       { Elt "hello" 5 } ]
   - location: 18 (just consumed gas: 0.010)
@@ -563,7 +563,7 @@ big_map diff
   Set map(4)["hello"] to 4
   Set map(4)["hi"] to 5
 trace
-  - location: 13 (just consumed gas: 9.283)
+  - location: 13 (just consumed gas: 9.288)
     [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "hi"
@@ -577,7 +577,7 @@ trace
     [ "hi"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (just consumed gas: 0.759)
+  - location: 17 (just consumed gas: 0.763)
     [ None
       { Elt "hello" 4 ; Elt "hi" 5 } ]
   - location: 18 (just consumed gas: 0.010)
@@ -599,7 +599,7 @@ big_map diff
   Set map(4)["2"] to 2
   Unset map(4)["1"]
 trace
-  - location: 13 (just consumed gas: 10.071)
+  - location: 13 (just consumed gas: 10.080)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "1"
@@ -635,7 +635,7 @@ big_map diff
   Set map(4)["2"] to 2
   Unset map(4)["1"]
 trace
-  - location: 13 (just consumed gas: 10.071)
+  - location: 13 (just consumed gas: 10.080)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
   - location: 13 (just consumed gas: 0.010)
     [ "1"
@@ -672,7 +672,7 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["2"] to "two"
 trace
-  - location: 43 (just consumed gas: 59.598)
+  - location: 43 (just consumed gas: 59.608)
     [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
   - location: 43 (just consumed gas: 0.010)
     [ (Left Unit)
@@ -716,7 +716,7 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["3"] to "three"
 trace
-  - location: 43 (just consumed gas: 62.886)
+  - location: 43 (just consumed gas: 62.906)
     [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
   - location: 43 (just consumed gas: 0.010)
@@ -752,7 +752,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 43 (just consumed gas: 60.238)
+  - location: 43 (just consumed gas: 60.248)
     [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
   - location: 43 (just consumed gas: 0.010)
     [ (Right (Left (Right Unit)))
@@ -790,7 +790,7 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["foo"] to "bar"
 trace
-  - location: 43 (just consumed gas: 58.376)
+  - location: 43 (just consumed gas: 58.380)
     [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ]
   - location: 43 (just consumed gas: 0.010)
     [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))))
@@ -848,7 +848,7 @@ trace
       (Some "bar")
       {}
       { Pair "gaz" "baz" } ]
-  - location: 89 (just consumed gas: 0.744)
+  - location: 89 (just consumed gas: 0.747)
     [ { Elt "foo" "bar" }
       { Pair "gaz" "baz" } ]
   - location: 83 (just consumed gas: 0.035)
@@ -888,7 +888,7 @@ trace
       (Some "baz")
       {}
       { Elt "foo" "bar" } ]
-  - location: 102 (just consumed gas: 0.744)
+  - location: 102 (just consumed gas: 0.747)
     [ { Elt "gaz" "baz" }
       { Elt "foo" "bar" } ]
   - location: 96 (just consumed gas: 0.035)
@@ -926,7 +926,7 @@ big_map diff
   Set map(4)["3"] to "three"
   Set map(4)["1"] to "one"
 trace
-  - location: 43 (just consumed gas: 60.506)
+  - location: 43 (just consumed gas: 60.518)
     [ (Pair (Right (Right (Right (Left { Pair "3" "three" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
   - location: 43 (just consumed gas: 0.010)
@@ -979,7 +979,7 @@ trace
       (Some "three")
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 126 (just consumed gas: 0.724)
+  - location: 126 (just consumed gas: 0.727)
     [ { Elt "1" "one" ; Elt "3" "three" }
       { Elt "2" "two" } ]
   - location: 120 (just consumed gas: 0.035)
@@ -1015,7 +1015,7 @@ big_map diff
   New map(4) of type (big_map string string)
   Unset map(4)["1"]
 trace
-  - location: 43 (just consumed gas: 60.242)
+  - location: 43 (just consumed gas: 60.253)
     [ (Pair (Right (Right (Right (Right { "1" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
   - location: 43 (just consumed gas: 0.010)
@@ -1062,7 +1062,7 @@ trace
       None
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 147 (just consumed gas: 0.724)
+  - location: 147 (just consumed gas: 0.727)
     [ {}
       { Elt "2" "two" } ]
   - location: 141 (just consumed gas: 0.035)
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out
index b3b4ad23546c..d3b638425301 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- check_signature.out	
@@ -8,7 +8,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (just consumed gas: 100.025)
+  - location: 9 (just consumed gas: 100.026)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
@@ -138,7 +138,7 @@ At line 8 characters 14 to 18,
 script reached FAILWITH instruction
 with Unit
 trace
-  - location: 9 (just consumed gas: 100.015)
+  - location: 9 (just consumed gas: 100.016)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- map_map_side_effect.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- map_map_side_effect.out
index ab1abab3892b..c0ccce9a1057 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- map_map_side_effect.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- map_map_side_effect.out	
@@ -55,7 +55,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 16.662)
+  - location: 11 (just consumed gas: 16.632)
     [ (Pair 10 { Elt "foo" 1 } 1) ]
   - location: 11 (just consumed gas: 0.010)
     [ 10
@@ -117,7 +117,7 @@ trace
     [ 11
       10
       11 ]
-  - location: 20 (just consumed gas: 0.191)
+  - location: 20 (just consumed gas: 0.160)
     [ { Elt "foo" 11 }
       10
       11 ]
@@ -146,7 +146,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (just consumed gas: 17.033)
+  - location: 11 (just consumed gas: 16.967)
     [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 } 6) ]
   - location: 11 (just consumed gas: 0.010)
     [ 15
@@ -208,7 +208,7 @@ trace
     [ 20
       15
       20 ]
-  - location: 20 (just consumed gas: 0.181)
+  - location: 20 (just consumed gas: 0.150)
     [ (Pair "foo" 1)
       15
       20 ]
@@ -251,7 +251,7 @@ trace
     [ 16
       15
       36 ]
-  - location: 20 (just consumed gas: 0.197)
+  - location: 20 (just consumed gas: 0.160)
     [ { Elt "bar" 20 ; Elt "foo" 16 }
       15
       36 ]
diff --git a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out
index ccc823e6d72c..89623efd66d4 100644
--- a/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out	
+++ b/tezt/tests/expected/contract_opcodes.ml/Alpha- test Michelson opcodes- pack_unpack.out	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (just consumed gas: 19.424)
+  - location: 15 (just consumed gas: 19.185)
     [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
                   0x05070707070100000004746f746f020000000800030007000900010200000006000100020003)
             Unit) ]
@@ -40,7 +40,7 @@ trace
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
   - location: 25 (just consumed gas: 0.025)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 31 (just consumed gas: 2.753)
+  - location: 31 (just consumed gas: 2.514)
     [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) ]
   - location: 40 (just consumed gas: 0.010)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ]
@@ -70,7 +70,7 @@ At line 4 characters 14 to 26,
 script reached FAILWITH instruction
 with Unit
 trace
-  - location: 15 (just consumed gas: 19.424)
+  - location: 15 (just consumed gas: 19.185)
     [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
                   0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004)
             Unit) ]
diff --git a/tezt/tests/expected/contract_typecheck_regression.ml/Alpha- Tc scripts.out b/tezt/tests/expected/contract_typecheck_regression.ml/Alpha- Tc scripts.out
index 9878ca1fd4d7..291eabf89ba1 100644
--- a/tezt/tests/expected/contract_typecheck_regression.ml/Alpha- Tc scripts.out	
+++ b/tezt/tests/expected/contract_typecheck_regression.ml/Alpha- Tc scripts.out	
@@ -1,6 +1,6 @@
 
 ./octez-client --protocol ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK --mode mockup --no-base-dir-warnings typecheck script michelson_test_scripts/attic/accounts.tz michelson_test_scripts/attic/add1.tz michelson_test_scripts/attic/add1_list.tz michelson_test_scripts/attic/after_strategy.tz michelson_test_scripts/attic/always.tz michelson_test_scripts/attic/append.tz michelson_test_scripts/attic/at_least.tz michelson_test_scripts/attic/auction.tz michelson_test_scripts/attic/bad_lockup.tz michelson_test_scripts/attic/big_map_union.tz michelson_test_scripts/attic/cadr_annotation.tz michelson_test_scripts/attic/concat.tz michelson_test_scripts/attic/conditionals.tz michelson_test_scripts/attic/cons_twice.tz michelson_test_scripts/attic/cps_fact.tz michelson_test_scripts/attic/create_add1_lists.tz michelson_test_scripts/attic/data_publisher.tz michelson_test_scripts/attic/dispatch.tz michelson_test_scripts/attic/empty.tz michelson_test_scripts/attic/fail_amount.tz michelson_test_scripts/attic/faucet.tz michelson_test_scripts/attic/forward.tz michelson_test_scripts/attic/id.tz michelson_test_scripts/attic/infinite_loop.tz michelson_test_scripts/attic/insertion_sort.tz michelson_test_scripts/attic/int_publisher.tz michelson_test_scripts/attic/king_of_tez.tz michelson_test_scripts/attic/list_of_transactions.tz michelson_test_scripts/attic/queue.tz michelson_test_scripts/attic/reduce_map.tz michelson_test_scripts/attic/reentrancy.tz michelson_test_scripts/attic/reservoir.tz michelson_test_scripts/attic/scrutable_reservoir.tz michelson_test_scripts/attic/spawn_identities.tz michelson_test_scripts/entrypoints/big_map_entrypoints.tz michelson_test_scripts/entrypoints/delegatable_target.tz michelson_test_scripts/entrypoints/manager.tz michelson_test_scripts/entrypoints/no_default_target.tz michelson_test_scripts/entrypoints/no_entrypoint_target.tz michelson_test_scripts/entrypoints/rooted_target.tz michelson_test_scripts/entrypoints/simple_entrypoints.tz michelson_test_scripts/macros/assert.tz michelson_test_scripts/macros/assert_cmpeq.tz michelson_test_scripts/macros/assert_cmpge.tz michelson_test_scripts/macros/assert_cmpgt.tz michelson_test_scripts/macros/assert_cmple.tz michelson_test_scripts/macros/assert_cmplt.tz michelson_test_scripts/macros/assert_cmpneq.tz michelson_test_scripts/macros/assert_eq.tz michelson_test_scripts/macros/assert_ge.tz michelson_test_scripts/macros/assert_gt.tz michelson_test_scripts/macros/assert_le.tz michelson_test_scripts/macros/assert_lt.tz michelson_test_scripts/macros/assert_neq.tz michelson_test_scripts/macros/big_map_get_add.tz michelson_test_scripts/macros/big_map_mem.tz michelson_test_scripts/macros/build_list.tz michelson_test_scripts/macros/carn_and_cdrn.tz michelson_test_scripts/macros/compare.tz michelson_test_scripts/macros/compare_bytes.tz michelson_test_scripts/macros/fail.tz michelson_test_scripts/macros/guestbook.tz michelson_test_scripts/macros/macro_annotations.tz michelson_test_scripts/macros/map_caddaadr.tz michelson_test_scripts/macros/max_in_list.tz michelson_test_scripts/macros/min.tz michelson_test_scripts/macros/pair_macro.tz michelson_test_scripts/macros/set_caddaadr.tz michelson_test_scripts/macros/take_my_money.tz michelson_test_scripts/macros/unpair_macro.tz michelson_test_scripts/mini_scenarios/999_constant.tz michelson_test_scripts/mini_scenarios/add_clear_tickets_015.tz michelson_test_scripts/mini_scenarios/always_fails.tz michelson_test_scripts/mini_scenarios/authentication.tz michelson_test_scripts/mini_scenarios/big_map_all.tz michelson_test_scripts/mini_scenarios/big_map_entrypoints.tz michelson_test_scripts/mini_scenarios/big_map_magic.tz michelson_test_scripts/mini_scenarios/big_map_read.tz michelson_test_scripts/mini_scenarios/big_map_store.tz michelson_test_scripts/mini_scenarios/big_map_write.tz michelson_test_scripts/mini_scenarios/cache_consistency.tz michelson_test_scripts/mini_scenarios/check_signature.tz michelson_test_scripts/mini_scenarios/constant_entrypoints.tz michelson_test_scripts/mini_scenarios/constant_unit.tz michelson_test_scripts/mini_scenarios/create_contract.tz michelson_test_scripts/mini_scenarios/create_contract_simple.tz michelson_test_scripts/mini_scenarios/default_account.tz michelson_test_scripts/mini_scenarios/emit_events.tz michelson_test_scripts/mini_scenarios/execution_order_appender.tz michelson_test_scripts/mini_scenarios/execution_order_caller.tz michelson_test_scripts/mini_scenarios/execution_order_storer.tz michelson_test_scripts/mini_scenarios/fa12_reference.tz michelson_test_scripts/mini_scenarios/fail_on_false.tz michelson_test_scripts/mini_scenarios/generic_multisig.tz michelson_test_scripts/mini_scenarios/groth16.tz michelson_test_scripts/mini_scenarios/hardlimit.tz michelson_test_scripts/mini_scenarios/large_error.tz michelson_test_scripts/mini_scenarios/large_flat_contract.tz michelson_test_scripts/mini_scenarios/large_str_id.tz michelson_test_scripts/mini_scenarios/legacy_multisig.tz michelson_test_scripts/mini_scenarios/lockup.tz michelson_test_scripts/mini_scenarios/loop.tz michelson_test_scripts/mini_scenarios/lqt_fa12.mligo.tz michelson_test_scripts/mini_scenarios/multiple_en2.tz michelson_test_scripts/mini_scenarios/multiple_entrypoints_counter.tz michelson_test_scripts/mini_scenarios/multisig_dest_entrypoint.tz michelson_test_scripts/mini_scenarios/multisig_dest_entrypoint_arg.tz michelson_test_scripts/mini_scenarios/nat_id.tz michelson_test_scripts/mini_scenarios/noop_bytes.tz michelson_test_scripts/mini_scenarios/originate_contract.tz michelson_test_scripts/mini_scenarios/parameterized_multisig.tz michelson_test_scripts/mini_scenarios/parsable_contract.tz michelson_test_scripts/mini_scenarios/receive_tickets_in_big_map.tz michelson_test_scripts/mini_scenarios/replay.tz michelson_test_scripts/mini_scenarios/reveal_signed_preimage.tz michelson_test_scripts/mini_scenarios/sc_rollup_forward.tz michelson_test_scripts/mini_scenarios/sc_rollup_mint_and_forward.tz michelson_test_scripts/mini_scenarios/self_address_receiver.tz michelson_test_scripts/mini_scenarios/self_address_sender.tz michelson_test_scripts/mini_scenarios/send_ticket_list_016.tz michelson_test_scripts/mini_scenarios/send_ticket_list_multiple_016.tz michelson_test_scripts/mini_scenarios/send_tickets_from_storage_016.tz michelson_test_scripts/mini_scenarios/send_tickets_in_big_map_015.tz michelson_test_scripts/mini_scenarios/smart_rollup_mint_and_deposit_ticket_016.tz michelson_test_scripts/mini_scenarios/smart_rollup_receive_tickets_016.tz michelson_test_scripts/mini_scenarios/str_id.tz michelson_test_scripts/mini_scenarios/ticket_builder_fungible.tz michelson_test_scripts/mini_scenarios/ticket_builder_non_fungible.tz michelson_test_scripts/mini_scenarios/ticket_wallet_fungible.tz michelson_test_scripts/mini_scenarios/ticket_wallet_non_fungible.tz michelson_test_scripts/mini_scenarios/tickets_015.tz michelson_test_scripts/mini_scenarios/tickets_bag_016.tz michelson_test_scripts/mini_scenarios/tickets_bag_implicit_016.tz michelson_test_scripts/mini_scenarios/tickets_blackhole_016.tz michelson_test_scripts/mini_scenarios/tickets_create_and_send_015.tz michelson_test_scripts/mini_scenarios/tickets_list_blackhole_016.tz michelson_test_scripts/mini_scenarios/tickets_receive_and_store.tz michelson_test_scripts/mini_scenarios/tickets_send_016.tz michelson_test_scripts/mini_scenarios/tickets_send_with_tez_016.tz michelson_test_scripts/mini_scenarios/tickets_store_fst_and_rely_snd.tz michelson_test_scripts/mini_scenarios/tzip4_view.tz michelson_test_scripts/mini_scenarios/very_small.tz michelson_test_scripts/mini_scenarios/view_check_caller.tz michelson_test_scripts/mini_scenarios/view_registers_callers.tz michelson_test_scripts/mini_scenarios/viewable.tz michelson_test_scripts/mini_scenarios/vote_for_delegate.tz michelson_test_scripts/mini_scenarios/weather_insurance.tz michelson_test_scripts/mini_scenarios/xcat.tz michelson_test_scripts/mini_scenarios/xcat_dapp.tz michelson_test_scripts/non_regression/262_bug.tz michelson_test_scripts/non_regression/843_bug.tz michelson_test_scripts/non_regression/bad_annot_contract.tz michelson_test_scripts/non_regression/pairk_annot.tz michelson_test_scripts/opcodes/abs.tz michelson_test_scripts/opcodes/add.tz michelson_test_scripts/opcodes/add_bls12_381_fr.tz michelson_test_scripts/opcodes/add_bls12_381_g1.tz michelson_test_scripts/opcodes/add_bls12_381_g2.tz michelson_test_scripts/opcodes/add_delta_timestamp.tz michelson_test_scripts/opcodes/add_timestamp_delta.tz michelson_test_scripts/opcodes/address.tz michelson_test_scripts/opcodes/amount_after_fib_view.tz michelson_test_scripts/opcodes/amount_after_nonexistent_view.tz michelson_test_scripts/opcodes/amount_after_view.tz michelson_test_scripts/opcodes/and.tz michelson_test_scripts/opcodes/and_binary.tz michelson_test_scripts/opcodes/and_bytes_016.tz michelson_test_scripts/opcodes/and_logical_1.tz michelson_test_scripts/opcodes/balance.tz michelson_test_scripts/opcodes/balance_after_fib_view.tz michelson_test_scripts/opcodes/balance_after_nonexistent_view.tz michelson_test_scripts/opcodes/balance_after_view.tz michelson_test_scripts/opcodes/big_map_mem_nat.tz michelson_test_scripts/opcodes/big_map_mem_string.tz michelson_test_scripts/opcodes/big_map_to_self.tz michelson_test_scripts/opcodes/bls12_381_fr_push_bytes_not_padded.tz michelson_test_scripts/opcodes/bls12_381_fr_push_nat.tz michelson_test_scripts/opcodes/bls12_381_fr_to_int.tz michelson_test_scripts/opcodes/bls12_381_fr_to_mutez.tz michelson_test_scripts/opcodes/bls12_381_fr_z_int.tz michelson_test_scripts/opcodes/bls12_381_fr_z_nat.tz michelson_test_scripts/opcodes/bls12_381_z_fr_int.tz michelson_test_scripts/opcodes/bls12_381_z_fr_nat.tz michelson_test_scripts/opcodes/bytes.tz michelson_test_scripts/opcodes/bytes_of_int_016.tz michelson_test_scripts/opcodes/bytes_of_nat_016.tz michelson_test_scripts/opcodes/car.tz michelson_test_scripts/opcodes/cdr.tz michelson_test_scripts/opcodes/chain_id.tz michelson_test_scripts/opcodes/chain_id_store.tz michelson_test_scripts/opcodes/check_signature.tz michelson_test_scripts/opcodes/comb.tz michelson_test_scripts/opcodes/comb-get.tz michelson_test_scripts/opcodes/comb-literals.tz michelson_test_scripts/opcodes/comb-set.tz michelson_test_scripts/opcodes/comb-set-2.tz michelson_test_scripts/opcodes/compare.tz michelson_test_scripts/opcodes/compare_big_type.tz michelson_test_scripts/opcodes/compare_big_type2.tz michelson_test_scripts/opcodes/comparisons.tz michelson_test_scripts/opcodes/concat_hello.tz michelson_test_scripts/opcodes/concat_hello_bytes.tz michelson_test_scripts/opcodes/concat_list.tz michelson_test_scripts/opcodes/cons.tz michelson_test_scripts/opcodes/contains_all.tz michelson_test_scripts/opcodes/contract.tz michelson_test_scripts/opcodes/create_contract.tz michelson_test_scripts/opcodes/create_contract_rootname.tz michelson_test_scripts/opcodes/create_contract_rootname_alt.tz michelson_test_scripts/opcodes/create_contract_with_view.tz michelson_test_scripts/opcodes/diff_timestamps.tz michelson_test_scripts/opcodes/dig_eq.tz michelson_test_scripts/opcodes/dign.tz michelson_test_scripts/opcodes/dip.tz michelson_test_scripts/opcodes/dipn.tz michelson_test_scripts/opcodes/dropn.tz michelson_test_scripts/opcodes/dugn.tz michelson_test_scripts/opcodes/dup-n.tz michelson_test_scripts/opcodes/ediv.tz michelson_test_scripts/opcodes/ediv_mutez.tz michelson_test_scripts/opcodes/emit.tz michelson_test_scripts/opcodes/empty_map.tz michelson_test_scripts/opcodes/exec_concat.tz michelson_test_scripts/opcodes/fact.tz michelson_test_scripts/opcodes/first.tz michelson_test_scripts/opcodes/get_and_update_big_map.tz michelson_test_scripts/opcodes/get_and_update_map.tz michelson_test_scripts/opcodes/get_big_map_value.tz michelson_test_scripts/opcodes/get_map_value.tz michelson_test_scripts/opcodes/hash_consistency_checker.tz michelson_test_scripts/opcodes/hash_key.tz michelson_test_scripts/opcodes/hash_string.tz michelson_test_scripts/opcodes/if.tz michelson_test_scripts/opcodes/if_some.tz michelson_test_scripts/opcodes/int.tz michelson_test_scripts/opcodes/iter_fail.tz michelson_test_scripts/opcodes/keccak.tz michelson_test_scripts/opcodes/left_right.tz michelson_test_scripts/opcodes/level.tz michelson_test_scripts/opcodes/list_concat.tz michelson_test_scripts/opcodes/list_concat_bytes.tz michelson_test_scripts/opcodes/list_id.tz michelson_test_scripts/opcodes/list_id_map.tz michelson_test_scripts/opcodes/list_iter.tz michelson_test_scripts/opcodes/list_map_block.tz michelson_test_scripts/opcodes/list_size.tz michelson_test_scripts/opcodes/loop_failwith.tz michelson_test_scripts/opcodes/loop_left.tz michelson_test_scripts/opcodes/loop_left_failwith.tz michelson_test_scripts/opcodes/lsl_bytes_016.tz michelson_test_scripts/opcodes/lsr_bytes_016.tz michelson_test_scripts/opcodes/map_car.tz michelson_test_scripts/opcodes/map_id.tz michelson_test_scripts/opcodes/map_iter.tz michelson_test_scripts/opcodes/map_map.tz michelson_test_scripts/opcodes/map_map_sideeffect.tz michelson_test_scripts/opcodes/map_mem_nat.tz michelson_test_scripts/opcodes/map_mem_string.tz michelson_test_scripts/opcodes/map_size.tz michelson_test_scripts/opcodes/merge_comparable_pairs.tz michelson_test_scripts/opcodes/mul.tz michelson_test_scripts/opcodes/mul_bls12_381_fr.tz michelson_test_scripts/opcodes/mul_bls12_381_g1.tz michelson_test_scripts/opcodes/mul_bls12_381_g2.tz michelson_test_scripts/opcodes/mul_overflow.tz michelson_test_scripts/opcodes/munch.tz michelson_test_scripts/opcodes/mutez_to_bls12_381_fr.tz michelson_test_scripts/opcodes/neg.tz michelson_test_scripts/opcodes/neg_bls12_381_fr.tz michelson_test_scripts/opcodes/neg_bls12_381_g1.tz michelson_test_scripts/opcodes/neg_bls12_381_g2.tz michelson_test_scripts/opcodes/none.tz michelson_test_scripts/opcodes/noop.tz michelson_test_scripts/opcodes/not.tz michelson_test_scripts/opcodes/not_binary.tz michelson_test_scripts/opcodes/not_bytes_016.tz michelson_test_scripts/opcodes/or.tz michelson_test_scripts/opcodes/or_binary.tz michelson_test_scripts/opcodes/or_bytes_016.tz michelson_test_scripts/opcodes/originate_big_map.tz michelson_test_scripts/opcodes/packunpack.tz michelson_test_scripts/opcodes/packunpack_rev.tz michelson_test_scripts/opcodes/packunpack_rev_cty.tz michelson_test_scripts/opcodes/pair_id.tz michelson_test_scripts/opcodes/pairing_check.tz michelson_test_scripts/opcodes/pexec.tz michelson_test_scripts/opcodes/pexec_2.tz michelson_test_scripts/opcodes/proxy.tz michelson_test_scripts/opcodes/ret_int.tz michelson_test_scripts/opcodes/reverse.tz michelson_test_scripts/opcodes/reverse_loop.tz michelson_test_scripts/opcodes/sapling_empty_state.tz michelson_test_scripts/opcodes/self.tz michelson_test_scripts/opcodes/self_address.tz michelson_test_scripts/opcodes/self_address_after_fib_view.tz michelson_test_scripts/opcodes/self_address_after_nonexistent_view.tz michelson_test_scripts/opcodes/self_address_after_view.tz michelson_test_scripts/opcodes/self_after_fib_view.tz michelson_test_scripts/opcodes/self_after_nonexistent_view.tz michelson_test_scripts/opcodes/self_after_view.tz michelson_test_scripts/opcodes/self_with_default_entrypoint.tz michelson_test_scripts/opcodes/self_with_entrypoint.tz michelson_test_scripts/opcodes/sender.tz michelson_test_scripts/opcodes/sender_after_fib_view.tz michelson_test_scripts/opcodes/sender_after_nonexistent_view.tz michelson_test_scripts/opcodes/sender_after_view.tz michelson_test_scripts/opcodes/set_car.tz michelson_test_scripts/opcodes/set_cdr.tz michelson_test_scripts/opcodes/set_delegate.tz michelson_test_scripts/opcodes/set_id.tz michelson_test_scripts/opcodes/set_iter.tz michelson_test_scripts/opcodes/set_member.tz michelson_test_scripts/opcodes/set_size.tz michelson_test_scripts/opcodes/sets.tz michelson_test_scripts/opcodes/sha3.tz michelson_test_scripts/opcodes/shifts.tz michelson_test_scripts/opcodes/slice.tz michelson_test_scripts/opcodes/slice_bytes.tz michelson_test_scripts/opcodes/slices.tz michelson_test_scripts/opcodes/source.tz michelson_test_scripts/opcodes/split_bytes.tz michelson_test_scripts/opcodes/split_string.tz michelson_test_scripts/opcodes/store_bls12_381_fr.tz michelson_test_scripts/opcodes/store_bls12_381_g1.tz michelson_test_scripts/opcodes/store_bls12_381_g2.tz michelson_test_scripts/opcodes/store_input.tz michelson_test_scripts/opcodes/store_now.tz michelson_test_scripts/opcodes/str_id.tz michelson_test_scripts/opcodes/sub_timestamp_delta.tz michelson_test_scripts/opcodes/subset.tz michelson_test_scripts/opcodes/tez_add_sub.tz michelson_test_scripts/opcodes/ticket_bad.tz michelson_test_scripts/opcodes/ticket_big_store.tz michelson_test_scripts/opcodes/ticket_join.tz michelson_test_scripts/opcodes/ticket_read.tz michelson_test_scripts/opcodes/ticket_split.tz michelson_test_scripts/opcodes/ticket_store.tz michelson_test_scripts/opcodes/ticket_store-2.tz michelson_test_scripts/opcodes/ticketer.tz michelson_test_scripts/opcodes/ticketer-2.tz michelson_test_scripts/opcodes/transfer_amount.tz michelson_test_scripts/opcodes/transfer_tokens.tz michelson_test_scripts/opcodes/uncomb.tz michelson_test_scripts/opcodes/unpair.tz michelson_test_scripts/opcodes/unpair_field_annotation_mismatch.tz michelson_test_scripts/opcodes/update_big_map.tz michelson_test_scripts/opcodes/utxo_read.tz michelson_test_scripts/opcodes/utxor.tz michelson_test_scripts/opcodes/view_fib.tz michelson_test_scripts/opcodes/view_mutual_recursion.tz michelson_test_scripts/opcodes/view_op_add.tz michelson_test_scripts/opcodes/view_op_constant.tz michelson_test_scripts/opcodes/view_op_id.tz michelson_test_scripts/opcodes/view_op_nonexistent_addr.tz michelson_test_scripts/opcodes/view_op_nonexistent_func.tz michelson_test_scripts/opcodes/view_op_test_step_contants.tz michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_input_type.tz michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_output_type.tz michelson_test_scripts/opcodes/view_rec.tz michelson_test_scripts/opcodes/view_toplevel_lib.tz michelson_test_scripts/opcodes/voting_power.tz michelson_test_scripts/opcodes/xor.tz michelson_test_scripts/opcodes/xor_bytes_016.tz --details --display-names
-Well typed (Gas remaining: 1039933.433 units remaining)	michelson_test_scripts/attic/accounts.tz
+Well typed (Gas remaining: 1039933.430 units remaining)	michelson_test_scripts/attic/accounts.tz
 { parameter
     (or (key_hash %Initialize)
         (pair %Withdraw (key %from) (pair (mutez %withdraw_amount) (signature %sig)))) ;
@@ -495,7 +495,7 @@ Well typed (Gas remaining: 1039993.685 units remaining)	michelson_test_scripts/a
          /* [ list operation : string ] */ ;
          PAIR
          /* [ pair (list operation) string ] */ } }
-Well typed (Gas remaining: 1039990.666 units remaining)	michelson_test_scripts/attic/conditionals.tz
+Well typed (Gas remaining: 1039990.665 units remaining)	michelson_test_scripts/attic/conditionals.tz
 { parameter (or string (option int)) ;
   storage string ;
   code { CAR
@@ -690,7 +690,7 @@ Well typed (Gas remaining: 1039976.005 units remaining)	michelson_test_scripts/a
               PAIR
               /* [ pair (list operation) (pair key nat) string ] */ }
             { FAIL } } }
-Well typed (Gas remaining: 1039983.549 units remaining)	michelson_test_scripts/attic/dispatch.tz
+Well typed (Gas remaining: 1039983.548 units remaining)	michelson_test_scripts/attic/dispatch.tz
 { parameter (or string (pair string (lambda unit string))) ;
   storage (pair string (map string (lambda unit string))) ;
   code { DUP
@@ -800,7 +800,7 @@ Well typed (Gas remaining: 1039988.163 units remaining)	michelson_test_scripts/a
          /* [ list operation : timestamp ] */ ;
          PAIR
          /* [ pair (list operation) timestamp ] */ } }
-Well typed (Gas remaining: 1039676.452 units remaining)	michelson_test_scripts/attic/forward.tz
+Well typed (Gas remaining: 1039676.449 units remaining)	michelson_test_scripts/attic/forward.tz
 { parameter (or string nat) ;
   storage
     (pair (pair nat (pair mutez mutez))
@@ -3117,7 +3117,7 @@ Well typed (Gas remaining: 1039970.211 units remaining)	michelson_test_scripts/a
               /* [ list operation : pair (pair timestamp mutez) address address ] */ ;
               PAIR
               /* [ pair (list operation) (pair timestamp mutez) address address ] */ } } }
-Well typed (Gas remaining: 1039891.109 units remaining)	michelson_test_scripts/attic/scrutable_reservoir.tz
+Well typed (Gas remaining: 1039891.106 units remaining)	michelson_test_scripts/attic/scrutable_reservoir.tz
 { parameter unit ;
   storage
     (pair string
@@ -3361,7 +3361,7 @@ Well typed (Gas remaining: 1039891.109 units remaining)	michelson_test_scripts/a
                       : pair string timestamp (pair mutez mutez) address address address ] */ ;
                    PAIR
                    /* [ pair (list operation) string timestamp (pair mutez mutez) address address address ] */ } } } }
-Well typed (Gas remaining: 1039977.018 units remaining)	michelson_test_scripts/attic/spawn_identities.tz
+Well typed (Gas remaining: 1039977.017 units remaining)	michelson_test_scripts/attic/spawn_identities.tz
 { parameter nat ;
   storage (list address) ;
   code { /* [ pair string string ] */
@@ -3536,7 +3536,7 @@ Well typed (Gas remaining: 1039955.119 units remaining)	michelson_test_scripts/e
              /* [ list operation : pair (big_map string nat) (big_map string nat) ] */ ;
              PAIR
              /* [ pair (list operation) (big_map string nat) (big_map string nat) ] */ } } }
-Well typed (Gas remaining: 1039961.800 units remaining)	michelson_test_scripts/entrypoints/delegatable_target.tz
+Well typed (Gas remaining: 1039961.799 units remaining)	michelson_test_scripts/entrypoints/delegatable_target.tz
 { parameter
     (or (or (key_hash %set_delegate) (unit %remove_delegate)) (or %default string nat)) ;
   storage (pair key_hash (pair string nat)) ;
@@ -4930,7 +4930,7 @@ Well typed (Gas remaining: 1039995.168 units remaining)	michelson_test_scripts/m
          /* [ list operation : big_map nat string ] */ ;
          PAIR
          /* [ pair (list operation) (big_map nat string) ] */ } }
-Well typed (Gas remaining: 1039986.489 units remaining)	michelson_test_scripts/mini_scenarios/check_signature.tz
+Well typed (Gas remaining: 1039986.487 units remaining)	michelson_test_scripts/mini_scenarios/check_signature.tz
 { parameter (pair key signature bytes) ;
   storage unit ;
   code { CAR
@@ -5040,7 +5040,7 @@ Well typed (Gas remaining: 1039124.558 units remaining)	michelson_test_scripts/m
          NIL operation ;
          PAIR }
   /* [] */ }
-Well typed (Gas remaining: 1039973.798 units remaining)	michelson_test_scripts/mini_scenarios/create_contract.tz
+Well typed (Gas remaining: 1039973.796 units remaining)	michelson_test_scripts/mini_scenarios/create_contract.tz
 { parameter (option address) ;
   storage unit ;
   code { /* [ pair string string ] */
@@ -5111,7 +5111,7 @@ Well typed (Gas remaining: 1039973.798 units remaining)	michelson_test_scripts/m
              /* [ list operation : unit ] */ ;
              PAIR
              /* [ pair (list operation) unit ] */ } } }
-Well typed (Gas remaining: 1039992.213 units remaining)	michelson_test_scripts/mini_scenarios/create_contract_simple.tz
+Well typed (Gas remaining: 1039992.212 units remaining)	michelson_test_scripts/mini_scenarios/create_contract_simple.tz
 { parameter unit ;
   storage unit ;
   code { CAR
@@ -5158,7 +5158,7 @@ Well typed (Gas remaining: 1039993.856 units remaining)	michelson_test_scripts/m
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039991.142 units remaining)	michelson_test_scripts/mini_scenarios/emit_events.tz
+Well typed (Gas remaining: 1039991.141 units remaining)	michelson_test_scripts/mini_scenarios/emit_events.tz
 { parameter unit ;
   storage unit ;
   code { DROP
@@ -5247,7 +5247,7 @@ Well typed (Gas remaining: 1039997.089 units remaining)	michelson_test_scripts/m
          /* [ list operation : string ] */ ;
          PAIR
          /* [ pair (list operation) string ] */ } }
-Well typed (Gas remaining: 1039371.104 units remaining)	michelson_test_scripts/mini_scenarios/fa12_reference.tz
+Well typed (Gas remaining: 1039371.088 units remaining)	michelson_test_scripts/mini_scenarios/fa12_reference.tz
 { parameter
     (or (or (or (pair %transfer (address :from) (pair (address :to) (nat :value)))
                 (pair %approve (address :spender) (nat :value)))
@@ -7951,7 +7951,7 @@ Well typed (Gas remaining: 1039371.104 units remaining)	michelson_test_scripts/m
                             : pair (big_map address (pair nat (map address nat))) address bool nat ] */ ;
                          PAIR
                          /* [ pair (list operation) (big_map address (pair nat (map address nat))) address bool nat ] */ } } } } } }
-Well typed (Gas remaining: 1039995.762 units remaining)	michelson_test_scripts/mini_scenarios/fail_on_false.tz
+Well typed (Gas remaining: 1039995.761 units remaining)	michelson_test_scripts/mini_scenarios/fail_on_false.tz
 { parameter bool ;
   storage unit ;
   code { UNPAIR
@@ -8409,7 +8409,7 @@ Well typed (Gas remaining: 1039992.602 units remaining)	michelson_test_scripts/m
          /* [ list operation : int ] */ ;
          PAIR
          /* [ pair (list operation) int ] */ } }
-Well typed (Gas remaining: 1039991.479 units remaining)	michelson_test_scripts/mini_scenarios/large_error.tz
+Well typed (Gas remaining: 1039991.478 units remaining)	michelson_test_scripts/mini_scenarios/large_error.tz
 { parameter int ;
   storage unit ;
   code { CAR
@@ -32001,7 +32001,7 @@ Well typed (Gas remaining: 1039992.719 units remaining)	michelson_test_scripts/m
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039751.725 units remaining)	michelson_test_scripts/mini_scenarios/lqt_fa12.mligo.tz
+Well typed (Gas remaining: 1039751.719 units remaining)	michelson_test_scripts/mini_scenarios/lqt_fa12.mligo.tz
 { parameter
     (or (or (or (pair %approve (address %spender) (nat %value))
                 (pair %getAllowance
@@ -33914,7 +33914,7 @@ Well typed (Gas remaining: 1039942.668 units remaining)	michelson_test_scripts/m
          /* [ list operation : pair bool (map nat (pair bool bool)) key key ] */ ;
          PAIR
          /* [ pair (list operation) bool (map nat (pair bool bool)) key key ] */ } }
-Well typed (Gas remaining: 1039980.815 units remaining)	michelson_test_scripts/mini_scenarios/parsable_contract.tz
+Well typed (Gas remaining: 1039980.814 units remaining)	michelson_test_scripts/mini_scenarios/parsable_contract.tz
 { parameter int ;
   storage (map int address) ;
   code { UNPAIR
@@ -34148,7 +34148,7 @@ Well typed (Gas remaining: 1039993.501 units remaining)	michelson_test_scripts/m
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039986.350 units remaining)	michelson_test_scripts/mini_scenarios/send_ticket_list_016.tz
+Well typed (Gas remaining: 1039986.349 units remaining)	michelson_test_scripts/mini_scenarios/send_ticket_list_016.tz
 { parameter address ;
   storage unit ;
   code { CAR
@@ -34187,7 +34187,7 @@ Well typed (Gas remaining: 1039986.350 units remaining)	michelson_test_scripts/m
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039981.329 units remaining)	michelson_test_scripts/mini_scenarios/send_ticket_list_multiple_016.tz
+Well typed (Gas remaining: 1039981.327 units remaining)	michelson_test_scripts/mini_scenarios/send_ticket_list_multiple_016.tz
 { parameter address ;
   storage unit ;
   code { CAR
@@ -34239,7 +34239,7 @@ Well typed (Gas remaining: 1039981.329 units remaining)	michelson_test_scripts/m
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039981.566 units remaining)	michelson_test_scripts/mini_scenarios/send_tickets_from_storage_016.tz
+Well typed (Gas remaining: 1039981.564 units remaining)	michelson_test_scripts/mini_scenarios/send_tickets_from_storage_016.tz
 { parameter (or (unit %mint) (contract %send (list (ticket string)))) ;
   storage (list (ticket string)) ;
   code { UNPAIR
@@ -34285,7 +34285,7 @@ Well typed (Gas remaining: 1039981.566 units remaining)	michelson_test_scripts/m
              /* [ list operation : list (ticket string) ] */ ;
              PAIR
              /* [ pair (list operation) (list (ticket string)) ] */ } } }
-Well typed (Gas remaining: 1039968.366 units remaining)	michelson_test_scripts/mini_scenarios/send_tickets_in_big_map_015.tz
+Well typed (Gas remaining: 1039968.364 units remaining)	michelson_test_scripts/mini_scenarios/send_tickets_in_big_map_015.tz
 { parameter address ;
   storage unit ;
   code { CAR
@@ -34925,7 +34925,7 @@ Well typed (Gas remaining: 1039960.699 units remaining)	michelson_test_scripts/m
              /* [ list operation : pair address (big_map (pair address nat) (ticket nat)) ] */ } ;
          PAIR
          /* [ pair (list operation) address (big_map (pair address nat) (ticket nat)) ] */ } }
-Well typed (Gas remaining: 1039993.132 units remaining)	michelson_test_scripts/mini_scenarios/tickets_015.tz
+Well typed (Gas remaining: 1039993.131 units remaining)	michelson_test_scripts/mini_scenarios/tickets_015.tz
 { parameter unit ;
   storage (list (ticket string)) ;
   code { CDR
@@ -34943,7 +34943,7 @@ Well typed (Gas remaining: 1039993.132 units remaining)	michelson_test_scripts/m
          /* [ list operation : list (ticket string) ] */ ;
          PAIR
          /* [ pair (list operation) (list (ticket string)) ] */ } }
-Well typed (Gas remaining: 1039986.392 units remaining)	michelson_test_scripts/mini_scenarios/tickets_bag_016.tz
+Well typed (Gas remaining: 1039986.391 units remaining)	michelson_test_scripts/mini_scenarios/tickets_bag_016.tz
 { parameter (or (ticket %save string) (address %send)) ;
   storage (list (ticket string)) ;
   code { UNPAIR
@@ -34980,7 +34980,7 @@ Well typed (Gas remaining: 1039986.392 units remaining)	michelson_test_scripts/m
                  PAIR
                  /* [ pair (list operation) (list (ticket string)) ] */ }
                { PUSH string "no ticket to send" /* [ string : address ] */ ; FAILWITH /* [] */ } } } }
-Well typed (Gas remaining: 1039986.392 units remaining)	michelson_test_scripts/mini_scenarios/tickets_bag_implicit_016.tz
+Well typed (Gas remaining: 1039986.391 units remaining)	michelson_test_scripts/mini_scenarios/tickets_bag_implicit_016.tz
 { parameter (or (ticket %save string) (address %send)) ;
   storage (list (ticket string)) ;
   code { UNPAIR
@@ -35026,7 +35026,7 @@ Well typed (Gas remaining: 1039997.932 units remaining)	michelson_test_scripts/m
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039961.309 units remaining)	michelson_test_scripts/mini_scenarios/tickets_create_and_send_015.tz
+Well typed (Gas remaining: 1039961.303 units remaining)	michelson_test_scripts/mini_scenarios/tickets_create_and_send_015.tz
 { parameter (pair address address) ;
   storage (list (ticket string)) ;
   code { CAR
@@ -35169,7 +35169,7 @@ Well typed (Gas remaining: 1039997.186 units remaining)	michelson_test_scripts/m
          /* [ list operation : option (ticket string) ] */ ;
          PAIR
          /* [ pair (list operation) (option (ticket string)) ] */ } }
-Well typed (Gas remaining: 1039987.531 units remaining)	michelson_test_scripts/mini_scenarios/tickets_send_016.tz
+Well typed (Gas remaining: 1039987.529 units remaining)	michelson_test_scripts/mini_scenarios/tickets_send_016.tz
 { parameter (pair address nat) ;
   storage unit ;
   code { CAR
@@ -35201,7 +35201,7 @@ Well typed (Gas remaining: 1039987.531 units remaining)	michelson_test_scripts/m
              /* [ list operation : unit ] */ ;
              PAIR
              /* [ pair (list operation) unit ] */ } } }
-Well typed (Gas remaining: 1039988.098 units remaining)	michelson_test_scripts/mini_scenarios/tickets_send_with_tez_016.tz
+Well typed (Gas remaining: 1039988.096 units remaining)	michelson_test_scripts/mini_scenarios/tickets_send_with_tez_016.tz
 { parameter address ;
   storage unit ;
   code { CAR
@@ -35231,7 +35231,7 @@ Well typed (Gas remaining: 1039988.098 units remaining)	michelson_test_scripts/m
              /* [ list operation : unit ] */ ;
              PAIR
              /* [ pair (list operation) unit ] */ } } }
-Well typed (Gas remaining: 1039988.830 units remaining)	michelson_test_scripts/mini_scenarios/tickets_store_fst_and_rely_snd.tz
+Well typed (Gas remaining: 1039988.829 units remaining)	michelson_test_scripts/mini_scenarios/tickets_store_fst_and_rely_snd.tz
 { parameter (pair (pair (ticket string) (ticket string)) address) ;
   storage (option (ticket string)) ;
   code { CAR
@@ -35333,7 +35333,7 @@ Well typed (Gas remaining: 1039997.552 units remaining)	michelson_test_scripts/m
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039982.524 units remaining)	michelson_test_scripts/mini_scenarios/view_check_caller.tz
+Well typed (Gas remaining: 1039982.522 units remaining)	michelson_test_scripts/mini_scenarios/view_check_caller.tz
 { parameter address ;
   storage (option address) ;
   code { CAR
@@ -35367,7 +35367,7 @@ Well typed (Gas remaining: 1039982.524 units remaining)	michelson_test_scripts/m
          /* [ list operation : option address ] */ ;
          PAIR
          /* [ pair (list operation) (option address) ] */ } }
-Well typed (Gas remaining: 1039991.168 units remaining)	michelson_test_scripts/mini_scenarios/view_registers_callers.tz
+Well typed (Gas remaining: 1039991.454 units remaining)	michelson_test_scripts/mini_scenarios/view_registers_callers.tz
 { parameter unit ;
   storage (list address) ;
   code { CDR
@@ -35389,7 +35389,7 @@ Well typed (Gas remaining: 1039991.168 units remaining)	michelson_test_scripts/m
          IF_CONS
            { DIP { DROP /* [] */ } /* [ address ] */ ; SOME /* [ option address ] */ }
            { NONE address /* [ option address ] */ } } }
-Well typed (Gas remaining: 1039959.457 units remaining)	michelson_test_scripts/mini_scenarios/viewable.tz
+Well typed (Gas remaining: 1039960.608 units remaining)	michelson_test_scripts/mini_scenarios/viewable.tz
 { parameter nat ;
   storage nat ;
   code { CAR
@@ -35700,7 +35700,7 @@ Well typed (Gas remaining: 1039964.178 units remaining)	michelson_test_scripts/m
          /* [ list operation : pair (pair address address) nat key ] */ ;
          PAIR
          /* [ pair (list operation) (pair address address) nat key ] */ } }
-Well typed (Gas remaining: 1039967.366 units remaining)	michelson_test_scripts/mini_scenarios/xcat.tz
+Well typed (Gas remaining: 1039967.364 units remaining)	michelson_test_scripts/mini_scenarios/xcat.tz
 { parameter bytes ;
   storage unit ;
   code { CAR @preimage
@@ -36344,7 +36344,7 @@ Well typed (Gas remaining: 1039996.828 units remaining)	michelson_test_scripts/o
          /* [ list operation : option address ] */ ;
          PAIR
          /* [ pair (list operation) (option address) ] */ } }
-Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/opcodes/amount_after_fib_view.tz
+Well typed (Gas remaining: 1039986.649 units remaining)	michelson_test_scripts/opcodes/amount_after_fib_view.tz
 { parameter address ;
   storage mutez ;
   code { CAR
@@ -36379,7 +36379,7 @@ Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/o
          /* [ list operation : mutez ] */ ;
          PAIR
          /* [ pair (list operation) mutez ] */ } }
-Well typed (Gas remaining: 1039986.857 units remaining)	michelson_test_scripts/opcodes/amount_after_nonexistent_view.tz
+Well typed (Gas remaining: 1039986.856 units remaining)	michelson_test_scripts/opcodes/amount_after_nonexistent_view.tz
 { parameter address ;
   storage mutez ;
   code { CAR
@@ -36412,7 +36412,7 @@ Well typed (Gas remaining: 1039986.857 units remaining)	michelson_test_scripts/o
          /* [ list operation : mutez ] */ ;
          PAIR
          /* [ pair (list operation) mutez ] */ } }
-Well typed (Gas remaining: 1039986.473 units remaining)	michelson_test_scripts/opcodes/amount_after_view.tz
+Well typed (Gas remaining: 1039986.472 units remaining)	michelson_test_scripts/opcodes/amount_after_view.tz
 { parameter address ;
   storage mutez ;
   code { CAR
@@ -36575,7 +36575,7 @@ Well typed (Gas remaining: 1039997.552 units remaining)	michelson_test_scripts/o
          /* [ list operation : mutez ] */ ;
          PAIR
          /* [ pair (list operation) mutez ] */ } }
-Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/opcodes/balance_after_fib_view.tz
+Well typed (Gas remaining: 1039986.649 units remaining)	michelson_test_scripts/opcodes/balance_after_fib_view.tz
 { parameter address ;
   storage mutez ;
   code { CAR
@@ -36610,7 +36610,7 @@ Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/o
          /* [ list operation : mutez ] */ ;
          PAIR
          /* [ pair (list operation) mutez ] */ } }
-Well typed (Gas remaining: 1039986.857 units remaining)	michelson_test_scripts/opcodes/balance_after_nonexistent_view.tz
+Well typed (Gas remaining: 1039986.856 units remaining)	michelson_test_scripts/opcodes/balance_after_nonexistent_view.tz
 { parameter address ;
   storage mutez ;
   code { CAR
@@ -36643,7 +36643,7 @@ Well typed (Gas remaining: 1039986.857 units remaining)	michelson_test_scripts/o
          /* [ list operation : mutez ] */ ;
          PAIR
          /* [ pair (list operation) mutez ] */ } }
-Well typed (Gas remaining: 1039986.473 units remaining)	michelson_test_scripts/opcodes/balance_after_view.tz
+Well typed (Gas remaining: 1039986.472 units remaining)	michelson_test_scripts/opcodes/balance_after_view.tz
 { parameter address ;
   storage mutez ;
   code { CAR
@@ -36719,7 +36719,7 @@ Well typed (Gas remaining: 1039993.786 units remaining)	michelson_test_scripts/o
          /* [ list operation : pair (big_map string nat) (option bool) ] */ ;
          PAIR
          /* [ pair (list operation) (big_map string nat) (option bool) ] */ } }
-Well typed (Gas remaining: 1039987.824 units remaining)	michelson_test_scripts/opcodes/big_map_to_self.tz
+Well typed (Gas remaining: 1039987.823 units remaining)	michelson_test_scripts/opcodes/big_map_to_self.tz
 { parameter (or (pair %have_fun (big_map string nat) unit) (unit %default)) ;
   storage (big_map string nat) ;
   code { UNPAIR
@@ -37248,7 +37248,7 @@ Well typed (Gas remaining: 1039991.939 units remaining)	michelson_test_scripts/o
          /* [ list operation : pair nat nat nat unit ] */ ;
          PAIR
          /* [ pair (list operation) nat nat nat unit ] */ } }
-Well typed (Gas remaining: 1039991.932 units remaining)	michelson_test_scripts/opcodes/comb-set-2.tz
+Well typed (Gas remaining: 1039991.931 units remaining)	michelson_test_scripts/opcodes/comb-set-2.tz
 { parameter (pair nat nat nat unit) ;
   storage (option (pair int nat string bytes)) ;
   code { CAR
@@ -37271,7 +37271,7 @@ Well typed (Gas remaining: 1039991.932 units remaining)	michelson_test_scripts/o
          /* [ list operation : option (pair int nat string bytes) ] */ ;
          PAIR
          /* [ pair (list operation) (option (pair int nat string bytes)) ] */ } }
-Well typed (Gas remaining: 1039839.831 units remaining)	michelson_test_scripts/opcodes/compare.tz
+Well typed (Gas remaining: 1039839.822 units remaining)	michelson_test_scripts/opcodes/compare.tz
 { parameter unit ;
   storage unit ;
   code { DROP
@@ -45580,7 +45580,7 @@ Well typed (Gas remaining: 1039977.792 units remaining)	michelson_test_scripts/o
          /* [ list operation : list (list bool) ] */ ;
          PAIR
          /* [ pair (list operation) (list (list bool)) ] */ } }
-Well typed (Gas remaining: 1039996.040 units remaining)	michelson_test_scripts/opcodes/concat_hello.tz
+Well typed (Gas remaining: 1039996.039 units remaining)	michelson_test_scripts/opcodes/concat_hello.tz
 { parameter (list string) ;
   storage (list string) ;
   code { CAR
@@ -45602,7 +45602,7 @@ Well typed (Gas remaining: 1039996.114 units remaining)	michelson_test_scripts/o
          /* [ list operation : list bytes ] */ ;
          PAIR
          /* [ pair (list operation) (list bytes) ] */ } }
-Well typed (Gas remaining: 1039992.643 units remaining)	michelson_test_scripts/opcodes/concat_list.tz
+Well typed (Gas remaining: 1039992.642 units remaining)	michelson_test_scripts/opcodes/concat_list.tz
 { parameter (list string) ;
   storage string ;
   code { CAR
@@ -45804,7 +45804,7 @@ Well typed (Gas remaining: 1039992.030 units remaining)	michelson_test_scripts/o
          /* [ list operation : option address ] */ ;
          PAIR
          /* [ pair (list operation) (option address) ] */ } }
-Well typed (Gas remaining: 1039990.960 units remaining)	michelson_test_scripts/opcodes/create_contract_with_view.tz
+Well typed (Gas remaining: 1039991.039 units remaining)	michelson_test_scripts/opcodes/create_contract_with_view.tz
 { parameter unit ;
   storage (option address) ;
   code { /* [ pair unit unit ] */
@@ -46254,7 +46254,7 @@ Well typed (Gas remaining: 1039991.312 units remaining)	michelson_test_scripts/o
          /* [ list operation : or (option (pair nat mutez)) (option (pair mutez mutez)) ] */ ;
          PAIR
          /* [ pair (list operation) (or (option (pair nat mutez)) (option (pair mutez mutez))) ] */ } }
-Well typed (Gas remaining: 1039991.082 units remaining)	michelson_test_scripts/opcodes/emit.tz
+Well typed (Gas remaining: 1039991.081 units remaining)	michelson_test_scripts/opcodes/emit.tz
 { parameter unit ;
   storage unit ;
   code { DROP
@@ -46285,7 +46285,7 @@ Well typed (Gas remaining: 1039991.082 units remaining)	michelson_test_scripts/o
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039994.547 units remaining)	michelson_test_scripts/opcodes/empty_map.tz
+Well typed (Gas remaining: 1039994.545 units remaining)	michelson_test_scripts/opcodes/empty_map.tz
 { storage (map string string) ;
   parameter unit ;
   code { DROP
@@ -46304,7 +46304,7 @@ Well typed (Gas remaining: 1039994.547 units remaining)	michelson_test_scripts/o
          /* [ list operation : map string string ] */ ;
          PAIR
          /* [ pair (list operation) (map string string) ] */ } }
-Well typed (Gas remaining: 1039992.486 units remaining)	michelson_test_scripts/opcodes/exec_concat.tz
+Well typed (Gas remaining: 1039992.485 units remaining)	michelson_test_scripts/opcodes/exec_concat.tz
 { parameter string ;
   storage string ;
   code { CAR
@@ -46493,7 +46493,7 @@ Well typed (Gas remaining: 1039995.431 units remaining)	michelson_test_scripts/o
          /* [ list operation : option bool ] */ ;
          PAIR
          /* [ pair (list operation) (option bool) ] */ } }
-Well typed (Gas remaining: 1039996.125 units remaining)	michelson_test_scripts/opcodes/if_some.tz
+Well typed (Gas remaining: 1039996.124 units remaining)	michelson_test_scripts/opcodes/if_some.tz
 { parameter (option string) ;
   storage string ;
   code { CAR
@@ -48404,7 +48404,7 @@ Well typed (Gas remaining: 1039990.287 units remaining)	michelson_test_scripts/o
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/opcodes/self_address_after_fib_view.tz
+Well typed (Gas remaining: 1039986.649 units remaining)	michelson_test_scripts/opcodes/self_address_after_fib_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48439,7 +48439,7 @@ Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039987.134 units remaining)	michelson_test_scripts/opcodes/self_address_after_nonexistent_view.tz
+Well typed (Gas remaining: 1039987.133 units remaining)	michelson_test_scripts/opcodes/self_address_after_nonexistent_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48472,7 +48472,7 @@ Well typed (Gas remaining: 1039987.134 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039986.473 units remaining)	michelson_test_scripts/opcodes/self_address_after_view.tz
+Well typed (Gas remaining: 1039986.472 units remaining)	michelson_test_scripts/opcodes/self_address_after_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48507,7 +48507,7 @@ Well typed (Gas remaining: 1039986.473 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039986.142 units remaining)	michelson_test_scripts/opcodes/self_after_fib_view.tz
+Well typed (Gas remaining: 1039986.141 units remaining)	michelson_test_scripts/opcodes/self_after_fib_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48544,7 +48544,7 @@ Well typed (Gas remaining: 1039986.142 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039986.535 units remaining)	michelson_test_scripts/opcodes/self_after_nonexistent_view.tz
+Well typed (Gas remaining: 1039986.534 units remaining)	michelson_test_scripts/opcodes/self_after_nonexistent_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48579,7 +48579,7 @@ Well typed (Gas remaining: 1039986.535 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039985.966 units remaining)	michelson_test_scripts/opcodes/self_after_view.tz
+Well typed (Gas remaining: 1039985.965 units remaining)	michelson_test_scripts/opcodes/self_after_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48720,7 +48720,7 @@ Well typed (Gas remaining: 1039997.552 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/opcodes/sender_after_fib_view.tz
+Well typed (Gas remaining: 1039986.649 units remaining)	michelson_test_scripts/opcodes/sender_after_fib_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48755,7 +48755,7 @@ Well typed (Gas remaining: 1039986.650 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039987.134 units remaining)	michelson_test_scripts/opcodes/sender_after_nonexistent_view.tz
+Well typed (Gas remaining: 1039987.133 units remaining)	michelson_test_scripts/opcodes/sender_after_nonexistent_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48788,7 +48788,7 @@ Well typed (Gas remaining: 1039987.134 units remaining)	michelson_test_scripts/o
          /* [ list operation : address ] */ ;
          PAIR
          /* [ pair (list operation) address ] */ } }
-Well typed (Gas remaining: 1039986.473 units remaining)	michelson_test_scripts/opcodes/sender_after_view.tz
+Well typed (Gas remaining: 1039986.472 units remaining)	michelson_test_scripts/opcodes/sender_after_view.tz
 { parameter address ;
   storage address ;
   code { CAR
@@ -48928,7 +48928,7 @@ Well typed (Gas remaining: 1039997.469 units remaining)	michelson_test_scripts/o
          /* [ list operation : nat ] */ ;
          PAIR
          /* [ pair (list operation) nat ] */ } }
-Well typed (Gas remaining: 1039952.045 units remaining)	michelson_test_scripts/opcodes/sets.tz
+Well typed (Gas remaining: 1039956.190 units remaining)	michelson_test_scripts/opcodes/sets.tz
 { parameter unit ;
   storage unit ;
   code { DROP
@@ -50195,7 +50195,7 @@ Well typed (Gas remaining: 1039967.053 units remaining)	michelson_test_scripts/o
          /* [ list operation : nat ] */ ;
          PAIR
          /* [ pair (list operation) nat ] */ } }
-Well typed (Gas remaining: 1039994.729 units remaining)	michelson_test_scripts/opcodes/view_fib.tz
+Well typed (Gas remaining: 1039994.728 units remaining)	michelson_test_scripts/opcodes/view_fib.tz
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
@@ -50210,7 +50210,7 @@ Well typed (Gas remaining: 1039994.729 units remaining)	michelson_test_scripts/o
              PAIR
              /* [ pair (list operation) nat ] */ }
            { FAIL } } }
-Well typed (Gas remaining: 1039993.432 units remaining)	michelson_test_scripts/opcodes/view_mutual_recursion.tz
+Well typed (Gas remaining: 1039993.431 units remaining)	michelson_test_scripts/opcodes/view_mutual_recursion.tz
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
@@ -50229,7 +50229,7 @@ Well typed (Gas remaining: 1039993.432 units remaining)	michelson_test_scripts/o
              PAIR
              /* [ pair (list operation) nat ] */ }
            { FAIL } } }
-Well typed (Gas remaining: 1039994.509 units remaining)	michelson_test_scripts/opcodes/view_op_add.tz
+Well typed (Gas remaining: 1039994.508 units remaining)	michelson_test_scripts/opcodes/view_op_add.tz
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
@@ -50243,7 +50243,7 @@ Well typed (Gas remaining: 1039994.509 units remaining)	michelson_test_scripts/o
          /* [ list operation : nat ] */ ;
          PAIR
          /* [ pair (list operation) nat ] */ } }
-Well typed (Gas remaining: 1039994.489 units remaining)	michelson_test_scripts/opcodes/view_op_constant.tz
+Well typed (Gas remaining: 1039994.488 units remaining)	michelson_test_scripts/opcodes/view_op_constant.tz
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
@@ -50257,7 +50257,7 @@ Well typed (Gas remaining: 1039994.489 units remaining)	michelson_test_scripts/o
          /* [ list operation : nat ] */ ;
          PAIR
          /* [ pair (list operation) nat ] */ } }
-Well typed (Gas remaining: 1039994.121 units remaining)	michelson_test_scripts/opcodes/view_op_id.tz
+Well typed (Gas remaining: 1039994.120 units remaining)	michelson_test_scripts/opcodes/view_op_id.tz
 { parameter (pair nat address) ;
   storage (pair nat nat) ;
   code { CAR
@@ -50271,7 +50271,7 @@ Well typed (Gas remaining: 1039994.121 units remaining)	michelson_test_scripts/o
          /* [ list operation : pair nat nat ] */ ;
          PAIR
          /* [ pair (list operation) nat nat ] */ } }
-Well typed (Gas remaining: 1039989.350 units remaining)	michelson_test_scripts/opcodes/view_op_nonexistent_addr.tz
+Well typed (Gas remaining: 1039989.349 units remaining)	michelson_test_scripts/opcodes/view_op_nonexistent_addr.tz
 { parameter (pair nat address) ;
   storage bool ;
   code { DROP
@@ -50289,7 +50289,7 @@ Well typed (Gas remaining: 1039989.350 units remaining)	michelson_test_scripts/o
          /* [ list operation : bool ] */ ;
          PAIR
          /* [ pair (list operation) bool ] */ } }
-Well typed (Gas remaining: 1039993.958 units remaining)	michelson_test_scripts/opcodes/view_op_nonexistent_func.tz
+Well typed (Gas remaining: 1039993.957 units remaining)	michelson_test_scripts/opcodes/view_op_nonexistent_func.tz
 { parameter (pair nat address) ;
   storage bool ;
   code { CAR
@@ -50305,7 +50305,7 @@ Well typed (Gas remaining: 1039993.958 units remaining)	michelson_test_scripts/o
          /* [ list operation : bool ] */ ;
          PAIR
          /* [ pair (list operation) bool ] */ } }
-Well typed (Gas remaining: 1039994.901 units remaining)	michelson_test_scripts/opcodes/view_op_test_step_contants.tz
+Well typed (Gas remaining: 1039994.900 units remaining)	michelson_test_scripts/opcodes/view_op_test_step_contants.tz
 { parameter address ;
   storage (option (pair (pair mutez mutez) (pair (pair address address) address))) ;
   code { CAR
@@ -50320,7 +50320,7 @@ Well typed (Gas remaining: 1039994.901 units remaining)	michelson_test_scripts/o
             : option (pair (pair mutez mutez) (pair address address) address) ] */ ;
          PAIR
          /* [ pair (list operation) (option (pair (pair mutez mutez) (pair address address) address)) ] */ } }
-Well typed (Gas remaining: 1039994.018 units remaining)	michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_input_type.tz
+Well typed (Gas remaining: 1039994.017 units remaining)	michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_input_type.tz
 { parameter (pair int address) ;
   storage nat ;
   code { CAR
@@ -50334,7 +50334,7 @@ Well typed (Gas remaining: 1039994.018 units remaining)	michelson_test_scripts/o
          /* [ list operation : nat ] */ ;
          PAIR
          /* [ pair (list operation) nat ] */ } }
-Well typed (Gas remaining: 1039994.018 units remaining)	michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_output_type.tz
+Well typed (Gas remaining: 1039994.017 units remaining)	michelson_test_scripts/opcodes/view_op_toplevel_inconsistent_output_type.tz
 { parameter (pair nat address) ;
   storage bool ;
   code { CAR
@@ -50350,7 +50350,7 @@ Well typed (Gas remaining: 1039994.018 units remaining)	michelson_test_scripts/o
          /* [ list operation : bool ] */ ;
          PAIR
          /* [ pair (list operation) bool ] */ } }
-Well typed (Gas remaining: 1039988.523 units remaining)	michelson_test_scripts/opcodes/view_rec.tz
+Well typed (Gas remaining: 1039988.594 units remaining)	michelson_test_scripts/opcodes/view_rec.tz
 { parameter unit ;
   storage unit ;
   view "loop"
@@ -50380,7 +50380,7 @@ Well typed (Gas remaining: 1039988.523 units remaining)	michelson_test_scripts/o
          /* [ list operation : unit ] */ ;
          PAIR
          /* [ pair (list operation) unit ] */ } }
-Well typed (Gas remaining: 1039947.512 units remaining)	michelson_test_scripts/opcodes/view_toplevel_lib.tz
+Well typed (Gas remaining: 1039948.512 units remaining)	michelson_test_scripts/opcodes/view_toplevel_lib.tz
 { parameter nat ;
   storage nat ;
   code { CAR
diff --git a/tezt/tests/expected/hash_data.ml/Alpha- hash data ... of type ... (good).out b/tezt/tests/expected/hash_data.ml/Alpha- hash data ... of type ... (good).out
index 243213bc655b..314a2e670a6f 100644
--- a/tezt/tests/expected/hash_data.ml/Alpha- hash data ... of type ... (good).out	
+++ b/tezt/tests/expected/hash_data.ml/Alpha- hash data ... of type ... (good).out	
@@ -384,7 +384,7 @@ Raw Script-expression-ID-Hash: 0xac6995309e75f33132a6819b36c2ae787684be3c23e7cf2
 Ledger Blake2b hash: Cc2W7aPZgPoiuVfuxR8j6gjxgpuZDBJGjSaRQemzTnFM
 Raw Sha256 hash: 0x732bb539d52c41e6cc09d6116b1b3d25257b27dfd7adc7a09e03d345c09e0594
 Raw Sha512 hash: 0x0d565633ca0b3c3751aee0fe54d9be744bea79b1a714d97227397dfe79b5058d6385bc86dcdabbb280c5fc2fb56fc073550ac63d947df2787a5927a1342c343b
-Gas remaining: 1039997.698 units remaining
+Gas remaining: 1039997.748 units remaining
 
 ./octez-client --mode mockup hash data 0 of type mutez
 Raw packed data: 0x050000
@@ -456,7 +456,7 @@ Raw Script-expression-ID-Hash: 0x83592457741d2dbb22af78846b3040e92614170c2e48501
 Ledger Blake2b hash: 9qjFGa2NhRMBbutDccsFotBEpNeCuK4mJu95q3hiJZ3U
 Raw Sha256 hash: 0xcd56882646da9e0c3309537fb762087316b9bd0c754e7c858b30445e5a4df6a0
 Raw Sha512 hash: 0xb7c841f6c2ab26702ce4b2a72b0f70e63c561ed97bc77df78c2f763e492eb8c86ecf755b60aa1246cc1ba95b0de2d1a3afa3de408325b3b2c764efcb24d1a9e5
-Gas remaining: 1039999.174 units remaining
+Gas remaining: 1039999.173 units remaining
 
 ./octez-client --mode mockup hash data '(Left True)' of type 'or bool string'
 Raw packed data: 0x050505030a
@@ -474,7 +474,7 @@ Raw Script-expression-ID-Hash: 0xdf2193b9a689f10ac5c8a48c577f3e2a94221bd9ac884b5
 Ledger Blake2b hash: G21cWq5PkGo84UkfufjDCMXWsSQA3PEDBLKYPt1qtvan
 Raw Sha256 hash: 0x2477b0dad8808245eacf22a51ef1f6b9bcb59b8f4d4b3a979132fa74dd129abf
 Raw Sha512 hash: 0x64d21e4c66c2c1da70cda80a9609a28e8571734e42a63927753c2027f5c168086fd9925ddaee1544b254fbf63b055bc5ee4e9a987f457b58be04abbdfd29ac57
-Gas remaining: 1039999.114 units remaining
+Gas remaining: 1039999.113 units remaining
 
 ./octez-client --mode mockup hash data '(Pair 0 True)' of type 'pair int bool'
 Raw packed data: 0x0507070000030a
@@ -528,7 +528,7 @@ Raw Script-expression-ID-Hash: 0x7b470c4d4cd099659964e7ae56f49599a16e5c4ddbe0389
 Ledger Blake2b hash: 9JDyxjR1Pex14hzrrVN6wUuVdug418EbGy9PytyWi36E
 Raw Sha256 hash: 0x79b8b0a86bb4e9939b552d8bfc98c50b991ae227235a3d39381349817ebdda9f
 Raw Sha512 hash: 0x34de860c30437423f988cff5ed945981ed4b82dc8a9153f1fbb387e3a05d502d494aa3fb627698a2d7d3b769715e24f844274d0a86bbddff3d955d97ba39d410
-Gas remaining: 1039998.106 units remaining
+Gas remaining: 1039998.346 units remaining
 
 ./octez-client --mode mockup hash data '"ABC\n123"' of type string
 Raw packed data: 0x0501000000074142430a313233
@@ -537,7 +537,7 @@ Raw Script-expression-ID-Hash: 0x53804fa1fb0854914ed6562bc7dde5d9c2307bbf5ac70e7
 Ledger Blake2b hash: 6cxKSKRL7E2Bpg1ZPZkWT7hXgLKyHJxLc5NA2Q2H1jqX
 Raw Sha256 hash: 0x3ebab0c348173626afcb9c982d06ee1189fb1a6359eecd33b30af851aacdcc0f
 Raw Sha512 hash: 0x086fccde9f22aba378cd47833d9613f6d1cfd3f15fb6a8dde0eb57e1da651de8ef69886a7a4ebbadf50155910d1fbcc9048e0d9acb196be04adf519476d52307
-Gas remaining: 1039999.470 units remaining
+Gas remaining: 1039999.469 units remaining
 
 ./octez-client --mode mockup hash data '"edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"' of type signature
 Raw packed data: 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
@@ -564,7 +564,7 @@ Raw Script-expression-ID-Hash: 0x7b754bee2b13dd9f9486e6f933e27afc2c31765a8414fc9
 Ledger Blake2b hash: 9JvtJaNHvYP5bpF7tjbbtpr8o7Jtptz445dZ8pemDnvH
 Raw Sha256 hash: 0xe9341dd81166c9253032c8296ae443fbe0d6878502c31cdc431407c4f46dd094
 Raw Sha512 hash: 0x8bf21486ea4a0789bf772b75b3cd8f9edace809f79c38146dbbe2d447edf99f9fcc7c53f511063fe9de21b22baa01710ef6a300546fcc6529812128488e91309
-Gas remaining: 1039999.550 units remaining
+Gas remaining: 1039999.549 units remaining
 
 ./octez-client --mode mockup hash data '"[TIMESTAMP]"' of type timestamp
 Raw packed data: 0x0500a7e8e4d80b
diff --git a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out
index b4a9393825c9..3e1bc9c2e94a 100644
--- a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out	
+++ b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg '(Pair "[CONTRACT_HASH]" "[CONTRACT_HASH]")'
 Node is bootstrapped.
-Estimated gas: 7899.562 units (will add 100 for safety)
+Estimated gas: 7899.569 units (will add 100 for safety)
 Estimated storage: 475 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -31,7 +31,7 @@ This sequence of operations was run:
           Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "green" 1) }
       Storage size: 525 bytes
       Paid storage size diff: 325 bytes
-      Consumed gas: 3193.018
+      Consumed gas: 3193.024
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.08125
         storage fees ........................... +ꜩ0.08125
@@ -59,7 +59,7 @@ This sequence of operations was run:
             (Some (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1)))
           Storage size: 169 bytes
           Paid storage size diff: 108 bytes
-          Consumed gas: 2818.018
+          Consumed gas: 2818.019
           Balance updates:
             [PUBLIC_KEY_HASH] ... -ꜩ0.027
             storage fees ........................... +ꜩ0.027
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out
index f66b0c837522..fb805354308b 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out	
@@ -58,7 +58,7 @@ Contract memorized as add_clear_tickets.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "A"'
 Node is bootstrapped.
-Estimated gas: 1751.650 units (will add 100 for safety)
+Estimated gas: 1751.651 units (will add 100 for safety)
 Estimated storage: 105 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
         { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "A" 1) }
       Storage size: 180 bytes
       Paid storage size diff: 105 bytes
-      Consumed gas: 1752.185
+      Consumed gas: 1752.186
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.02625
         storage fees ........................... +ꜩ0.02625
@@ -101,7 +101,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint clear --arg Unit
 Node is bootstrapped.
-Estimated gas: 1941.322 units (will add 100 for safety)
+Estimated gas: 1941.323 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -127,7 +127,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: {}
       Storage size: 141 bytes
-      Consumed gas: 1941.858
+      Consumed gas: 1941.859
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -138,7 +138,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "B"'
 Node is bootstrapped.
-Estimated gas: 1751.650 units (will add 100 for safety)
+Estimated gas: 1751.651 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -166,7 +166,7 @@ This sequence of operations was run:
       Updated storage:
         { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) }
       Storage size: 180 bytes
-      Consumed gas: 1752.185
+      Consumed gas: 1752.186
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -177,7 +177,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "C"'
 Node is bootstrapped.
-Estimated gas: 2433.659 units (will add 100 for safety)
+Estimated gas: 2433.661 units (will add 100 for safety)
 Estimated storage: 105 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -207,7 +207,7 @@ This sequence of operations was run:
           Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) }
       Storage size: 219 bytes
       Paid storage size diff: 105 bytes
-      Consumed gas: 2434.194
+      Consumed gas: 2434.196
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.02625
         storage fees ........................... +ꜩ0.02625
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out
index c0730da94139..627ef9d4020a 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[SMART_ROLLUP_HASH]"'
 Node is bootstrapped.
-Estimated gas: 2784.263 units (will add 100 for safety)
+Estimated gas: 2784.265 units (will add 100 for safety)
 Estimated storage: 132 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -28,7 +28,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 197 bytes
       Paid storage size diff: 132 bytes
-      Consumed gas: 2674.289
+      Consumed gas: 2674.291
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.033
         storage fees ........................... +ꜩ0.033
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out
index 1529d8535af0..fbda5ce5a18b 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.212 units (will add 100 for safety)
+Estimated gas: 614.216 units (will add 100 for safety)
 Estimated storage: 415 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,7 +48,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 158 bytes
         Paid storage size diff: 158 bytes
-        Consumed gas: 614.179
+        Consumed gas: 614.183
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0395
           storage fees ........................... +ꜩ0.0395
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.648 units (will add 100 for safety)
+Estimated gas: 1858.650 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.785
+      Consumed gas: 1758.787
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -130,7 +130,7 @@ Error:
 
 ./octez-client --mode mockup --wait none originate contract tickets_bag transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_016.tz --init '{}' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 620.181 units (will add 100 for safety)
+Estimated gas: 620.183 units (will add 100 for safety)
 Estimated storage: 451 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -177,7 +177,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 194 bytes
         Paid storage size diff: 194 bytes
-        Consumed gas: 620.148
+        Consumed gas: 620.150
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0485
           storage fees ........................... +ꜩ0.0485
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out
index 4153fc4401ca..6b8e235c5ded 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.212 units (will add 100 for safety)
+Estimated gas: 614.216 units (will add 100 for safety)
 Estimated storage: 415 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,7 +48,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 158 bytes
         Paid storage size diff: 158 bytes
-        Consumed gas: 614.179
+        Consumed gas: 614.183
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0395
           storage fees ........................... +ꜩ0.0395
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none originate contract tickets_bag transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_016.tz --init '{}' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 620.181 units (will add 100 for safety)
+Estimated gas: 620.183 units (will add 100 for safety)
 Estimated storage: 451 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -107,7 +107,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 194 bytes
         Paid storage size diff: 194 bytes
-        Consumed gas: 620.148
+        Consumed gas: 620.150
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0485
           storage fees ........................... +ꜩ0.0485
@@ -163,7 +163,7 @@ Contract memorized as tickets_blackhole.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 3'
 Node is bootstrapped.
-Estimated gas: 1858.648 units (will add 100 for safety)
+Estimated gas: 1858.650 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -190,7 +190,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.785
+      Consumed gas: 1758.787
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -215,7 +215,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 2 tickets from bootstrap1 to bootstrap2 with entrypoint default and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 1295.154 units (will add 100 for safety)
+Estimated gas: 1295.155 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -249,7 +249,7 @@ This sequence of operations was run:
         Account updates:
           [PUBLIC_KEY_HASH] ... -2
           [PUBLIC_KEY_HASH] ... +2
-      Consumed gas: 1295.088
+      Consumed gas: 1295.089
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -263,7 +263,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap2 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 3206.841 units (will add 100 for safety)
+Estimated gas: 3206.843 units (will add 100 for safety)
 Estimated storage: 110 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -297,7 +297,7 @@ This sequence of operations was run:
         Content: "Ticket"
         Account updates:
           [PUBLIC_KEY_HASH] ... -1
-      Consumed gas: 1296.551
+      Consumed gas: 1296.552
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -313,7 +313,7 @@ This sequence of operations was run:
             { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) }
           Storage size: 238 bytes
           Paid storage size diff: 44 bytes
-          Consumed gas: 1910.858
+          Consumed gas: 1910.859
           Balance updates:
             [PUBLIC_KEY_HASH] ... -ꜩ0.011
             storage fees ........................... +ꜩ0.011
@@ -333,7 +333,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 4716.888 units (will add 100 for safety)
+Estimated gas: 4716.890 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -360,7 +360,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: {}
       Storage size: 194 bytes
-      Consumed gas: 2864.301
+      Consumed gas: 2864.303
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out
index 2efccbe612c5..ae7d4d6f731b 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send_with_tez transferring 1 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_with_tez_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 612.414 units (will add 100 for safety)
+Estimated gas: 612.418 units (will add 100 for safety)
 Estimated storage: 411 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -47,7 +47,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 154 bytes
         Paid storage size diff: 154 bytes
-        Consumed gas: 612.381
+        Consumed gas: 612.385
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0385
           storage fees ........................... +ꜩ0.0385
@@ -61,7 +61,7 @@ Contract memorized as tickets_send_with_tez.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[PUBLIC_KEY_HASH]"'
 Node is bootstrapped.
-Estimated gas: 1857.130 units (will add 100 for safety)
+Estimated gas: 1857.132 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -88,7 +88,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 154 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1757.268
+      Consumed gas: 1757.270
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out
index 3c6c6106b061..5d919fc8d60f 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract send_ticket_list transferring 1 from bootstrap1 running michelson_test_scripts/mini_scenarios/send_ticket_list_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.203 units (will add 100 for safety)
+Estimated gas: 614.205 units (will add 100 for safety)
 Estimated storage: 402 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -49,7 +49,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 145 bytes
         Paid storage size diff: 145 bytes
-        Consumed gas: 614.170
+        Consumed gas: 614.172
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.03625
           storage fees ........................... +ꜩ0.03625
@@ -109,7 +109,7 @@ Contract memorized as tickets_list_blackhole.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 4063.854 units (will add 100 for safety)
+Estimated gas: 4063.855 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -136,7 +136,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 145 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 2211.250
+      Consumed gas: 2211.251
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out
index 37e2a7d47c48..4c081c37cc6d 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.212 units (will add 100 for safety)
+Estimated gas: 614.216 units (will add 100 for safety)
 Estimated storage: 415 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,7 +48,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 158 bytes
         Paid storage size diff: 158 bytes
-        Consumed gas: 614.179
+        Consumed gas: 614.183
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0395
           storage fees ........................... +ꜩ0.0395
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.648 units (will add 100 for safety)
+Estimated gas: 1858.650 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.785
+      Consumed gas: 1758.787
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out
index 3f8327b8b6f0..6917825b42a5 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out	
@@ -49,7 +49,7 @@ Contract memorized as receive_tickets_in_big_map.
 
 ./octez-client --mode mockup --wait none originate contract send_tickets_in_big_map transferring 200 from bootstrap1 running michelson_test_scripts/mini_scenarios/send_tickets_in_big_map_015.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 674.690 units (will add 100 for safety)
+Estimated gas: 674.694 units (will add 100 for safety)
 Estimated storage: 577 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -123,7 +123,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 320 bytes
         Paid storage size diff: 320 bytes
-        Consumed gas: 674.657
+        Consumed gas: 674.661
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.08
           storage fees ........................... +ꜩ0.08
@@ -137,7 +137,7 @@ Contract memorized as send_tickets_in_big_map.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 30 --storage-limit 1000000 --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 98835.419 units (will add 100 for safety)
+Estimated gas: 98835.742 units (will add 100 for safety)
 Estimated storage: 10767 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -266,7 +266,7 @@ This sequence of operations was run:
         Set temp(1)[40] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
       Storage size: 320 bytes
       Paid storage size diff: 67 bytes
-      Consumed gas: 49909.908
+      Consumed gas: 49910.031
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.01675
         storage fees ........................... +ꜩ0.01675
@@ -283,7 +283,7 @@ This sequence of operations was run:
             Copy temp(1) to map(5)
           Storage size: 10783 bytes
           Paid storage size diff: 10700 bytes
-          Consumed gas: 48926.500
+          Consumed gas: 48926.700
           Balance updates:
             [PUBLIC_KEY_HASH] ... -ꜩ2.675
             storage fees ........................... +ꜩ2.675
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out
index 433f14702c45..aeeee4d4a876 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.212 units (will add 100 for safety)
+Estimated gas: 614.216 units (will add 100 for safety)
 Estimated storage: 415 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,7 +48,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 158 bytes
         Paid storage size diff: 158 bytes
-        Consumed gas: 614.179
+        Consumed gas: 614.183
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0395
           storage fees ........................... +ꜩ0.0395
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none originate contract tickets_bag_implicit transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_implicit_016.tz --init '{}' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 619.167 units (will add 100 for safety)
+Estimated gas: 619.169 units (will add 100 for safety)
 Estimated storage: 440 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -107,7 +107,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 183 bytes
         Paid storage size diff: 183 bytes
-        Consumed gas: 619.134
+        Consumed gas: 619.136
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.04575
           storage fees ........................... +ꜩ0.04575
@@ -119,7 +119,7 @@ Contract memorized as tickets_bag_implicit.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.648 units (will add 100 for safety)
+Estimated gas: 1858.650 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -146,7 +146,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.785
+      Consumed gas: 1758.787
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -171,7 +171,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap1 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 3176.330 units (will add 100 for safety)
+Estimated gas: 3176.332 units (will add 100 for safety)
 Estimated storage: 44 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -204,7 +204,7 @@ This sequence of operations was run:
         Content: "Ticket"
         Account updates:
           [PUBLIC_KEY_HASH] ... -1
-      Consumed gas: 1266.514
+      Consumed gas: 1266.515
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
@@ -217,7 +217,7 @@ This sequence of operations was run:
             { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) }
           Storage size: 227 bytes
           Paid storage size diff: 44 bytes
-          Consumed gas: 1910.351
+          Consumed gas: 1910.352
           Balance updates:
             [PUBLIC_KEY_HASH] ... -ꜩ0.011
             storage fees ........................... +ꜩ0.011
@@ -237,7 +237,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[PUBLIC_KEY_HASH]"'
 Node is bootstrapped.
-Estimated gas: 2511.208 units (will add 100 for safety)
+Estimated gas: 2511.210 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -264,7 +264,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: {}
       Storage size: 183 bytes
-      Consumed gas: 2411.345
+      Consumed gas: 2411.347
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out
index a96987f749a0..24c16086d26f 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.212 units (will add 100 for safety)
+Estimated gas: 614.216 units (will add 100 for safety)
 Estimated storage: 415 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,7 +48,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 158 bytes
         Paid storage size diff: 158 bytes
-        Consumed gas: 614.179
+        Consumed gas: 614.183
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0395
           storage fees ........................... +ꜩ0.0395
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.648 units (will add 100 for safety)
+Estimated gas: 1858.650 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.785
+      Consumed gas: 1758.787
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out
index 2affd7acc1d1..857b694e7566 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint mint
 Node is bootstrapped.
-Estimated gas: 2222.031 units (will add 100 for safety)
+Estimated gas: 2222.033 units (will add 100 for safety)
 Estimated storage: 221 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -30,7 +30,7 @@ This sequence of operations was run:
           Pair 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 (Pair "Ticket" 1) }
       Storage size: 309 bytes
       Paid storage size diff: 221 bytes
-      Consumed gas: 2221.998
+      Consumed gas: 2222
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.05525
         storage fees ........................... +ꜩ0.05525
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out
index c580290e864c..68e808e16d82 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.212 units (will add 100 for safety)
+Estimated gas: 614.216 units (will add 100 for safety)
 Estimated storage: 415 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,7 +48,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 158 bytes
         Paid storage size diff: 158 bytes
-        Consumed gas: 614.179
+        Consumed gas: 614.183
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0395
           storage fees ........................... +ꜩ0.0395
@@ -104,7 +104,7 @@ Contract memorized as tickets_blackhole.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.648 units (will add 100 for safety)
+Estimated gas: 1858.650 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -131,7 +131,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.785
+      Consumed gas: 1758.787
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -153,7 +153,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[CONTRACT_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 4063.821 units (will add 100 for safety)
+Estimated gas: 4063.823 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -180,7 +180,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 2211.234
+      Consumed gas: 2211.236
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out
index 2cc8a072d1c9..ca58a93b53c6 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract tickets_send transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_send_016.tz --init Unit --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 614.212 units (will add 100 for safety)
+Estimated gas: 614.216 units (will add 100 for safety)
 Estimated storage: 415 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -48,7 +48,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 158 bytes
         Paid storage size diff: 158 bytes
-        Consumed gas: 614.179
+        Consumed gas: 614.183
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0395
           storage fees ........................... +ꜩ0.0395
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.648 units (will add 100 for safety)
+Estimated gas: 1858.650 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.785
+      Consumed gas: 1758.787
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -112,7 +112,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none originate contract tickets_bag transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/tickets_bag_016.tz --init '{}' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 620.181 units (will add 100 for safety)
+Estimated gas: 620.183 units (will add 100 for safety)
 Estimated storage: 451 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -159,7 +159,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 194 bytes
         Paid storage size diff: 194 bytes
-        Consumed gas: 620.148
+        Consumed gas: 620.150
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.0485
           storage fees ........................... +ꜩ0.0485
diff --git a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out
index 10a390334103..1ba6249e1e69 100644
--- a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out	
+++ b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out	
@@ -8,7 +8,7 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1000 --arg 'Pair (Pair "[SMART_ROLLUP_HASH]" "[PUBLIC_KEY_HASH]") (Pair 450 "Hello, Ticket!")'
 Node is bootstrapped.
-Estimated gas: 2329.882 units (will add 100 for safety)
+Estimated gas: 2329.884 units (will add 100 for safety)
 Estimated storage: 67 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -36,7 +36,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 205 bytes
       Paid storage size diff: 67 bytes
-      Consumed gas: 2222.855
+      Consumed gas: 2222.857
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.01675
         storage fees ........................... +ꜩ0.01675
@@ -130,7 +130,7 @@ This sequence of operations was run:
 
 ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from bootstrap1 for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 8734.875 units (will add 100 for safety)
+Estimated gas: 8734.878 units (will add 100 for safety)
 Estimated storage: 230 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -153,7 +153,7 @@ This sequence of operations was run:
       Cemented commitment: [SC_ROLLUP_COMMITMENT_HASH]
       This smart output message execution was successfully applied
       Paid storage size diff: 72 bytes
-      Consumed gas: 5083.651
+      Consumed gas: 5083.654
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.018
         storage fees ........................... +ꜩ0.018
diff --git a/tezt/tests/expected/views.ml/Alpha- Run views.out b/tezt/tests/expected/views.ml/Alpha- Run views.out
index 4d36603cd975..93b71a2c4f05 100644
--- a/tezt/tests/expected/views.ml/Alpha- Run views.out	
+++ b/tezt/tests/expected/views.ml/Alpha- Run views.out	
@@ -1,7 +1,7 @@
 
 ./octez-client --mode mockup --wait none originate contract view_registers_callers transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/view_registers_callers.tz --init '{}' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 603.512 units (will add 100 for safety)
+Estimated gas: 603.226 units (will add 100 for safety)
 Estimated storage: 409 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -38,7 +38,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 152 bytes
         Paid storage size diff: 152 bytes
-        Consumed gas: 603.478
+        Consumed gas: 603.192
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.038
           storage fees ........................... +ꜩ0.038
@@ -50,7 +50,7 @@ Contract memorized as view_registers_callers.
 
 ./octez-client --mode mockup --wait none originate contract view_check_caller transferring 0 from bootstrap1 running michelson_test_scripts/mini_scenarios/view_check_caller.tz --init None --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 628.307 units (will add 100 for safety)
+Estimated gas: 628.309 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 '[OPERATION_HASH]'
@@ -95,7 +95,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 208 bytes
         Paid storage size diff: 208 bytes
-        Consumed gas: 628.273
+        Consumed gas: 628.275
         Balance updates:
           [PUBLIC_KEY_HASH] ... -ꜩ0.052
           storage fees ........................... +ꜩ0.052
@@ -107,7 +107,7 @@ Contract memorized as view_check_caller.
 
 ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 3582.932 units (will add 100 for safety)
+Estimated gas: 3582.580 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -133,7 +133,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: None
       Storage size: 208 bytes
-      Consumed gas: 3583.468
+      Consumed gas: 3583.116
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ1
         [CONTRACT_HASH] ... +ꜩ1
@@ -141,7 +141,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 1285.883 units (will add 100 for safety)
+Estimated gas: 1285.773 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 '[OPERATION_HASH]'
@@ -167,7 +167,7 @@ This sequence of operations was run:
       Updated storage: { 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 }
       Storage size: 179 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 1286.461
+      Consumed gas: 1286.351
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675
@@ -177,7 +177,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 1 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 3586.564 units (will add 100 for safety)
+Estimated gas: 3586.212 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 '[OPERATION_HASH]'
@@ -204,7 +204,7 @@ This sequence of operations was run:
       Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78)
       Storage size: 235 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 3587.100
+      Consumed gas: 3586.748
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675
-- 
GitLab