diff --git a/libScillaRTL/SRTL.h b/libScillaRTL/SRTL.h
index c5962aac..c4ecb28a 100644
--- a/libScillaRTL/SRTL.h
+++ b/libScillaRTL/SRTL.h
@@ -41,6 +41,8 @@ const auto Ecdsa_Pubkey_Uncompressed_Len = 65;
 
 const auto Zilliqa_Address_Len = 20;
 
+const uint64_t GasScaleFactor = 8;
+
 // Fetch the type of a remote field, if it exists.
 std::optional<std::string> remoteFieldType(const ScillaExecImpl *SJ,
                                            const std::string &Addr,
diff --git a/libScillaRTL/ScillaBuiltins.h b/libScillaRTL/ScillaBuiltins.h
index cc7215c6..271f45c5 100644
--- a/libScillaRTL/ScillaBuiltins.h
+++ b/libScillaRTL/ScillaBuiltins.h
@@ -40,9 +40,11 @@ class TransitionState {
 
 public:
   TransitionState(const std::string &Balance_P, const std::string &InAmount_P,
-                  uint64_t CurBlock_P, const std::string &SenderAddr_P)
+                  uint64_t CurBlock_P, uint64_t GasLimit_P,
+                  const std::string &SenderAddr_P)
       : Balance(Balance_P), Accepted(false), OutJ(Json::objectValue),
-        CurBlock(CurBlock_P), SenderAddr(SenderAddr_P), InAmount(InAmount_P){};
+        CurBlock(CurBlock_P), SenderAddr(SenderAddr_P), InAmount(InAmount_P),
+        GasLimit(GasLimit_P){};
 
   void processSend(Json::Value &M);
   void processEvent(Json::Value &M);
@@ -52,6 +54,7 @@ class TransitionState {
   const uint64_t CurBlock;
   const std::string SenderAddr;
   const SafeUint128 InAmount;
+  const uint64_t GasLimit;
 
   // Returns the output of the transition execution. Destroys *this*.
   Json::Value finalize(uint64_t GasRem);
diff --git a/libScillaRTL/ScillaExecImpl.cpp b/libScillaRTL/ScillaExecImpl.cpp
index e4be487a..aaa31efc 100644
--- a/libScillaRTL/ScillaExecImpl.cpp
+++ b/libScillaRTL/ScillaExecImpl.cpp
@@ -62,8 +62,12 @@ ScillaExprExec::ScillaExprExec(const ScillaParams &SPs,
 std::string ScillaExprExec::exec(uint64_t GasLimit) {
   auto ScillaMainAddr = PImpl->getAddressFor("scilla_main");
   auto ScillaMain = reinterpret_cast<void (*)()>(ScillaMainAddr);
+
+  // This isn't a transition, but we still setup a state for consistency.
+  PImpl->TS = std::make_unique<TransitionState>("0", "0", 0, GasLimit, "0x");
   // Set gas available in the JIT'ed code and then initialize libraries.
   PImpl->initGasAndLibs(GasLimit);
+
   // Clear the output.
   PImpl->ScillaStdout.clear();
   ScillaMain();
@@ -163,16 +167,14 @@ void ScillaExecImpl::initContrParams(const Json::Value &CP,
   }
 }
 
-uint64_t *ScillaExecImpl::initGasAndLibs(uint64_t GasLimit) {
-  // Set gas limit in the JIT'ed code module.
+void ScillaExecImpl::initGasAndLibs(uint64_t GasLimit) {
   auto GasRemPtr = reinterpret_cast<uint64_t *>(getAddressFor("_gasrem"));
-  *GasRemPtr = GasLimit;
+  // Scale up the gas limit.
+  *GasRemPtr = GasLimit * GasScaleFactor;
 
   // Call the library initialisation function.
   auto initLibs = reinterpret_cast<void (*)()>(getAddressFor("_init_libs"));
   initLibs();
-
-  return GasRemPtr;
 }
 
 Json::Value ScillaExecImpl::deploy(const Json::Value &InitJ, uint64_t GasLimit,
@@ -181,20 +183,28 @@ Json::Value ScillaExecImpl::deploy(const Json::Value &InitJ, uint64_t GasLimit,
   // Initialize contract parameters.
   initContrParams(InitJ, true /* DoDynamicTypechecks */);
 
-  auto GasRemPtr = initGasAndLibs(GasLimit);
-
   // Let's setup the TransitionState for this transition.
-  TS = std::make_unique<TransitionState>("0", "0", CurBlock, "");
+  TS = std::make_unique<TransitionState>("0", "0", CurBlock, GasLimit, "");
+
+  initGasAndLibs(GasLimit);
+
   auto fIS = reinterpret_cast<void (*)(void)>(getAddressFor("_init_state"));
   fIS();
 
-  Json::Value Result = TS->finalize(*GasRemPtr);
+  Json::Value Result = TS->finalize(getGasRem());
   OM.deleteAll();
   return Result;
 }
 
 uint64_t ScillaExecImpl::getGasRem() const {
-  return *reinterpret_cast<const uint64_t *>(getAddressFor("_gasrem"));
+  auto GasRem = *reinterpret_cast<const uint64_t *>(getAddressFor("_gasrem"));
+  // Scale down
+  auto GasRemScaledDown = GasRem / GasScaleFactor;
+  // If no gas was consumed, force at least 1 unit to be consumed.
+  if (GasRemScaledDown == TS->GasLimit) {
+    GasRemScaledDown--;
+  }
+  return GasRemScaledDown;
 }
 
 const ScillaTypes::Typ *
@@ -233,11 +243,11 @@ Json::Value ScillaExecImpl::execMsg(const std::string &Balance,
       !OriginJ.isString() || !AmountJ.isString())
     CREATE_ERROR("Invalid Message");
 
-  auto GasRemPtr = initGasAndLibs(GasLimit);
-
   // Let's setup the TransitionState for this transition.
   TS = std::make_unique<TransitionState>(Balance, AmountJ.asString(), CurBlock,
-                                         SenderJ.asString());
+                                         GasLimit, SenderJ.asString());
+
+  initGasAndLibs(GasLimit);
 
   // Amount and Sender need to be prepended to the parameter list.
   Json::Value AmountParam;
@@ -349,7 +359,7 @@ Json::Value ScillaExecImpl::execMsg(const std::string &Balance,
 
   Transition(Mem);
 
-  Json::Value Result = TS->finalize(*GasRemPtr);
+  Json::Value Result = TS->finalize(getGasRem());
   OM.deleteAll();
   return Result;
 }
diff --git a/libScillaRTL/ScillaExecImpl.h b/libScillaRTL/ScillaExecImpl.h
index ef743d53..fbab0f41 100644
--- a/libScillaRTL/ScillaExecImpl.h
+++ b/libScillaRTL/ScillaExecImpl.h
@@ -48,7 +48,7 @@ class ScillaExecImpl {
   // Get address for @Symbol inside the compiled IR, ready to be used.
   void *getAddressFor(const std::string &Symbol) const;
   // Initialize gas-remaining field in the code and initialize libraries.
-  uint64_t *initGasAndLibs(uint64_t GasRem);
+  void initGasAndLibs(uint64_t GasRem);
   // Execute a message.
   Json::Value execMsg(const std::string &Balance, uint64_t GasLimit,
                       uint64_t CurBlock, const Json::Value &InitJ,
diff --git a/testsuite/contr/accept.output_Accept1.json b/testsuite/contr/accept.output_Accept1.json
index ea257aa1..8de8c5b4 100644
--- a/testsuite/contr/accept.output_Accept1.json
+++ b/testsuite/contr/accept.output_Accept1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "true",
    "events" : [],
-   "gas_remaining" : "9999997",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accept.output_Accept2.json b/testsuite/contr/accept.output_Accept2.json
index 84074293..248540c3 100644
--- a/testsuite/contr/accept.output_Accept2.json
+++ b/testsuite/contr/accept.output_Accept2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "true",
    "events" : [],
-   "gas_remaining" : "9999875",
+   "gas_remaining" : "9999984",
    "messages" : [
       {
          "_amount" : "100",
diff --git a/testsuite/contr/accept.output_Accept3_succ.json b/testsuite/contr/accept.output_Accept3_succ.json
index 84074293..248540c3 100644
--- a/testsuite/contr/accept.output_Accept3_succ.json
+++ b/testsuite/contr/accept.output_Accept3_succ.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "true",
    "events" : [],
-   "gas_remaining" : "9999875",
+   "gas_remaining" : "9999984",
    "messages" : [
       {
          "_amount" : "100",
diff --git a/testsuite/contr/accounting_tests.output_1.json b/testsuite/contr/accounting_tests.output_1.json
index 0c3523cf..445def87 100644
--- a/testsuite/contr/accounting_tests.output_1.json
+++ b/testsuite/contr/accounting_tests.output_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "true",
    "events" : [],
-   "gas_remaining" : "9999863",
+   "gas_remaining" : "9999982",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/accounting_tests.output_10.json b/testsuite/contr/accounting_tests.output_10.json
index a5f1582a..704b163b 100644
--- a/testsuite/contr/accounting_tests.output_10.json
+++ b/testsuite/contr/accounting_tests.output_10.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999558",
+   "gas_remaining" : "9999944",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_11.json b/testsuite/contr/accounting_tests.output_11.json
index 9f69dd39..ac4740a0 100644
--- a/testsuite/contr/accounting_tests.output_11.json
+++ b/testsuite/contr/accounting_tests.output_11.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999556",
+   "gas_remaining" : "9999944",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_12.json b/testsuite/contr/accounting_tests.output_12.json
index f4639cc8..71934ee4 100644
--- a/testsuite/contr/accounting_tests.output_12.json
+++ b/testsuite/contr/accounting_tests.output_12.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999565",
+   "gas_remaining" : "9999945",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_13.json b/testsuite/contr/accounting_tests.output_13.json
index 85b6f52e..2deaf981 100644
--- a/testsuite/contr/accounting_tests.output_13.json
+++ b/testsuite/contr/accounting_tests.output_13.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999959",
+   "gas_remaining" : "9999994",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests.output_14.json b/testsuite/contr/accounting_tests.output_14.json
index 9bd76715..212a178a 100644
--- a/testsuite/contr/accounting_tests.output_14.json
+++ b/testsuite/contr/accounting_tests.output_14.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999554",
+   "gas_remaining" : "9999944",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_15.json b/testsuite/contr/accounting_tests.output_15.json
index e1f37d52..08a364f1 100644
--- a/testsuite/contr/accounting_tests.output_15.json
+++ b/testsuite/contr/accounting_tests.output_15.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999564",
+   "gas_remaining" : "9999945",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_16.json b/testsuite/contr/accounting_tests.output_16.json
index 85b6f52e..2deaf981 100644
--- a/testsuite/contr/accounting_tests.output_16.json
+++ b/testsuite/contr/accounting_tests.output_16.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999959",
+   "gas_remaining" : "9999994",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests.output_17.json b/testsuite/contr/accounting_tests.output_17.json
index 84d292e5..100b5ca1 100644
--- a/testsuite/contr/accounting_tests.output_17.json
+++ b/testsuite/contr/accounting_tests.output_17.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999733",
+   "gas_remaining" : "9999966",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_18.json b/testsuite/contr/accounting_tests.output_18.json
index 6f98c050..883f0afa 100644
--- a/testsuite/contr/accounting_tests.output_18.json
+++ b/testsuite/contr/accounting_tests.output_18.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999734",
+   "gas_remaining" : "9999966",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_19.json b/testsuite/contr/accounting_tests.output_19.json
index 492912fc..555a8b7f 100644
--- a/testsuite/contr/accounting_tests.output_19.json
+++ b/testsuite/contr/accounting_tests.output_19.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999658",
+   "gas_remaining" : "9999957",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_2.json b/testsuite/contr/accounting_tests.output_2.json
index 49264a7d..b2e1540d 100644
--- a/testsuite/contr/accounting_tests.output_2.json
+++ b/testsuite/contr/accounting_tests.output_2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999390",
+   "gas_remaining" : "9999923",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/accounting_tests.output_20.json b/testsuite/contr/accounting_tests.output_20.json
index 1f60ecb5..d4112d4d 100644
--- a/testsuite/contr/accounting_tests.output_20.json
+++ b/testsuite/contr/accounting_tests.output_20.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999549",
+   "gas_remaining" : "9999943",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests.output_21.json b/testsuite/contr/accounting_tests.output_21.json
index 434541a7..b88aa565 100644
--- a/testsuite/contr/accounting_tests.output_21.json
+++ b/testsuite/contr/accounting_tests.output_21.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999740",
+   "gas_remaining" : "9999967",
    "messages" : [
       {
          "_amount" : "30",
diff --git a/testsuite/contr/accounting_tests.output_3.json b/testsuite/contr/accounting_tests.output_3.json
index 86c001f7..bff6d7fa 100644
--- a/testsuite/contr/accounting_tests.output_3.json
+++ b/testsuite/contr/accounting_tests.output_3.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999802",
+   "gas_remaining" : "9999975",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests.output_4.json b/testsuite/contr/accounting_tests.output_4.json
index 845b1b97..bdfc361e 100644
--- a/testsuite/contr/accounting_tests.output_4.json
+++ b/testsuite/contr/accounting_tests.output_4.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999393",
+   "gas_remaining" : "9999924",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/accounting_tests.output_5.json b/testsuite/contr/accounting_tests.output_5.json
index 86c001f7..bff6d7fa 100644
--- a/testsuite/contr/accounting_tests.output_5.json
+++ b/testsuite/contr/accounting_tests.output_5.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999802",
+   "gas_remaining" : "9999975",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests.output_6.json b/testsuite/contr/accounting_tests.output_6.json
index 25d83bc9..738b61cc 100644
--- a/testsuite/contr/accounting_tests.output_6.json
+++ b/testsuite/contr/accounting_tests.output_6.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999450",
+   "gas_remaining" : "9999931",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/accounting_tests.output_7.json b/testsuite/contr/accounting_tests.output_7.json
index b72923a0..7c05adeb 100644
--- a/testsuite/contr/accounting_tests.output_7.json
+++ b/testsuite/contr/accounting_tests.output_7.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999804",
+   "gas_remaining" : "9999975",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/accounting_tests.output_8.json b/testsuite/contr/accounting_tests.output_8.json
index 86c001f7..bff6d7fa 100644
--- a/testsuite/contr/accounting_tests.output_8.json
+++ b/testsuite/contr/accounting_tests.output_8.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999802",
+   "gas_remaining" : "9999975",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests.output_9.json b/testsuite/contr/accounting_tests.output_9.json
index bcb209e3..800513c1 100644
--- a/testsuite/contr/accounting_tests.output_9.json
+++ b/testsuite/contr/accounting_tests.output_9.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999527",
+   "gas_remaining" : "9999940",
    "messages" : [
       {
          "_amount" : "10",
diff --git a/testsuite/contr/accounting_tests_support.output_1.json b/testsuite/contr/accounting_tests_support.output_1.json
index 8dec8c04..d0e22790 100644
--- a/testsuite/contr/accounting_tests_support.output_1.json
+++ b/testsuite/contr/accounting_tests_support.output_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999998",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests_support.output_2.json b/testsuite/contr/accounting_tests_support.output_2.json
index f6a67b39..358bf5fe 100644
--- a/testsuite/contr/accounting_tests_support.output_2.json
+++ b/testsuite/contr/accounting_tests_support.output_2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999938",
+   "gas_remaining" : "9999992",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests_support.output_3.json b/testsuite/contr/accounting_tests_support.output_3.json
index be28f75c..bfaef596 100644
--- a/testsuite/contr/accounting_tests_support.output_3.json
+++ b/testsuite/contr/accounting_tests_support.output_3.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "true",
    "events" : [],
-   "gas_remaining" : "9999946",
+   "gas_remaining" : "9999993",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests_support.output_4.json b/testsuite/contr/accounting_tests_support.output_4.json
index 4abd38e2..1797073c 100644
--- a/testsuite/contr/accounting_tests_support.output_4.json
+++ b/testsuite/contr/accounting_tests_support.output_4.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "true",
    "events" : [],
-   "gas_remaining" : "9999955",
+   "gas_remaining" : "9999994",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/accounting_tests_support.output_5.json b/testsuite/contr/accounting_tests_support.output_5.json
index e2e67eef..1a1df89d 100644
--- a/testsuite/contr/accounting_tests_support.output_5.json
+++ b/testsuite/contr/accounting_tests_support.output_5.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "true",
    "events" : [],
-   "gas_remaining" : "9999917",
+   "gas_remaining" : "9999989",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/crowdfunding.init_output.json b/testsuite/contr/crowdfunding.init_output.json
index 9f91497b..f5874919 100644
--- a/testsuite/contr/crowdfunding.init_output.json
+++ b/testsuite/contr/crowdfunding.init_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999983",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/crowdfunding.output_1.json b/testsuite/contr/crowdfunding.output_1.json
index 19227acc..5f9808f6 100644
--- a/testsuite/contr/crowdfunding.output_1.json
+++ b/testsuite/contr/crowdfunding.output_1.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999694",
+   "gas_remaining" : "9999961",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/crowdfunding.output_2.json b/testsuite/contr/crowdfunding.output_2.json
index a58703b4..36945185 100644
--- a/testsuite/contr/crowdfunding.output_2.json
+++ b/testsuite/contr/crowdfunding.output_2.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999577",
+   "gas_remaining" : "9999947",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/crowdfunding.output_3.json b/testsuite/contr/crowdfunding.output_3.json
index c88fcfbf..1263c0a7 100644
--- a/testsuite/contr/crowdfunding.output_3.json
+++ b/testsuite/contr/crowdfunding.output_3.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999639",
+   "gas_remaining" : "9999954",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/crowdfunding.output_4.json b/testsuite/contr/crowdfunding.output_4.json
index 7ae5306c..e26bf807 100644
--- a/testsuite/contr/crowdfunding.output_4.json
+++ b/testsuite/contr/crowdfunding.output_4.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999820",
+   "gas_remaining" : "9999977",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/crowdfunding.output_5.json b/testsuite/contr/crowdfunding.output_5.json
index 8815003c..97fdb50f 100644
--- a/testsuite/contr/crowdfunding.output_5.json
+++ b/testsuite/contr/crowdfunding.output_5.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999456",
+   "gas_remaining" : "9999932",
    "messages" : [
       {
          "_amount" : "100",
diff --git a/testsuite/contr/crowdfunding.output_6.json b/testsuite/contr/crowdfunding.output_6.json
index b9df48f8..011366c3 100644
--- a/testsuite/contr/crowdfunding.output_6.json
+++ b/testsuite/contr/crowdfunding.output_6.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999577",
+   "gas_remaining" : "9999947",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/event.output.json b/testsuite/contr/event.output.json
index 811ac340..706784f2 100644
--- a/testsuite/contr/event.output.json
+++ b/testsuite/contr/event.output.json
@@ -17,7 +17,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999834",
+   "gas_remaining" : "9999979",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/helloWorld.init_output.json b/testsuite/contr/helloWorld.init_output.json
index 2deaf981..d0e22790 100644
--- a/testsuite/contr/helloWorld.init_output.json
+++ b/testsuite/contr/helloWorld.init_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999994",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/helloWorld.output_contrAddr.json b/testsuite/contr/helloWorld.output_contrAddr.json
index 184ea1e9..d22132c0 100644
--- a/testsuite/contr/helloWorld.output_contrAddr.json
+++ b/testsuite/contr/helloWorld.output_contrAddr.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999914",
+   "gas_remaining" : "9999989",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/helloWorld.output_getHello.json b/testsuite/contr/helloWorld.output_getHello.json
index 03b1a6d0..b7cc8f8f 100644
--- a/testsuite/contr/helloWorld.output_getHello.json
+++ b/testsuite/contr/helloWorld.output_getHello.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999894",
+   "gas_remaining" : "9999986",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/helloWorld.output_multipleMsgs.json b/testsuite/contr/helloWorld.output_multipleMsgs.json
index 35321b00..ff651378 100644
--- a/testsuite/contr/helloWorld.output_multipleMsgs.json
+++ b/testsuite/contr/helloWorld.output_multipleMsgs.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999753",
+   "gas_remaining" : "9999969",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/helloWorld.output_printContrParams.json b/testsuite/contr/helloWorld.output_printContrParams.json
index 52c9205e..79f52828 100644
--- a/testsuite/contr/helloWorld.output_printContrParams.json
+++ b/testsuite/contr/helloWorld.output_printContrParams.json
@@ -57,7 +57,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999680",
+   "gas_remaining" : "9999960",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/helloWorld.output_setHello_1.json b/testsuite/contr/helloWorld.output_setHello_1.json
index 27cd8007..b2b7d43a 100644
--- a/testsuite/contr/helloWorld.output_setHello_1.json
+++ b/testsuite/contr/helloWorld.output_setHello_1.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999887",
+   "gas_remaining" : "9999985",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/helloWorld.output_setHello_2.json b/testsuite/contr/helloWorld.output_setHello_2.json
index a422e5d8..3067011b 100644
--- a/testsuite/contr/helloWorld.output_setHello_2.json
+++ b/testsuite/contr/helloWorld.output_setHello_2.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999907",
+   "gas_remaining" : "9999988",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners.init_output.json b/testsuite/contr/map_corners.init_output.json
index 2deaf981..d0e22790 100644
--- a/testsuite/contr/map_corners.init_output.json
+++ b/testsuite/contr/map_corners.init_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999994",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_1.json b/testsuite/contr/map_corners_test.output_1.json
index aea1a699..6e9bf416 100644
--- a/testsuite/contr/map_corners_test.output_1.json
+++ b/testsuite/contr/map_corners_test.output_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999930",
+   "gas_remaining" : "9999991",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_10.json b/testsuite/contr/map_corners_test.output_10.json
index 2c23836d..3f098596 100644
--- a/testsuite/contr/map_corners_test.output_10.json
+++ b/testsuite/contr/map_corners_test.output_10.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999925",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_11.json b/testsuite/contr/map_corners_test.output_11.json
index a1908c72..8dec8c04 100644
--- a/testsuite/contr/map_corners_test.output_11.json
+++ b/testsuite/contr/map_corners_test.output_11.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999984",
+   "gas_remaining" : "9999998",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_12.json b/testsuite/contr/map_corners_test.output_12.json
index 27b98287..f5874919 100644
--- a/testsuite/contr/map_corners_test.output_12.json
+++ b/testsuite/contr/map_corners_test.output_12.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999981",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_13.json b/testsuite/contr/map_corners_test.output_13.json
index 060ef5ed..6e9bf416 100644
--- a/testsuite/contr/map_corners_test.output_13.json
+++ b/testsuite/contr/map_corners_test.output_13.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999929",
+   "gas_remaining" : "9999991",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_14.json b/testsuite/contr/map_corners_test.output_14.json
index 3c18ce78..5790ceaa 100644
--- a/testsuite/contr/map_corners_test.output_14.json
+++ b/testsuite/contr/map_corners_test.output_14.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999944",
+   "gas_remaining" : "9999993",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_15.json b/testsuite/contr/map_corners_test.output_15.json
index 164b5eed..7374873f 100644
--- a/testsuite/contr/map_corners_test.output_15.json
+++ b/testsuite/contr/map_corners_test.output_15.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999626",
+   "gas_remaining" : "9999953",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_16.json b/testsuite/contr/map_corners_test.output_16.json
index e27ece4f..c35b2839 100644
--- a/testsuite/contr/map_corners_test.output_16.json
+++ b/testsuite/contr/map_corners_test.output_16.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999725",
+   "gas_remaining" : "9999965",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_17.json b/testsuite/contr/map_corners_test.output_17.json
index 6e9bf416..8dec8c04 100644
--- a/testsuite/contr/map_corners_test.output_17.json
+++ b/testsuite/contr/map_corners_test.output_17.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999991",
+   "gas_remaining" : "9999998",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_18.json b/testsuite/contr/map_corners_test.output_18.json
index 358bf5fe..d0e22790 100644
--- a/testsuite/contr/map_corners_test.output_18.json
+++ b/testsuite/contr/map_corners_test.output_18.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999992",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_2.json b/testsuite/contr/map_corners_test.output_2.json
index c0f9a443..3f098596 100644
--- a/testsuite/contr/map_corners_test.output_2.json
+++ b/testsuite/contr/map_corners_test.output_2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999927",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_3.json b/testsuite/contr/map_corners_test.output_3.json
index 4cbd3663..358bf5fe 100644
--- a/testsuite/contr/map_corners_test.output_3.json
+++ b/testsuite/contr/map_corners_test.output_3.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999941",
+   "gas_remaining" : "9999992",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_4.json b/testsuite/contr/map_corners_test.output_4.json
index c7611697..ab88c164 100644
--- a/testsuite/contr/map_corners_test.output_4.json
+++ b/testsuite/contr/map_corners_test.output_4.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999964",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_5.json b/testsuite/contr/map_corners_test.output_5.json
index abdc4faf..3bf9a63c 100644
--- a/testsuite/contr/map_corners_test.output_5.json
+++ b/testsuite/contr/map_corners_test.output_5.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999846",
+   "gas_remaining" : "9999980",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_6.json b/testsuite/contr/map_corners_test.output_6.json
index 76677351..fb38ff84 100644
--- a/testsuite/contr/map_corners_test.output_6.json
+++ b/testsuite/contr/map_corners_test.output_6.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999837",
+   "gas_remaining" : "9999979",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_7.json b/testsuite/contr/map_corners_test.output_7.json
index 5febd13d..44e24bfd 100644
--- a/testsuite/contr/map_corners_test.output_7.json
+++ b/testsuite/contr/map_corners_test.output_7.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999895",
+   "gas_remaining" : "9999986",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_8.json b/testsuite/contr/map_corners_test.output_8.json
index 4c11ce44..44e24bfd 100644
--- a/testsuite/contr/map_corners_test.output_8.json
+++ b/testsuite/contr/map_corners_test.output_8.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999889",
+   "gas_remaining" : "9999986",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_corners_test.output_9.json b/testsuite/contr/map_corners_test.output_9.json
index 7e9e85e4..358bf5fe 100644
--- a/testsuite/contr/map_corners_test.output_9.json
+++ b/testsuite/contr/map_corners_test.output_9.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999940",
+   "gas_remaining" : "9999992",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_misc.output_1.json b/testsuite/contr/map_misc.output_1.json
index 86548076..e3b82a2a 100644
--- a/testsuite/contr/map_misc.output_1.json
+++ b/testsuite/contr/map_misc.output_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999973",
+   "gas_remaining" : "9999996",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/map_misc.output_2.json b/testsuite/contr/map_misc.output_2.json
index 3d005d47..27b98287 100644
--- a/testsuite/contr/map_misc.output_2.json
+++ b/testsuite/contr/map_misc.output_2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999850",
+   "gas_remaining" : "9999981",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/match_assign.output_t1_false.json b/testsuite/contr/match_assign.output_t1_false.json
index 5445ac01..bb98858e 100644
--- a/testsuite/contr/match_assign.output_t1_false.json
+++ b/testsuite/contr/match_assign.output_t1_false.json
@@ -32,7 +32,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999789",
+   "gas_remaining" : "9999973",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/match_assign.output_t1_true.json b/testsuite/contr/match_assign.output_t1_true.json
index 3c6ac95b..15ddcded 100644
--- a/testsuite/contr/match_assign.output_t1_true.json
+++ b/testsuite/contr/match_assign.output_t1_true.json
@@ -32,7 +32,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999789",
+   "gas_remaining" : "9999973",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/match_assign2.output_t1.json b/testsuite/contr/match_assign2.output_t1.json
index b99a889b..afcebf9f 100644
--- a/testsuite/contr/match_assign2.output_t1.json
+++ b/testsuite/contr/match_assign2.output_t1.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999863",
+   "gas_remaining" : "9999982",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/match_assign3.output_t1_false.json b/testsuite/contr/match_assign3.output_t1_false.json
index 65d66e7e..c099606d 100644
--- a/testsuite/contr/match_assign3.output_t1_false.json
+++ b/testsuite/contr/match_assign3.output_t1_false.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999858",
+   "gas_remaining" : "9999982",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/match_assign3.output_t1_true.json b/testsuite/contr/match_assign3.output_t1_true.json
index 809bf0f1..95a6c63e 100644
--- a/testsuite/contr/match_assign3.output_t1_true.json
+++ b/testsuite/contr/match_assign3.output_t1_true.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999858",
+   "gas_remaining" : "9999982",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/name_clash1.output_t1_false.json b/testsuite/contr/name_clash1.output_t1_false.json
index 66748225..4a27fd4e 100644
--- a/testsuite/contr/name_clash1.output_t1_false.json
+++ b/testsuite/contr/name_clash1.output_t1_false.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/name_clash1.output_t1_true.json b/testsuite/contr/name_clash1.output_t1_true.json
index 66748225..4a27fd4e 100644
--- a/testsuite/contr/name_clash1.output_t1_true.json
+++ b/testsuite/contr/name_clash1.output_t1_true.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/name_clash2.output_t1_false.json b/testsuite/contr/name_clash2.output_t1_false.json
index f3aa3707..72408a17 100644
--- a/testsuite/contr/name_clash2.output_t1_false.json
+++ b/testsuite/contr/name_clash2.output_t1_false.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999920",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/name_clash2.output_t1_true.json b/testsuite/contr/name_clash2.output_t1_true.json
index f3aa3707..72408a17 100644
--- a/testsuite/contr/name_clash2.output_t1_true.json
+++ b/testsuite/contr/name_clash2.output_t1_true.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999920",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/pm-empty.output_t1_false.json b/testsuite/contr/pm-empty.output_t1_false.json
index bf3a889d..bcddada8 100644
--- a/testsuite/contr/pm-empty.output_t1_false.json
+++ b/testsuite/contr/pm-empty.output_t1_false.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999929",
+   "gas_remaining" : "9999991",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/pm-empty.output_t1_true.json b/testsuite/contr/pm-empty.output_t1_true.json
index e3b82a2a..d0e22790 100644
--- a/testsuite/contr/pm-empty.output_t1_true.json
+++ b/testsuite/contr/pm-empty.output_t1_true.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999996",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.init_assignable_map_types_output.json b/testsuite/contr/remote_state_reads.init_assignable_map_types_output.json
index 0b00dbdb..e3b82a2a 100644
--- a/testsuite/contr/remote_state_reads.init_assignable_map_types_output.json
+++ b/testsuite/contr/remote_state_reads.init_assignable_map_types_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999971",
+   "gas_remaining" : "9999996",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.init_balance_and_nonce_output.json b/testsuite/contr/remote_state_reads.init_balance_and_nonce_output.json
index 0b00dbdb..e3b82a2a 100644
--- a/testsuite/contr/remote_state_reads.init_balance_and_nonce_output.json
+++ b/testsuite/contr/remote_state_reads.init_balance_and_nonce_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999971",
+   "gas_remaining" : "9999996",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.init_balance_no_nonce_output.json b/testsuite/contr/remote_state_reads.init_balance_no_nonce_output.json
index 0b00dbdb..e3b82a2a 100644
--- a/testsuite/contr/remote_state_reads.init_balance_no_nonce_output.json
+++ b/testsuite/contr/remote_state_reads.init_balance_no_nonce_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999971",
+   "gas_remaining" : "9999996",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.init_nonce_no_balance_output.json b/testsuite/contr/remote_state_reads.init_nonce_no_balance_output.json
index 0b00dbdb..e3b82a2a 100644
--- a/testsuite/contr/remote_state_reads.init_nonce_no_balance_output.json
+++ b/testsuite/contr/remote_state_reads.init_nonce_no_balance_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999971",
+   "gas_remaining" : "9999996",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.init_output.json b/testsuite/contr/remote_state_reads.init_output.json
index 0b00dbdb..e3b82a2a 100644
--- a/testsuite/contr/remote_state_reads.init_output.json
+++ b/testsuite/contr/remote_state_reads.init_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999971",
+   "gas_remaining" : "9999996",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_1.json b/testsuite/contr/remote_state_reads.output_1.json
index 6e2ed689..7e9e85e4 100644
--- a/testsuite/contr/remote_state_reads.output_1.json
+++ b/testsuite/contr/remote_state_reads.output_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999522",
+   "gas_remaining" : "9999940",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_10.json b/testsuite/contr/remote_state_reads.output_10.json
index 6e2ed689..7e9e85e4 100644
--- a/testsuite/contr/remote_state_reads.output_10.json
+++ b/testsuite/contr/remote_state_reads.output_10.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999522",
+   "gas_remaining" : "9999940",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_2.json b/testsuite/contr/remote_state_reads.output_2.json
index 6e2ed689..7e9e85e4 100644
--- a/testsuite/contr/remote_state_reads.output_2.json
+++ b/testsuite/contr/remote_state_reads.output_2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999522",
+   "gas_remaining" : "9999940",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_3.json b/testsuite/contr/remote_state_reads.output_3.json
index 6e2ed689..7e9e85e4 100644
--- a/testsuite/contr/remote_state_reads.output_3.json
+++ b/testsuite/contr/remote_state_reads.output_3.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999522",
+   "gas_remaining" : "9999940",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_4.json b/testsuite/contr/remote_state_reads.output_4.json
index 6e2ed689..7e9e85e4 100644
--- a/testsuite/contr/remote_state_reads.output_4.json
+++ b/testsuite/contr/remote_state_reads.output_4.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999522",
+   "gas_remaining" : "9999940",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_5.json b/testsuite/contr/remote_state_reads.output_5.json
index 6e2ed689..7e9e85e4 100644
--- a/testsuite/contr/remote_state_reads.output_5.json
+++ b/testsuite/contr/remote_state_reads.output_5.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999522",
+   "gas_remaining" : "9999940",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_6.json b/testsuite/contr/remote_state_reads.output_6.json
index 07164781..d0e22790 100644
--- a/testsuite/contr/remote_state_reads.output_6.json
+++ b/testsuite/contr/remote_state_reads.output_6.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "10000000",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_7.json b/testsuite/contr/remote_state_reads.output_7.json
index 7b86503c..3936b16c 100644
--- a/testsuite/contr/remote_state_reads.output_7.json
+++ b/testsuite/contr/remote_state_reads.output_7.json
@@ -22,7 +22,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999674",
+   "gas_remaining" : "9999959",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/remote_state_reads.output_8.json b/testsuite/contr/remote_state_reads.output_8.json
index 9297f44b..3cffb122 100644
--- a/testsuite/contr/remote_state_reads.output_8.json
+++ b/testsuite/contr/remote_state_reads.output_8.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999858",
+   "gas_remaining" : "9999982",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads.output_9.json b/testsuite/contr/remote_state_reads.output_9.json
index 6e2ed689..7e9e85e4 100644
--- a/testsuite/contr/remote_state_reads.output_9.json
+++ b/testsuite/contr/remote_state_reads.output_9.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999522",
+   "gas_remaining" : "9999940",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads_2.output_1.json b/testsuite/contr/remote_state_reads_2.output_1.json
index a253f7cc..6e9bf416 100644
--- a/testsuite/contr/remote_state_reads_2.output_1.json
+++ b/testsuite/contr/remote_state_reads_2.output_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999928",
+   "gas_remaining" : "9999991",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads_2.output_2.json b/testsuite/contr/remote_state_reads_2.output_2.json
index 2c23836d..3f098596 100644
--- a/testsuite/contr/remote_state_reads_2.output_2.json
+++ b/testsuite/contr/remote_state_reads_2.output_2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999925",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads_2.output_3.json b/testsuite/contr/remote_state_reads_2.output_3.json
index 8629aa1f..ab88c164 100644
--- a/testsuite/contr/remote_state_reads_2.output_3.json
+++ b/testsuite/contr/remote_state_reads_2.output_3.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999960",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads_2.output_4.json b/testsuite/contr/remote_state_reads_2.output_4.json
index 19d5380c..f5874919 100644
--- a/testsuite/contr/remote_state_reads_2.output_4.json
+++ b/testsuite/contr/remote_state_reads_2.output_4.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999977",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/remote_state_reads_2.output_5.json b/testsuite/contr/remote_state_reads_2.output_5.json
index 4adf391d..2deaf981 100644
--- a/testsuite/contr/remote_state_reads_2.output_5.json
+++ b/testsuite/contr/remote_state_reads_2.output_5.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999956",
+   "gas_remaining" : "9999994",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/send.output_SendMsg.json b/testsuite/contr/send.output_SendMsg.json
index 00d8a610..6cfca678 100644
--- a/testsuite/contr/send.output_SendMsg.json
+++ b/testsuite/contr/send.output_SendMsg.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999876",
+   "gas_remaining" : "9999984",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/send.output_SendMsg2.json b/testsuite/contr/send.output_SendMsg2.json
index 4e19fc67..68b98435 100644
--- a/testsuite/contr/send.output_SendMsg2.json
+++ b/testsuite/contr/send.output_SendMsg2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999756",
+   "gas_remaining" : "9999969",
    "messages" : [
       {
          "_amount" : "100",
diff --git a/testsuite/contr/simple-iterate.output.json b/testsuite/contr/simple-iterate.output.json
index 1fc9ce9e..f9d133b8 100644
--- a/testsuite/contr/simple-iterate.output.json
+++ b/testsuite/contr/simple-iterate.output.json
@@ -52,7 +52,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999665",
+   "gas_remaining" : "9999958",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/simple-map.init_output.json b/testsuite/contr/simple-map.init_output.json
index f5874919..d0e22790 100644
--- a/testsuite/contr/simple-map.init_output.json
+++ b/testsuite/contr/simple-map.init_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999997",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/simple-map.output_00_0.json b/testsuite/contr/simple-map.output_00_0.json
index 3f098596..8dec8c04 100644
--- a/testsuite/contr/simple-map.output_00_0.json
+++ b/testsuite/contr/simple-map.output_00_0.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999990",
+   "gas_remaining" : "9999998",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/simple-map.output_00_1.json b/testsuite/contr/simple-map.output_00_1.json
index 5e8d3f06..8dec8c04 100644
--- a/testsuite/contr/simple-map.output_00_1.json
+++ b/testsuite/contr/simple-map.output_00_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999987",
+   "gas_remaining" : "9999998",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/simple-map.output_01_0.json b/testsuite/contr/simple-map.output_01_0.json
index 3bf9a63c..f5874919 100644
--- a/testsuite/contr/simple-map.output_01_0.json
+++ b/testsuite/contr/simple-map.output_01_0.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999980",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/simple-map.output_01_1.json b/testsuite/contr/simple-map.output_01_1.json
index a254ee2c..f5874919 100644
--- a/testsuite/contr/simple-map.output_01_1.json
+++ b/testsuite/contr/simple-map.output_01_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999978",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_1.json b/testsuite/contr/type_casts.output_1.json
index a254ee2c..f5874919 100644
--- a/testsuite/contr/type_casts.output_1.json
+++ b/testsuite/contr/type_casts.output_1.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999978",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_10.json b/testsuite/contr/type_casts.output_10.json
index 826a9d24..ab88c164 100644
--- a/testsuite/contr/type_casts.output_10.json
+++ b/testsuite/contr/type_casts.output_10.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999962",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_11.json b/testsuite/contr/type_casts.output_11.json
index ab88c164..d0e22790 100644
--- a/testsuite/contr/type_casts.output_11.json
+++ b/testsuite/contr/type_casts.output_11.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999995",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_12.json b/testsuite/contr/type_casts.output_12.json
index ab88c164..d0e22790 100644
--- a/testsuite/contr/type_casts.output_12.json
+++ b/testsuite/contr/type_casts.output_12.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999995",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_13.json b/testsuite/contr/type_casts.output_13.json
index 92758b4f..ab88c164 100644
--- a/testsuite/contr/type_casts.output_13.json
+++ b/testsuite/contr/type_casts.output_13.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999961",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_14.json b/testsuite/contr/type_casts.output_14.json
index 92758b4f..ab88c164 100644
--- a/testsuite/contr/type_casts.output_14.json
+++ b/testsuite/contr/type_casts.output_14.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999961",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_15.json b/testsuite/contr/type_casts.output_15.json
index ab88c164..d0e22790 100644
--- a/testsuite/contr/type_casts.output_15.json
+++ b/testsuite/contr/type_casts.output_15.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999995",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_16.json b/testsuite/contr/type_casts.output_16.json
index 92758b4f..ab88c164 100644
--- a/testsuite/contr/type_casts.output_16.json
+++ b/testsuite/contr/type_casts.output_16.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999961",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_17.json b/testsuite/contr/type_casts.output_17.json
index 92758b4f..ab88c164 100644
--- a/testsuite/contr/type_casts.output_17.json
+++ b/testsuite/contr/type_casts.output_17.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999961",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_18.json b/testsuite/contr/type_casts.output_18.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_18.json
+++ b/testsuite/contr/type_casts.output_18.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_19.json b/testsuite/contr/type_casts.output_19.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_19.json
+++ b/testsuite/contr/type_casts.output_19.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_2.json b/testsuite/contr/type_casts.output_2.json
index a254ee2c..f5874919 100644
--- a/testsuite/contr/type_casts.output_2.json
+++ b/testsuite/contr/type_casts.output_2.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999978",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_20.json b/testsuite/contr/type_casts.output_20.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_20.json
+++ b/testsuite/contr/type_casts.output_20.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_21.json b/testsuite/contr/type_casts.output_21.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_21.json
+++ b/testsuite/contr/type_casts.output_21.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_22.json b/testsuite/contr/type_casts.output_22.json
index 29ec9d30..3f098596 100644
--- a/testsuite/contr/type_casts.output_22.json
+++ b/testsuite/contr/type_casts.output_22.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_23.json b/testsuite/contr/type_casts.output_23.json
index 29ec9d30..3f098596 100644
--- a/testsuite/contr/type_casts.output_23.json
+++ b/testsuite/contr/type_casts.output_23.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_24.json b/testsuite/contr/type_casts.output_24.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_24.json
+++ b/testsuite/contr/type_casts.output_24.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_25.json b/testsuite/contr/type_casts.output_25.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_25.json
+++ b/testsuite/contr/type_casts.output_25.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_26.json b/testsuite/contr/type_casts.output_26.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_26.json
+++ b/testsuite/contr/type_casts.output_26.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_27.json b/testsuite/contr/type_casts.output_27.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_27.json
+++ b/testsuite/contr/type_casts.output_27.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_28.json b/testsuite/contr/type_casts.output_28.json
index 29ec9d30..3f098596 100644
--- a/testsuite/contr/type_casts.output_28.json
+++ b/testsuite/contr/type_casts.output_28.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_29.json b/testsuite/contr/type_casts.output_29.json
index 29ec9d30..3f098596 100644
--- a/testsuite/contr/type_casts.output_29.json
+++ b/testsuite/contr/type_casts.output_29.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_3.json b/testsuite/contr/type_casts.output_3.json
index 19d5380c..f5874919 100644
--- a/testsuite/contr/type_casts.output_3.json
+++ b/testsuite/contr/type_casts.output_3.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999977",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_30.json b/testsuite/contr/type_casts.output_30.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_30.json
+++ b/testsuite/contr/type_casts.output_30.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_31.json b/testsuite/contr/type_casts.output_31.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_31.json
+++ b/testsuite/contr/type_casts.output_31.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_32.json b/testsuite/contr/type_casts.output_32.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_32.json
+++ b/testsuite/contr/type_casts.output_32.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_33.json b/testsuite/contr/type_casts.output_33.json
index 29ec9d30..3f098596 100644
--- a/testsuite/contr/type_casts.output_33.json
+++ b/testsuite/contr/type_casts.output_33.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_34.json b/testsuite/contr/type_casts.output_34.json
index 29ec9d30..3f098596 100644
--- a/testsuite/contr/type_casts.output_34.json
+++ b/testsuite/contr/type_casts.output_34.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999923",
+   "gas_remaining" : "9999990",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_35.json b/testsuite/contr/type_casts.output_35.json
index 5790ceaa..d0e22790 100644
--- a/testsuite/contr/type_casts.output_35.json
+++ b/testsuite/contr/type_casts.output_35.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999993",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_36.json b/testsuite/contr/type_casts.output_36.json
index 6e9bf416..8dec8c04 100644
--- a/testsuite/contr/type_casts.output_36.json
+++ b/testsuite/contr/type_casts.output_36.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999991",
+   "gas_remaining" : "9999998",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_37.json b/testsuite/contr/type_casts.output_37.json
index cf72a842..5e8d3f06 100644
--- a/testsuite/contr/type_casts.output_37.json
+++ b/testsuite/contr/type_casts.output_37.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999899",
+   "gas_remaining" : "9999987",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_4.json b/testsuite/contr/type_casts.output_4.json
index 19d5380c..f5874919 100644
--- a/testsuite/contr/type_casts.output_4.json
+++ b/testsuite/contr/type_casts.output_4.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999977",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_5.json b/testsuite/contr/type_casts.output_5.json
index 19d5380c..f5874919 100644
--- a/testsuite/contr/type_casts.output_5.json
+++ b/testsuite/contr/type_casts.output_5.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999977",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_6.json b/testsuite/contr/type_casts.output_6.json
index 19d5380c..f5874919 100644
--- a/testsuite/contr/type_casts.output_6.json
+++ b/testsuite/contr/type_casts.output_6.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999977",
+   "gas_remaining" : "9999997",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_7.json b/testsuite/contr/type_casts.output_7.json
index e3b82a2a..d0e22790 100644
--- a/testsuite/contr/type_casts.output_7.json
+++ b/testsuite/contr/type_casts.output_7.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999996",
+   "gas_remaining" : "9999999",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_8.json b/testsuite/contr/type_casts.output_8.json
index 826a9d24..ab88c164 100644
--- a/testsuite/contr/type_casts.output_8.json
+++ b/testsuite/contr/type_casts.output_8.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999962",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/type_casts.output_9.json b/testsuite/contr/type_casts.output_9.json
index 826a9d24..ab88c164 100644
--- a/testsuite/contr/type_casts.output_9.json
+++ b/testsuite/contr/type_casts.output_9.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999962",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/ud-proxy.output_bestow.json b/testsuite/contr/ud-proxy.output_bestow.json
index 1a1533a0..d66b5cdf 100644
--- a/testsuite/contr/ud-proxy.output_bestow.json
+++ b/testsuite/contr/ud-proxy.output_bestow.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999747",
+   "gas_remaining" : "9999968",
    "messages" : [
       {
          "_amount" : "0",
diff --git a/testsuite/contr/ud-registry.init_output.json b/testsuite/contr/ud-registry.init_output.json
index ef5ab4cc..ab88c164 100644
--- a/testsuite/contr/ud-registry.init_output.json
+++ b/testsuite/contr/ud-registry.init_output.json
@@ -1,7 +1,7 @@
 {
    "_accepted" : "false",
    "events" : [],
-   "gas_remaining" : "9999963",
+   "gas_remaining" : "9999995",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/ud-registry.output_bestow.json b/testsuite/contr/ud-registry.output_bestow.json
index f445e623..bd71a3a6 100644
--- a/testsuite/contr/ud-registry.output_bestow.json
+++ b/testsuite/contr/ud-registry.output_bestow.json
@@ -37,7 +37,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999319",
+   "gas_remaining" : "9999914",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/ud-registry.output_setAdmin.json b/testsuite/contr/ud-registry.output_setAdmin.json
index 772b4e5b..a4b9d941 100644
--- a/testsuite/contr/ud-registry.output_setAdmin.json
+++ b/testsuite/contr/ud-registry.output_setAdmin.json
@@ -21,7 +21,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999644",
+   "gas_remaining" : "9999955",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/contr/ud-registry.output_setRegistrar.json b/testsuite/contr/ud-registry.output_setRegistrar.json
index 37237c2e..feeea37e 100644
--- a/testsuite/contr/ud-registry.output_setRegistrar.json
+++ b/testsuite/contr/ud-registry.output_setRegistrar.json
@@ -12,7 +12,7 @@
          ]
       }
    ],
-   "gas_remaining" : "9999779",
+   "gas_remaining" : "9999972",
    "messages" : [],
    "scilla_major_version" : "0"
 }
diff --git a/testsuite/expr/ackermann.ll.result b/testsuite/expr/ackermann.ll.result
index 5bf075c9..eb5ee9f2 100644
--- a/testsuite/expr/ackermann.ll.result
+++ b/testsuite/expr/ackermann.ll.result
@@ -1,2 +1,2 @@
 312 : Uint32
-Gas remaining: 9931968
+Gas remaining: 9991496
diff --git a/testsuite/expr/ackermann_3_7.ll.result b/testsuite/expr/ackermann_3_7.ll.result
index 1d3c2fef..94b9ae37 100644
--- a/testsuite/expr/ackermann_3_7.ll.result
+++ b/testsuite/expr/ackermann_3_7.ll.result
@@ -1,2 +1,2 @@
 1021 : Uint32
-Gas remaining: 6856364
+Gas remaining: 9607045
diff --git a/testsuite/expr/adt-fun.ll.result b/testsuite/expr/adt-fun.ll.result
index 18d34df5..d659041c 100644
--- a/testsuite/expr/adt-fun.ll.result
+++ b/testsuite/expr/adt-fun.ll.result
@@ -1,2 +1,2 @@
 Cons(0 : Int32)(Nil : List (Int32)) : List (Int32)
-Gas remaining: 9999992
+Gas remaining: 9999999
diff --git a/testsuite/expr/builtin-ecdsa_recover.ll.result b/testsuite/expr/builtin-ecdsa_recover.ll.result
index 80dddba5..27d0faed 100644
--- a/testsuite/expr/builtin-ecdsa_recover.ll.result
+++ b/testsuite/expr/builtin-ecdsa_recover.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9998099
+Gas remaining: 9999762
diff --git a/testsuite/expr/builtin-isqrt.ll.result b/testsuite/expr/builtin-isqrt.ll.result
index 3422c5eb..0176fbcd 100644
--- a/testsuite/expr/builtin-isqrt.ll.result
+++ b/testsuite/expr/builtin-isqrt.ll.result
@@ -1,2 +1,2 @@
 Pair(Pair(18446744073709551617 : Uint128)(240615969168004511545033772477625056933 : Uint256) : Pair (Uint128) (Uint256))(7 : Uint32) : Pair (Pair (Uint128) (Uint256)) (Uint32)
-Gas remaining: 9999898
+Gas remaining: 9999987
diff --git a/testsuite/expr/builtin-pow.ll.result b/testsuite/expr/builtin-pow.ll.result
index 7cbb1705..e6fcc81a 100644
--- a/testsuite/expr/builtin-pow.ll.result
+++ b/testsuite/expr/builtin-pow.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9993718
+Gas remaining: 9999214
diff --git a/testsuite/expr/builtin-schnorr_get_address.ll.result b/testsuite/expr/builtin-schnorr_get_address.ll.result
index f583acc1..5814e06f 100644
--- a/testsuite/expr/builtin-schnorr_get_address.ll.result
+++ b/testsuite/expr/builtin-schnorr_get_address.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999729
+Gas remaining: 9999966
diff --git a/testsuite/expr/builtin_add_int256.ll.result b/testsuite/expr/builtin_add_int256.ll.result
index 6ebf1d39..e92a0bce 100644
--- a/testsuite/expr/builtin_add_int256.ll.result
+++ b/testsuite/expr/builtin_add_int256.ll.result
@@ -1,2 +1,2 @@
 1 : Int256
-Gas remaining: 9999980
+Gas remaining: 9999997
diff --git a/testsuite/expr/builtin_add_int32.ll.result b/testsuite/expr/builtin_add_int32.ll.result
index 13c8393e..f3c560b0 100644
--- a/testsuite/expr/builtin_add_int32.ll.result
+++ b/testsuite/expr/builtin_add_int32.ll.result
@@ -1,2 +1,2 @@
 3 : Int32
-Gas remaining: 9999992
+Gas remaining: 9999999
diff --git a/testsuite/expr/builtin_add_uint256.ll.result b/testsuite/expr/builtin_add_uint256.ll.result
index c1647ee9..cd6d2fde 100644
--- a/testsuite/expr/builtin_add_uint256.ll.result
+++ b/testsuite/expr/builtin_add_uint256.ll.result
@@ -1,2 +1,2 @@
 10000111 : Uint256
-Gas remaining: 9999980
+Gas remaining: 9999997
diff --git a/testsuite/expr/builtin_add_uint32.ll.result b/testsuite/expr/builtin_add_uint32.ll.result
index 82701c81..8f6ab6a9 100644
--- a/testsuite/expr/builtin_add_uint32.ll.result
+++ b/testsuite/expr/builtin_add_uint32.ll.result
@@ -1,2 +1,2 @@
 3 : Uint32
-Gas remaining: 9999992
+Gas remaining: 9999999
diff --git a/testsuite/expr/builtin_baddsub.ll.result b/testsuite/expr/builtin_baddsub.ll.result
index ed8a478b..652d076a 100644
--- a/testsuite/expr/builtin_baddsub.ll.result
+++ b/testsuite/expr/builtin_baddsub.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999748
+Gas remaining: 9999968
diff --git a/testsuite/expr/builtin_bech32-invalid.ll.result b/testsuite/expr/builtin_bech32-invalid.ll.result
index f4e0b543..fe56c5a9 100644
--- a/testsuite/expr/builtin_bech32-invalid.ll.result
+++ b/testsuite/expr/builtin_bech32-invalid.ll.result
@@ -1,2 +1,2 @@
 None : Option (ByStr20)
-Gas remaining: 9999748
+Gas remaining: 9999968
diff --git a/testsuite/expr/builtin_bech32.ll.result b/testsuite/expr/builtin_bech32.ll.result
index c9eb6f3b..5672102c 100644
--- a/testsuite/expr/builtin_bech32.ll.result
+++ b/testsuite/expr/builtin_bech32.ll.result
@@ -1,2 +1,2 @@
 Some(0x7aa7ea9f4534d8d70224b9c2fb165242f321f12b : ByStr20) : Option (ByStr20)
-Gas remaining: 9999748
+Gas remaining: 9999968
diff --git a/testsuite/expr/builtin_bech32_rev.ll.result b/testsuite/expr/builtin_bech32_rev.ll.result
index 7047088f..f54fda92 100644
--- a/testsuite/expr/builtin_bech32_rev.ll.result
+++ b/testsuite/expr/builtin_bech32_rev.ll.result
@@ -1,2 +1,2 @@
 Some(zil102n74869xnvdwq3yh8p0k9jjgtejruft268tg8 : String) : Option (String)
-Gas remaining: 9999836
+Gas remaining: 9999979
diff --git a/testsuite/expr/builtin_concat.ll.result b/testsuite/expr/builtin_concat.ll.result
index d720b5da..19ce603d 100644
--- a/testsuite/expr/builtin_concat.ll.result
+++ b/testsuite/expr/builtin_concat.ll.result
@@ -1,2 +1,2 @@
 Pair(True : Bool)(Pair(helloworld : String)(0x00110011001100110011001100110011001111ffff11 : ByStr22) : Pair (String) (ByStr22)) : Pair (Bool) (Pair (String) (ByStr22))
-Gas remaining: 9999895
+Gas remaining: 9999986
diff --git a/testsuite/expr/builtin_div_rem.ll.result b/testsuite/expr/builtin_div_rem.ll.result
index b9401973..150c564b 100644
--- a/testsuite/expr/builtin_div_rem.ll.result
+++ b/testsuite/expr/builtin_div_rem.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999255
+Gas remaining: 9999906
diff --git a/testsuite/expr/builtin_ecdsa_verify_false.ll.result b/testsuite/expr/builtin_ecdsa_verify_false.ll.result
index f326740a..3845329e 100644
--- a/testsuite/expr/builtin_ecdsa_verify_false.ll.result
+++ b/testsuite/expr/builtin_ecdsa_verify_false.ll.result
@@ -1,2 +1,2 @@
 False : Bool
-Gas remaining: 9999681
+Gas remaining: 9999960
diff --git a/testsuite/expr/builtin_ecdsa_verify_true.ll.result b/testsuite/expr/builtin_ecdsa_verify_true.ll.result
index 65ab7523..70310696 100644
--- a/testsuite/expr/builtin_ecdsa_verify_true.ll.result
+++ b/testsuite/expr/builtin_ecdsa_verify_true.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999681
+Gas remaining: 9999960
diff --git a/testsuite/expr/builtin_eq.ll.result b/testsuite/expr/builtin_eq.ll.result
index cbc88bd9..c6da4f02 100644
--- a/testsuite/expr/builtin_eq.ll.result
+++ b/testsuite/expr/builtin_eq.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999757
+Gas remaining: 9999969
diff --git a/testsuite/expr/builtin_keccak256hash.ll.result b/testsuite/expr/builtin_keccak256hash.ll.result
index 5c2965f9..b6364f9b 100644
--- a/testsuite/expr/builtin_keccak256hash.ll.result
+++ b/testsuite/expr/builtin_keccak256hash.ll.result
@@ -1,2 +1,2 @@
 0xe0c18dccce2a637f2adbab92cc9c49828eb8594c99abd20794170f008245fbd9 : ByStr32
-Gas remaining: 9999952
+Gas remaining: 9999994
diff --git a/testsuite/expr/builtin_lt.ll.result b/testsuite/expr/builtin_lt.ll.result
index cc5f13ff..ff6070f4 100644
--- a/testsuite/expr/builtin_lt.ll.result
+++ b/testsuite/expr/builtin_lt.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999832
+Gas remaining: 9999979
diff --git a/testsuite/expr/builtin_map.ll.result b/testsuite/expr/builtin_map.ll.result
index aa03f78a..525d02dc 100644
--- a/testsuite/expr/builtin_map.ll.result
+++ b/testsuite/expr/builtin_map.ll.result
@@ -1,2 +1,2 @@
 6 : Uint32
-Gas remaining: 9999933
+Gas remaining: 9999991
diff --git a/testsuite/expr/builtin_mul.ll.result b/testsuite/expr/builtin_mul.ll.result
index e4036aa2..e0a0bced 100644
--- a/testsuite/expr/builtin_mul.ll.result
+++ b/testsuite/expr/builtin_mul.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9998165
+Gas remaining: 9999770
diff --git a/testsuite/expr/builtin_ripemd160hash.ll.result b/testsuite/expr/builtin_ripemd160hash.ll.result
index 7d64712d..5e5b2667 100644
--- a/testsuite/expr/builtin_ripemd160hash.ll.result
+++ b/testsuite/expr/builtin_ripemd160hash.ll.result
@@ -1,2 +1,2 @@
 0xfd727b5aebd8e46e67a46f2563a1637595426484 : ByStr20
-Gas remaining: 9999964
+Gas remaining: 9999995
diff --git a/testsuite/expr/builtin_schnorr_verify_false.ll.result b/testsuite/expr/builtin_schnorr_verify_false.ll.result
index f326740a..3845329e 100644
--- a/testsuite/expr/builtin_schnorr_verify_false.ll.result
+++ b/testsuite/expr/builtin_schnorr_verify_false.ll.result
@@ -1,2 +1,2 @@
 False : Bool
-Gas remaining: 9999681
+Gas remaining: 9999960
diff --git a/testsuite/expr/builtin_schnorr_verify_true.ll.result b/testsuite/expr/builtin_schnorr_verify_true.ll.result
index 65ab7523..70310696 100644
--- a/testsuite/expr/builtin_schnorr_verify_true.ll.result
+++ b/testsuite/expr/builtin_schnorr_verify_true.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999681
+Gas remaining: 9999960
diff --git a/testsuite/expr/builtin_sha256hash.ll.result b/testsuite/expr/builtin_sha256hash.ll.result
index ddf1bbcc..6da8d1b8 100644
--- a/testsuite/expr/builtin_sha256hash.ll.result
+++ b/testsuite/expr/builtin_sha256hash.ll.result
@@ -1,2 +1,2 @@
 0x339fc9c631a7c818bc4b2b471793dcc986c541239f6b55df348e94b8cab7775d : ByStr32
-Gas remaining: 9999952
+Gas remaining: 9999994
diff --git a/testsuite/expr/builtin_strlen.ll.result b/testsuite/expr/builtin_strlen.ll.result
index 18a058a9..8e8c41a7 100644
--- a/testsuite/expr/builtin_strlen.ll.result
+++ b/testsuite/expr/builtin_strlen.ll.result
@@ -1,2 +1,2 @@
 7 : Uint32
-Gas remaining: 9999928
+Gas remaining: 9999991
diff --git a/testsuite/expr/builtin_strrev.ll.result b/testsuite/expr/builtin_strrev.ll.result
index aa3cb185..a6f9f8c3 100644
--- a/testsuite/expr/builtin_strrev.ll.result
+++ b/testsuite/expr/builtin_strrev.ll.result
@@ -1,2 +1,2 @@
 Pair(0xccaabbaaaaaaaaccaabbaaaaaaaa : ByStr)(olleH : String) : Pair (ByStr) (String)
-Gas remaining: 9999906
+Gas remaining: 9999988
diff --git a/testsuite/expr/builtin_sub.ll.result b/testsuite/expr/builtin_sub.ll.result
index c516fad3..9afa51b4 100644
--- a/testsuite/expr/builtin_sub.ll.result
+++ b/testsuite/expr/builtin_sub.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999549
+Gas remaining: 9999943
diff --git a/testsuite/expr/builtin_substr.ll.result b/testsuite/expr/builtin_substr.ll.result
index 9425baab..51dee69b 100644
--- a/testsuite/expr/builtin_substr.ll.result
+++ b/testsuite/expr/builtin_substr.ll.result
@@ -1,2 +1,2 @@
 Pair(hello : String)(0x0011223344 : ByStr) : Pair (String) (ByStr)
-Gas remaining: 9999972
+Gas remaining: 9999996
diff --git a/testsuite/expr/builtin_to_ascii.ll.result b/testsuite/expr/builtin_to_ascii.ll.result
index ad42b4cf..097deabc 100644
--- a/testsuite/expr/builtin_to_ascii.ll.result
+++ b/testsuite/expr/builtin_to_ascii.ll.result
@@ -1,2 +1,2 @@
 hello world : String
-Gas remaining: 9999936
+Gas remaining: 9999992
diff --git a/testsuite/expr/builtin_to_bystrx.ll.result b/testsuite/expr/builtin_to_bystrx.ll.result
index 6f9e3110..51c62c85 100644
--- a/testsuite/expr/builtin_to_bystrx.ll.result
+++ b/testsuite/expr/builtin_to_bystrx.ll.result
@@ -1,2 +1,2 @@
 Pair(Pair(Pair(Pair(0x00000064 : ByStr4)(0x00000000000000c8 : ByStr8) : Pair (ByStr4) (ByStr8))(0x0000000000000000000000000000012c : ByStr16) : Pair (Pair (ByStr4) (ByStr8)) (ByStr16))(0x0000000000000000000000000000000000000000000000000000000000000190 : ByStr32) : Pair (Pair (Pair (ByStr4) (ByStr8)) (ByStr16)) (ByStr32))(Pair(Some(0xffee : ByStr2) : Option (ByStr2))(None : Option (ByStr3)) : Pair (Option (ByStr2)) (Option (ByStr3))) : Pair (Pair (Pair (Pair (ByStr4) (ByStr8)) (ByStr16)) (ByStr32)) (Pair (Option (ByStr2)) (Option (ByStr3)))
-Gas remaining: 9999905
+Gas remaining: 9999988
diff --git a/testsuite/expr/builtin_to_int.ll.result b/testsuite/expr/builtin_to_int.ll.result
index e2947e44..b8fa5b5b 100644
--- a/testsuite/expr/builtin_to_int.ll.result
+++ b/testsuite/expr/builtin_to_int.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999579
+Gas remaining: 9999947
diff --git a/testsuite/expr/builtin_to_nat.ll.result b/testsuite/expr/builtin_to_nat.ll.result
index 2f8a62aa..d25af65a 100644
--- a/testsuite/expr/builtin_to_nat.ll.result
+++ b/testsuite/expr/builtin_to_nat.ll.result
@@ -1,2 +1,2 @@
 Succ(Succ(Zero : Nat) : Nat) : Nat
-Gas remaining: 9999996
+Gas remaining: 9999999
diff --git a/testsuite/expr/builtin_to_string.ll.result b/testsuite/expr/builtin_to_string.ll.result
index c9562dd8..005efc70 100644
--- a/testsuite/expr/builtin_to_string.ll.result
+++ b/testsuite/expr/builtin_to_string.ll.result
@@ -1,2 +1,2 @@
 201120126018551-20112012-6018-5510xff00cc110xff00cc11 : String
-Gas remaining: 9999508
+Gas remaining: 9999938
diff --git a/testsuite/expr/builtin_to_uint.ll.result b/testsuite/expr/builtin_to_uint.ll.result
index 4528baf7..b0bcec66 100644
--- a/testsuite/expr/builtin_to_uint.ll.result
+++ b/testsuite/expr/builtin_to_uint.ll.result
@@ -1,2 +1,2 @@
 True : Bool
-Gas remaining: 9999469
+Gas remaining: 9999933
diff --git a/testsuite/expr/bystrx_uint_conversions.ll.result b/testsuite/expr/bystrx_uint_conversions.ll.result
index 14e2f0f0..4c1c652d 100644
--- a/testsuite/expr/bystrx_uint_conversions.ll.result
+++ b/testsuite/expr/bystrx_uint_conversions.ll.result
@@ -1,2 +1,2 @@
 Pair(Pair(3 : Uint32)(3 : Uint64) : Pair (Uint32) (Uint64))(Pair(4 : Uint128)(4 : Uint256) : Pair (Uint128) (Uint256)) : Pair (Pair (Uint32) (Uint64)) (Pair (Uint128) (Uint256))
-Gas remaining: 9999629
+Gas remaining: 9999953
diff --git a/testsuite/expr/church_nat.ll.result b/testsuite/expr/church_nat.ll.result
index d1fa3c16..11b32dde 100644
--- a/testsuite/expr/church_nat.ll.result
+++ b/testsuite/expr/church_nat.ll.result
@@ -1,2 +1,2 @@
 65536 : Uint32
-Gas remaining: 9073044
+Gas remaining: 9884130
diff --git a/testsuite/expr/church_nat_stlc.ll.result b/testsuite/expr/church_nat_stlc.ll.result
index 1bb23076..a44ee09f 100644
--- a/testsuite/expr/church_nat_stlc.ll.result
+++ b/testsuite/expr/church_nat_stlc.ll.result
@@ -1,2 +1,2 @@
 131099 : Uint32
-Gas remaining: 9046262
+Gas remaining: 9880782
diff --git a/testsuite/expr/cn.ll.result b/testsuite/expr/cn.ll.result
index a6e3cf61..9c55b2d6 100644
--- a/testsuite/expr/cn.ll.result
+++ b/testsuite/expr/cn.ll.result
@@ -1,2 +1,2 @@
 0 : Uint32
-Gas remaining: 9999968
+Gas remaining: 9999996
diff --git a/testsuite/expr/fib.ll.result b/testsuite/expr/fib.ll.result
index 423a90a5..89c078a8 100644
--- a/testsuite/expr/fib.ll.result
+++ b/testsuite/expr/fib.ll.result
@@ -1,2 +1,2 @@
 21 : Int32
-Gas remaining: 9999859
+Gas remaining: 9999982
diff --git a/testsuite/expr/fun-type-inst.ll.result b/testsuite/expr/fun-type-inst.ll.result
index bdc35916..342d4e81 100644
--- a/testsuite/expr/fun-type-inst.ll.result
+++ b/testsuite/expr/fun-type-inst.ll.result
@@ -1,2 +1,2 @@
 2 : Uint32
-Gas remaining: 9999930
+Gas remaining: 9999991
diff --git a/testsuite/expr/lit-nat_two.ll.result b/testsuite/expr/lit-nat_two.ll.result
index 077328f8..d25af65a 100644
--- a/testsuite/expr/lit-nat_two.ll.result
+++ b/testsuite/expr/lit-nat_two.ll.result
@@ -1,2 +1,2 @@
 Succ(Succ(Zero : Nat) : Nat) : Nat
-Gas remaining: 9999993
+Gas remaining: 9999999
diff --git a/testsuite/expr/lit-pair-list-int.ll.result b/testsuite/expr/lit-pair-list-int.ll.result
index 0bd188ac..47533f69 100644
--- a/testsuite/expr/lit-pair-list-int.ll.result
+++ b/testsuite/expr/lit-pair-list-int.ll.result
@@ -1,2 +1,2 @@
 Pair(Cons(1 : Int32)(Nil : List (Int32)) : List (Int32))(Cons(1 : Uint32)(Nil : List (Uint32)) : List (Uint32)) : Pair (List (Int32)) (List (Uint32))
-Gas remaining: 9999987
+Gas remaining: 9999998
diff --git a/testsuite/expr/map1.ll.result b/testsuite/expr/map1.ll.result
index 067ccf2a..3fe5b27e 100644
--- a/testsuite/expr/map1.ll.result
+++ b/testsuite/expr/map1.ll.result
@@ -1,2 +1,2 @@
 Emp : Map (Uint128) (List (Map (Int32) (Map (String) (Int32))))
-Gas remaining: 9999996
+Gas remaining: 9999999
diff --git a/testsuite/expr/map_to_list.ll.result b/testsuite/expr/map_to_list.ll.result
index 002a8c37..d690e02d 100644
--- a/testsuite/expr/map_to_list.ll.result
+++ b/testsuite/expr/map_to_list.ll.result
@@ -1,2 +1,2 @@
 Cons(Pair(1 : Int32)(42 : Int32) : Pair (Int32) (Int32))(Cons(Pair(2 : Int32)(239 : Int32) : Pair (Int32) (Int32))(Cons(Pair(3 : Int32)(112 : Int32) : Pair (Int32) (Int32))(Nil : List (Pair (Int32) (Int32))) : List (Pair (Int32) (Int32))) : List (Pair (Int32) (Int32))) : List (Pair (Int32) (Int32))
-Gas remaining: 9999973
+Gas remaining: 9999996
diff --git a/testsuite/expr/map_to_list2.ll.result b/testsuite/expr/map_to_list2.ll.result
index 0acead34..5b3bc04e 100644
--- a/testsuite/expr/map_to_list2.ll.result
+++ b/testsuite/expr/map_to_list2.ll.result
@@ -2,4 +2,4 @@ Cons(Pair(42 : Int32)(
 {
   3 : BNum => 112 : Int32  2 : BNum => 239 : Int32  1 : BNum => 42 : Int32
 } : Map (BNum) (Int32)) : Pair (Int32) (Map (BNum) (Int32)))(Nil : List (Pair (Int32) (Map (BNum) (Int32)))) : List (Pair (Int32) (Map (BNum) (Int32)))
-Gas remaining: 9999971
+Gas remaining: 9999996
diff --git a/testsuite/expr/match_assign.ll.result b/testsuite/expr/match_assign.ll.result
index 7eb95887..006f79e9 100644
--- a/testsuite/expr/match_assign.ll.result
+++ b/testsuite/expr/match_assign.ll.result
@@ -1,2 +1,2 @@
 2 : Int32
-Gas remaining: 9999993
+Gas remaining: 9999999
diff --git a/testsuite/expr/multi-type-inst.ll.result b/testsuite/expr/multi-type-inst.ll.result
index bdc35916..342d4e81 100644
--- a/testsuite/expr/multi-type-inst.ll.result
+++ b/testsuite/expr/multi-type-inst.ll.result
@@ -1,2 +1,2 @@
 2 : Uint32
-Gas remaining: 9999930
+Gas remaining: 9999991
diff --git a/testsuite/expr/name_clash.ll.result b/testsuite/expr/name_clash.ll.result
index 8425cc7b..bce6640f 100644
--- a/testsuite/expr/name_clash.ll.result
+++ b/testsuite/expr/name_clash.ll.result
@@ -1,2 +1,2 @@
 3 : Uint32
-Gas remaining: 9999990
+Gas remaining: 9999998
diff --git a/testsuite/expr/name_clash1.ll.result b/testsuite/expr/name_clash1.ll.result
index df1c42e5..3370fde8 100644
--- a/testsuite/expr/name_clash1.ll.result
+++ b/testsuite/expr/name_clash1.ll.result
@@ -1,2 +1,2 @@
 Some(1 : Uint64) : Option (Uint64)
-Gas remaining: 9999990
+Gas remaining: 9999998
diff --git a/testsuite/expr/name_clash2.ll.result b/testsuite/expr/name_clash2.ll.result
index 86d01c76..5276cdb4 100644
--- a/testsuite/expr/name_clash2.ll.result
+++ b/testsuite/expr/name_clash2.ll.result
@@ -1,2 +1,2 @@
 2 : Uint32
-Gas remaining: 9999989
+Gas remaining: 9999998
diff --git a/testsuite/expr/nonprenex.ll.result b/testsuite/expr/nonprenex.ll.result
index 96bb4a4b..b3abad3b 100644
--- a/testsuite/expr/nonprenex.ll.result
+++ b/testsuite/expr/nonprenex.ll.result
@@ -1,2 +1,2 @@
 4 : Uint32
-Gas remaining: 9999913
+Gas remaining: 9999989
diff --git a/testsuite/expr/pm1.ll.result b/testsuite/expr/pm1.ll.result
index 4e511239..ce75f0cc 100644
--- a/testsuite/expr/pm1.ll.result
+++ b/testsuite/expr/pm1.ll.result
@@ -1,2 +1,2 @@
 42 : Int32
-Gas remaining: 9999988
+Gas remaining: 9999998
diff --git a/testsuite/expr/pm2.ll.result b/testsuite/expr/pm2.ll.result
index cc63b4ec..ce75f0cc 100644
--- a/testsuite/expr/pm2.ll.result
+++ b/testsuite/expr/pm2.ll.result
@@ -1,2 +1,2 @@
 42 : Int32
-Gas remaining: 9999985
+Gas remaining: 9999998
diff --git a/testsuite/expr/simple-fun.ll.result b/testsuite/expr/simple-fun.ll.result
index 6b59375f..768be26c 100644
--- a/testsuite/expr/simple-fun.ll.result
+++ b/testsuite/expr/simple-fun.ll.result
@@ -1,2 +1,2 @@
 0 : Int32
-Gas remaining: 9999994
+Gas remaining: 9999999
diff --git a/testsuite/expr/simple_ho.ll.result b/testsuite/expr/simple_ho.ll.result
index b70742c3..c970511e 100644
--- a/testsuite/expr/simple_ho.ll.result
+++ b/testsuite/expr/simple_ho.ll.result
@@ -1,2 +1,2 @@
 101 : Int32
-Gas remaining: 9999985
+Gas remaining: 9999998
diff --git a/testsuite/expr/tname_clash.ll.result b/testsuite/expr/tname_clash.ll.result
index ee7353a9..575c0407 100644
--- a/testsuite/expr/tname_clash.ll.result
+++ b/testsuite/expr/tname_clash.ll.result
@@ -1,2 +1,2 @@
 Pair(1 : Int32)(2 : Int64) : Pair (Int32) (Int64)
-Gas remaining: 9999984
+Gas remaining: 9999998
diff --git a/testsuite/expr/typ-inst.ll.result b/testsuite/expr/typ-inst.ll.result
index af183437..c866b188 100644
--- a/testsuite/expr/typ-inst.ll.result
+++ b/testsuite/expr/typ-inst.ll.result
@@ -1,2 +1,2 @@
 1 : Uint32
-Gas remaining: 9999991
+Gas remaining: 9999998
diff --git a/testsuite/expr/typ1-inst.ll.result b/testsuite/expr/typ1-inst.ll.result
index 57f41a4b..92f57f59 100644
--- a/testsuite/expr/typ1-inst.ll.result
+++ b/testsuite/expr/typ1-inst.ll.result
@@ -1,2 +1,2 @@
 2 : Int32
-Gas remaining: 9999987
+Gas remaining: 9999998
diff --git a/testsuite/expr/typ2-inst.ll.result b/testsuite/expr/typ2-inst.ll.result
index 2393162d..a2f36858 100644
--- a/testsuite/expr/typ2-inst.ll.result
+++ b/testsuite/expr/typ2-inst.ll.result
@@ -1,2 +1,2 @@
 Pair(Pair(1 : Uint32)(2 : Uint64) : Pair (Uint32) (Uint64))(Pair(hello : String)(0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa : ByStr20) : Pair (String) (ByStr20)) : Pair (Pair (Uint32) (Uint64)) (Pair (String) (ByStr20))
-Gas remaining: 9999967
+Gas remaining: 9999995
diff --git a/testsuite/expr/typ3-inst.ll.result b/testsuite/expr/typ3-inst.ll.result
index 62057353..eb35f8ce 100644
--- a/testsuite/expr/typ3-inst.ll.result
+++ b/testsuite/expr/typ3-inst.ll.result
@@ -1,2 +1,2 @@
 Pair(Pair(1 : Uint32)(2 : Uint64) : Pair (Uint32) (Uint64))(Pair(0xaa : ByStr1)(0xaabb : ByStr2) : Pair (ByStr1) (ByStr2)) : Pair (Pair (Uint32) (Uint64)) (Pair (ByStr1) (ByStr2))
-Gas remaining: 9999967
+Gas remaining: 9999995