From 06edb24bffa82f9faf86ae8391994c9e21c213f4 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michael.peyton-jones@iohk.io>
Date: Tue, 21 Nov 2023 10:57:30 +0000
Subject: [PATCH] Marlowe validator using Data (#5509)

* Marlowe validator using Data

* WIP

* WIP

* WIP
---
 .../Marlowe/Core/V1/Semantics.hs              | 101 +--
 .../Marlowe/Core/V1/Semantics/Types.hs        | 585 +++++++-----------
 .../Marlowe/Scripts/Semantics.hs              |  33 +-
 plutus-benchmark/marlowe/test/Spec.hs         |   4 +-
 ...010001020101020201010000020102.eval.golden |   4 +-
 ...010101010100000001000001010000.eval.golden |   4 +-
 ...000104030002040304020400000102.eval.golden |   4 +-
 ...2992faf62e0b991d7310a2f91666b8.eval.golden |   4 +-
 ...000001010000010001000001000101.eval.golden |   4 +-
 ...000201010102000102010201010000.eval.golden |   4 +-
 ...050807010208060100070207080202.eval.golden |   4 +-
 ...040300030304040400010301040303.eval.golden |   4 +-
 ...0d0104050a0b0f0506070f0a070008.eval.golden |   4 +-
 ...d266dd7544678743890b0e8e1add63.eval.golden |   4 +-
 ...020207000101060706050502040301.eval.golden |   4 +-
 ...050e0a0d06030f1006030701020607.eval.golden |   4 +-
 ...6a95115748c026f9ec129384c262c4.eval.golden |   4 +-
 ...03031d8de696d90ec789e70d6bc1d8.eval.golden |   4 +-
 ...151c1f1d201c040f10091b020a0e1a.eval.golden |   4 +-
 ...4fe55e4096f5ce2e804735a7fbaf91.eval.golden |   4 +-
 ...39c9b87e5d7bea570087ec506935d5.eval.golden |   4 +-
 ...93093efe7bc76d6322aed6ddb582ad.eval.golden |   4 +-
 ...020c2c133a1a3c3f3c232a26153a04.eval.golden |   4 +-
 ...c9fc38298d567d15ee9f2eea69d89e.eval.golden |   4 +-
 ...1b0823471c67737f0b076870331260.eval.golden |   4 +-
 ...052ebcf66ec4ad77e51c11501381c7.eval.golden |   4 +-
 ...010d1d1c150e110a110e1006160a0d.eval.golden |   4 +-
 ...2a0f1140211c3e3f171e26312b0220.eval.golden |   4 +-
 ...782b19ba72dc4951941fb4c20d2263.eval.golden |   4 +-
 ...128b4ddcf426852b441f9a9d02c882.eval.golden |   4 +-
 ...f7636986014de2d2aaa460ddde0bc3.eval.golden |   4 +-
 ...60f22719a996871ad412cbe4de78b5.eval.golden |   4 +-
 ...ce450b9ce8a0f42a6e313b752e6f2c.eval.golden |   4 +-
 ...7463d209a453048a66c6eee624a695.eval.golden |   4 +-
 ...f166785e8b5183c8139db2aa7312d1.eval.golden |   4 +-
 ...c321d13fec0375606325eee9a34a6a.eval.golden |   4 +-
 ...ec88446e2d10625119a9d17fa3ec3d.eval.golden |   4 +-
 ...e2e396c299a0ce101ee6bf4b2020db.eval.golden |   4 +-
 ...b321a467dedb278328215167eca455.eval.golden |   4 +-
 ...11a81ca3841f47f37633e8aacbb5de.eval.golden |   4 +-
 ...137fabffc9de499a0de7cabb335479.eval.golden |   4 +-
 ...7878958cab3b9d9353978b08c36d8a.eval.golden |   4 +-
 ...256319a7b5ce4202cb54dfef8e37e7.eval.golden |   4 +-
 ...c232125976f29b1c3e21d9f537845c.eval.golden |   4 +-
 ...12b32bd8aecb48a228b50e02b055c8.eval.golden |   4 +-
 ...e7af0d28e1eb68faeecc45f4655f57.eval.golden |   4 +-
 ...65fff00a555ce8c55e36ddc003007a.eval.golden |   4 +-
 ...9be5ae1892d07ee71161bfb55a7cb7.eval.golden |   4 +-
 ...f53b335a85a2825502ab1e0687197e.eval.golden |   4 +-
 ...18f38f7539b7ba7167d577c0c8b8ce.eval.golden |   4 +-
 ...d0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden |   4 +-
 ...fdfc0b8409ba1e98f95fa5b6caf999.eval.golden |   4 +-
 ...1c878a0e0a7d6f7fe1d4a619e06112.eval.golden |   4 +-
 ...7539062b5728182e073e5760561a66.eval.golden |   4 +-
 ...109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden |   4 +-
 ...b6c6712c28c54f5a25792049294acc.eval.golden |   4 +-
 ...2c1dc6f4e7e412eeb5a3ced42fb642.eval.golden |   4 +-
 ...494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden |   4 +-
 ...a1575294ea39061b81a194ebb9eaae.eval.golden |   4 +-
 ...e03805fac9d5fb4ff2d3066e53fc7e.eval.golden |   4 +-
 ...4bafcb38fbfa1dbc31ac2053628a38.eval.golden |   4 +-
 ...19d4342612accf40913f9ae9419fac.eval.golden |   4 +-
 ...10fccd3dce2a23910bddd35c503b71.eval.golden |   4 +-
 ...08009738401d264bf9b3eb7c6f49c1.eval.golden |   4 +-
 ...10e1e953867cc4900cc25e5b9dec47.eval.golden |   4 +-
 ...97a420954018d8301ec4f9783be0d7.eval.golden |   4 +-
 ...f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden |   4 +-
 ...2540a1abd79718e681228f4057403a.eval.golden |   4 +-
 ...35e40a5defc6f3b9be68b70b4a3db6.eval.golden |   4 +-
 ...8322a9dcbe277c143ed3aede9d265f.eval.golden |   4 +-
 ...d2e61afdb3ac18128e1688c07071ba.eval.golden |   4 +-
 ...2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden |   4 +-
 ...b3a1ce6db4e501df1086773c6c0201.eval.golden |   4 +-
 ...a2517055197aff6b60a87ff718d66c.eval.golden |   4 +-
 ...4e8e75beb636692478ec39f74ee221.eval.golden |   4 +-
 ...b1605fe1490aa3f4f64a3fa8881b25.eval.golden |   4 +-
 ...5254897d6d1d0e21bc380147687bd5.eval.golden |   4 +-
 ...ef42aee239a2d9bc5314d127cce592.eval.golden |   4 +-
 ...2cd9997bdf2d8b2998c6bfeef3b122.eval.golden |   4 +-
 ...73eccf3df3a605bd6bc6a456cde871.eval.golden |   4 +-
 ...11e81fea90e41afebd669e51bb60c8.eval.golden |   4 +-
 ...fcde89510b29cccce81971e38e0835.eval.golden |   4 +-
 ...af884e504d2c410ad63ba46d8ca35c.eval.golden |   4 +-
 ...948bb1d1e29eacecd022eeb168b315.eval.golden |   4 +-
 ...253a51a0c0c7890f2214df9ac19274.eval.golden |   4 +-
 ...40ba143ce0579f1602fd780cabf153.eval.golden |   4 +-
 ...f9e276b5dabc66ff669d5650d0be1c.eval.golden |   4 +-
 ...b46eec7a26fa31b80ae69d44805efc.eval.golden |   4 +-
 ...7cd3eccec8cac9c70a4857b88a5eb8.eval.golden |   4 +-
 ...122f3330fe5b77b3222f570395d9f5.eval.golden |   4 +-
 ...f00ba5822197ade7dd540489ec5e95.eval.golden |   4 +-
 ...7e11195d161b5bb0a2b58f89b2c65a.eval.golden |   4 +-
 ...bd9e06036460eea3705c88ea867e33.eval.golden |   4 +-
 ...5d054c6f7f34355fcfeefebef479f3.eval.golden |   4 +-
 ...3913fdc347c704ddaa27042757d990.eval.golden |   4 +-
 ...bac7c8323256c31c90c520ee6a1080.eval.golden |   4 +-
 ...5678dd8cd5ddb981375a028b3a40a5.eval.golden |   4 +-
 ...6c413f979f2492cf3339319d8cc079.eval.golden |   4 +-
 ...ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden |   4 +-
 ...df7131740212762ae4483ec749fe1d.eval.golden |   4 +-
 ...a942123cf8660aac2b5bac21ec28f0.eval.golden |   4 +-
 ...d4e54333bdd408cbe7c47c55e73ae4.eval.golden |   4 +-
 ...4dda59aa929cffe0f1ff5355db8d79.eval.golden |   4 +-
 ...35aa02274161b23d57709c0f8b8de6.eval.golden |   4 +-
 .../test/semantics/9.2/semantics.size.golden  |   2 +-
 ...010001020101020201010000020102.eval.golden |   4 +-
 ...010101010100000001000001010000.eval.golden |   4 +-
 ...000104030002040304020400000102.eval.golden |   4 +-
 ...2992faf62e0b991d7310a2f91666b8.eval.golden |   4 +-
 ...000001010000010001000001000101.eval.golden |   4 +-
 ...000201010102000102010201010000.eval.golden |   4 +-
 ...050807010208060100070207080202.eval.golden |   4 +-
 ...040300030304040400010301040303.eval.golden |   4 +-
 ...0d0104050a0b0f0506070f0a070008.eval.golden |   4 +-
 ...d266dd7544678743890b0e8e1add63.eval.golden |   4 +-
 ...020207000101060706050502040301.eval.golden |   4 +-
 ...050e0a0d06030f1006030701020607.eval.golden |   4 +-
 ...6a95115748c026f9ec129384c262c4.eval.golden |   4 +-
 ...03031d8de696d90ec789e70d6bc1d8.eval.golden |   4 +-
 ...151c1f1d201c040f10091b020a0e1a.eval.golden |   4 +-
 ...4fe55e4096f5ce2e804735a7fbaf91.eval.golden |   4 +-
 ...39c9b87e5d7bea570087ec506935d5.eval.golden |   4 +-
 ...93093efe7bc76d6322aed6ddb582ad.eval.golden |   4 +-
 ...020c2c133a1a3c3f3c232a26153a04.eval.golden |   4 +-
 ...c9fc38298d567d15ee9f2eea69d89e.eval.golden |   4 +-
 ...1b0823471c67737f0b076870331260.eval.golden |   4 +-
 ...052ebcf66ec4ad77e51c11501381c7.eval.golden |   4 +-
 ...010d1d1c150e110a110e1006160a0d.eval.golden |   4 +-
 ...2a0f1140211c3e3f171e26312b0220.eval.golden |   4 +-
 ...782b19ba72dc4951941fb4c20d2263.eval.golden |   4 +-
 ...128b4ddcf426852b441f9a9d02c882.eval.golden |   4 +-
 ...f7636986014de2d2aaa460ddde0bc3.eval.golden |   4 +-
 ...60f22719a996871ad412cbe4de78b5.eval.golden |   4 +-
 ...ce450b9ce8a0f42a6e313b752e6f2c.eval.golden |   4 +-
 ...7463d209a453048a66c6eee624a695.eval.golden |   4 +-
 ...f166785e8b5183c8139db2aa7312d1.eval.golden |   4 +-
 ...c321d13fec0375606325eee9a34a6a.eval.golden |   4 +-
 ...ec88446e2d10625119a9d17fa3ec3d.eval.golden |   4 +-
 ...e2e396c299a0ce101ee6bf4b2020db.eval.golden |   4 +-
 ...b321a467dedb278328215167eca455.eval.golden |   4 +-
 ...11a81ca3841f47f37633e8aacbb5de.eval.golden |   4 +-
 ...137fabffc9de499a0de7cabb335479.eval.golden |   4 +-
 ...7878958cab3b9d9353978b08c36d8a.eval.golden |   4 +-
 ...256319a7b5ce4202cb54dfef8e37e7.eval.golden |   4 +-
 ...c232125976f29b1c3e21d9f537845c.eval.golden |   4 +-
 ...12b32bd8aecb48a228b50e02b055c8.eval.golden |   4 +-
 ...e7af0d28e1eb68faeecc45f4655f57.eval.golden |   4 +-
 ...65fff00a555ce8c55e36ddc003007a.eval.golden |   4 +-
 ...9be5ae1892d07ee71161bfb55a7cb7.eval.golden |   4 +-
 ...f53b335a85a2825502ab1e0687197e.eval.golden |   4 +-
 ...18f38f7539b7ba7167d577c0c8b8ce.eval.golden |   4 +-
 ...d0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden |   4 +-
 ...fdfc0b8409ba1e98f95fa5b6caf999.eval.golden |   4 +-
 ...1c878a0e0a7d6f7fe1d4a619e06112.eval.golden |   4 +-
 ...7539062b5728182e073e5760561a66.eval.golden |   4 +-
 ...109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden |   4 +-
 ...b6c6712c28c54f5a25792049294acc.eval.golden |   4 +-
 ...2c1dc6f4e7e412eeb5a3ced42fb642.eval.golden |   4 +-
 ...494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden |   4 +-
 ...a1575294ea39061b81a194ebb9eaae.eval.golden |   4 +-
 ...e03805fac9d5fb4ff2d3066e53fc7e.eval.golden |   4 +-
 ...4bafcb38fbfa1dbc31ac2053628a38.eval.golden |   4 +-
 ...19d4342612accf40913f9ae9419fac.eval.golden |   4 +-
 ...10fccd3dce2a23910bddd35c503b71.eval.golden |   4 +-
 ...08009738401d264bf9b3eb7c6f49c1.eval.golden |   4 +-
 ...10e1e953867cc4900cc25e5b9dec47.eval.golden |   4 +-
 ...97a420954018d8301ec4f9783be0d7.eval.golden |   4 +-
 ...f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden |   4 +-
 ...2540a1abd79718e681228f4057403a.eval.golden |   4 +-
 ...35e40a5defc6f3b9be68b70b4a3db6.eval.golden |   4 +-
 ...8322a9dcbe277c143ed3aede9d265f.eval.golden |   4 +-
 ...d2e61afdb3ac18128e1688c07071ba.eval.golden |   4 +-
 ...2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden |   4 +-
 ...b3a1ce6db4e501df1086773c6c0201.eval.golden |   4 +-
 ...a2517055197aff6b60a87ff718d66c.eval.golden |   4 +-
 ...4e8e75beb636692478ec39f74ee221.eval.golden |   4 +-
 ...b1605fe1490aa3f4f64a3fa8881b25.eval.golden |   4 +-
 ...5254897d6d1d0e21bc380147687bd5.eval.golden |   4 +-
 ...ef42aee239a2d9bc5314d127cce592.eval.golden |   4 +-
 ...2cd9997bdf2d8b2998c6bfeef3b122.eval.golden |   4 +-
 ...73eccf3df3a605bd6bc6a456cde871.eval.golden |   4 +-
 ...11e81fea90e41afebd669e51bb60c8.eval.golden |   4 +-
 ...fcde89510b29cccce81971e38e0835.eval.golden |   4 +-
 ...af884e504d2c410ad63ba46d8ca35c.eval.golden |   4 +-
 ...948bb1d1e29eacecd022eeb168b315.eval.golden |   4 +-
 ...253a51a0c0c7890f2214df9ac19274.eval.golden |   4 +-
 ...40ba143ce0579f1602fd780cabf153.eval.golden |   4 +-
 ...f9e276b5dabc66ff669d5650d0be1c.eval.golden |   4 +-
 ...b46eec7a26fa31b80ae69d44805efc.eval.golden |   4 +-
 ...7cd3eccec8cac9c70a4857b88a5eb8.eval.golden |   4 +-
 ...122f3330fe5b77b3222f570395d9f5.eval.golden |   4 +-
 ...f00ba5822197ade7dd540489ec5e95.eval.golden |   4 +-
 ...7e11195d161b5bb0a2b58f89b2c65a.eval.golden |   4 +-
 ...bd9e06036460eea3705c88ea867e33.eval.golden |   4 +-
 ...5d054c6f7f34355fcfeefebef479f3.eval.golden |   4 +-
 ...3913fdc347c704ddaa27042757d990.eval.golden |   4 +-
 ...bac7c8323256c31c90c520ee6a1080.eval.golden |   4 +-
 ...5678dd8cd5ddb981375a028b3a40a5.eval.golden |   4 +-
 ...6c413f979f2492cf3339319d8cc079.eval.golden |   4 +-
 ...ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden |   4 +-
 ...df7131740212762ae4483ec749fe1d.eval.golden |   4 +-
 ...a942123cf8660aac2b5bac21ec28f0.eval.golden |   4 +-
 ...d4e54333bdd408cbe7c47c55e73ae4.eval.golden |   4 +-
 ...4dda59aa929cffe0f1ff5355db8d79.eval.golden |   4 +-
 ...35aa02274161b23d57709c0f8b8de6.eval.golden |   4 +-
 .../test/semantics/9.6/semantics.size.golden  |   2 +-
 plutus-benchmark/plutus-benchmark.cabal       |   4 +-
 plutus-core/testlib/PlutusCore/Test.hs        |  34 +
 .../Optimization/9.2/matchAsData.pir.golden   |  53 --
 .../Optimization/9.6/matchAsData.pir.golden   |   6 +-
 plutus-tx-plugin/test/Optimization/Spec.hs    |   6 +-
 211 files changed, 736 insertions(+), 894 deletions(-)
 delete mode 100644 plutus-tx-plugin/test/Optimization/9.2/matchAsData.pir.golden

diff --git a/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics.hs b/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics.hs
index a918ef738b7..221603c2b35 100644
--- a/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics.hs
+++ b/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics.hs
@@ -1,4 +1,3 @@
-
 -- editorconfig-checker-disable-file
 
 
@@ -35,21 +34,27 @@
 {-# LANGUAGE DeriveDataTypeable    #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE PatternSynonyms       #-}
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeApplications      #-}
 {-# LANGUAGE ViewPatterns          #-}
 
-{-# OPTIONS_GHC -fno-specialise #-}  -- A big hammer, but it helps.
+{-# OPTIONS_GHC -O0 #-}
+-- the biggest hammer :(
+-- truly mysterious issues here
+{-# OPTIONS_GHC -fmax-simplifier-iterations=0 #-}
+-- O0 turns these off
 {-# OPTIONS_GHC -fno-ignore-interface-pragmas #-}
-{-# OPTIONS_GHC -fno-warn-orphans       #-}
 {-# OPTIONS_GHC -fno-omit-interface-pragmas #-}
 
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
 {-# OPTIONS_GHC -Wno-simplifiable-class-constraints #-}
 
 module PlutusBenchmark.Marlowe.Core.V1.Semantics
   ( -- * Semantics
-    MarloweData(..)
+    MarloweData(MarloweData, marloweParams, marloweState, marloweContract)
   , MarloweParams(..)
   , Payment(..)
   , TransactionInput(..)
@@ -94,19 +99,13 @@ module PlutusBenchmark.Marlowe.Core.V1.Semantics
   , totalBalance
   ) where
 
-
 import Data.Data (Data)
 import GHC.Generics (Generic)
-import PlutusBenchmark.Marlowe.Core.V1.Semantics.Types (AccountId, Accounts, Action (..), Case (..),
-                                                        Contract (..), Environment (..), Input (..),
-                                                        InputContent (..), IntervalError (..),
-                                                        IntervalResult (..), Money,
-                                                        Observation (..), Party, Payee (..),
-                                                        State (..), TimeInterval, Token (..),
-                                                        Value (..), ValueId, emptyState, getAction,
-                                                        getInputContent, inBounds)
+import PlutusBenchmark.Marlowe.Core.V1.Semantics.Types
 import PlutusLedgerApi.V2 (CurrencySymbol, POSIXTime (..))
-import PlutusTx (makeIsDataIndexed)
+import PlutusTx (FromData, ToData, UnsafeFromData)
+import PlutusTx.AsData (asData)
+import PlutusTx.IsData (makeIsDataIndexed)
 import PlutusTx.Lift (makeLift)
 import PlutusTx.Prelude (AdditiveGroup ((-)), AdditiveSemigroup ((+)), Bool (..), Eq (..), Integer,
                          Maybe (..), MultiplicativeSemigroup ((*)),
@@ -119,31 +118,6 @@ import PlutusTx.Builtins qualified as Builtins
 import Prelude qualified as Haskell
 
 
--- Functions that used in Plutus Core must be inlineable,
--- so their code is available for PlutusTx compiler.
-{-# INLINABLE fixInterval #-}
-{-# INLINABLE evalValue #-}
-{-# INLINABLE evalObservation #-}
-{-# INLINABLE refundOne #-}
-{-# INLINABLE moneyInAccount #-}
-{-# INLINABLE updateMoneyInAccount #-}
-{-# INLINABLE addMoneyToAccount #-}
-{-# INLINABLE giveMoney #-}
-{-# INLINABLE reduceContractStep #-}
-{-# INLINABLE reduceContractUntilQuiescent #-}
-{-# INLINABLE applyAction #-}
-{-# INLINABLE getContinuation #-}
-{-# INLINABLE applyCases #-}
-{-# INLINABLE applyInput #-}
-{-# INLINABLE convertReduceWarnings #-}
-{-# INLINABLE applyAllInputs #-}
-{-# INLINABLE isClose #-}
-{-# INLINABLE notClose #-}
-{-# INLINABLE computeTransaction #-}
-{-# INLINABLE contractLifespanUpperBound #-}
-{-# INLINABLE totalBalance #-}
-
-
 {-| Payment occurs during 'Pay' contract evaluation, and
     when positive balances are payed out on contract closure.
 -}
@@ -245,18 +219,25 @@ data TransactionOutput =
   deriving stock (Haskell.Show, Data)
 
 
--- | This data type is a content of a contract's /Datum/
-data MarloweData = MarloweData {
-        marloweParams   :: MarloweParams,
-        marloweState    :: State,
-        marloweContract :: Contract
-    } deriving stock (Haskell.Show, Haskell.Eq, Generic, Data)
-
-
 -- | Parameters constant during the course of a contract.
 newtype MarloweParams = MarloweParams { rolesCurrency :: CurrencySymbol }
   deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord, Data)
 
+makeIsDataIndexed ''MarloweParams [('MarloweParams, 0)]
+
+asData
+  [d|
+  -- | This data type is a content of a contract's /Datum/
+  data MarloweData = MarloweData {
+          marloweParams   :: MarloweParams,
+          marloweState    :: State,
+          marloweContract :: Contract
+      }
+      deriving stock (Generic, Data)
+      deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Show, Haskell.Eq)
+  |]
+
+{-# INLINABLE MarloweData #-}
 
 -- | Checks 'interval' and trims it if necessary.
 fixInterval :: TimeInterval -> State -> IntervalResult
@@ -739,6 +720,30 @@ instance Eq ReduceEffect where
     ReduceWithPayment p1 == ReduceWithPayment p2 = p1 == p2
     ReduceWithPayment _ == _                     = False
 
+-- Functions that used in Plutus Core must be inlineable,
+-- so their code is available for PlutusTx compiler.
+{-# INLINABLE fixInterval #-}
+{-# INLINABLE evalValue #-}
+{-# INLINABLE evalObservation #-}
+{-# INLINABLE refundOne #-}
+{-# INLINABLE moneyInAccount #-}
+{-# INLINABLE updateMoneyInAccount #-}
+{-# INLINABLE addMoneyToAccount #-}
+{-# INLINABLE giveMoney #-}
+{-# INLINABLE reduceContractStep #-}
+{-# INLINABLE reduceContractUntilQuiescent #-}
+{-# INLINABLE applyAction #-}
+{-# INLINABLE getContinuation #-}
+{-# INLINABLE applyCases #-}
+{-# INLINABLE applyInput #-}
+{-# INLINABLE convertReduceWarnings #-}
+{-# INLINABLE applyAllInputs #-}
+{-# INLINABLE isClose #-}
+{-# INLINABLE notClose #-}
+{-# INLINABLE computeTransaction #-}
+{-# INLINABLE contractLifespanUpperBound #-}
+{-# INLINABLE totalBalance #-}
+
 
 -- Lifting data types to Plutus Core
 makeLift ''IntervalError
@@ -754,7 +759,5 @@ makeLift ''TransactionWarning
 makeLift ''ApplyAllResult
 makeLift ''TransactionError
 makeLift ''TransactionOutput
-makeIsDataIndexed ''MarloweParams [('MarloweParams,0)]
-makeIsDataIndexed ''MarloweData [('MarloweData,0)]
 makeLift ''MarloweParams
 makeLift ''MarloweData
diff --git a/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics/Types.hs b/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics/Types.hs
index 32f22f3212b..b442ad2d2cc 100644
--- a/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics/Types.hs
+++ b/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics/Types.hs
@@ -1,4 +1,4 @@
-
+-- editorconfig-checker-disable-file
 
 -----------------------------------------------------------------------------
 --
@@ -15,53 +15,26 @@
 
 {-# LANGUAGE DeriveAnyClass        #-}
 {-# LANGUAGE DeriveDataTypeable    #-}
+{-# LANGUAGE DerivingStrategies    #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE PatternSynonyms       #-}
+{-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeApplications      #-}
 {-# LANGUAGE ViewPatterns          #-}
 
-{-# OPTIONS_GHC -fno-specialise #-}  -- A big hammer, but it helps.
+-- Probably could use a more specific flag but not sure what, need
+-- to stop GHC inserting a clever recursive go function with no unfolding
+{-# OPTIONS_GHC -O0 #-}
+-- O0 turns these off
 {-# OPTIONS_GHC -fno-ignore-interface-pragmas #-}
-{-# OPTIONS_GHC -fno-warn-orphans       #-}
 {-# OPTIONS_GHC -fno-omit-interface-pragmas #-}
 
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 {-# OPTIONS_GHC -Wno-simplifiable-class-constraints #-}
 
-module PlutusBenchmark.Marlowe.Core.V1.Semantics.Types
-  ( -- * Type Aliases
-    AccountId
-  , Accounts
-  , ChoiceName
-  , ChosenNum
-  , Money
-  , TimeInterval
-  , Timeout
-    -- * Contract Types
-  , Action(..)
-  , Bound(..)
-  , Case(..)
-  , ChoiceId(..)
-  , Contract(..)
-  , Environment(..)
-  , Input(..)
-  , InputContent(..)
-  , IntervalResult(..)
-  , Observation(..)
-  , Party(..)
-  , Payee(..)
-  , State(..)
-  , Token(..)
-  , Value(..)
-  , ValueId(..)
-    -- * Error Types
-  , IntervalError(..)
-    -- * Utility Functions
-  , emptyState
-  , getAction
-  , getInputContent
-  , inBounds
-  ) where
-
+module PlutusBenchmark.Marlowe.Core.V1.Semantics.Types where
 
 import Control.Newtype.Generics (Newtype)
 import Data.Data (Data)
@@ -69,11 +42,12 @@ import Data.String (IsString (..))
 import GHC.Generics (Generic)
 import PlutusBenchmark.Marlowe.Core.V1.Semantics.Types.Address (Network)
 import PlutusLedgerApi.V2 (CurrencySymbol, POSIXTime (..), TokenName)
-import PlutusTx (makeIsDataIndexed)
+import PlutusTx.AsData (asData)
 import PlutusTx.AssocMap (Map)
+import PlutusTx.IsData (FromData, ToData, UnsafeFromData, makeIsDataIndexed, unstableMakeIsData)
 import PlutusTx.Lift (makeLift)
-import PlutusTx.Prelude (Bool (..), BuiltinByteString, Eq (..), Integer, Ord ((<=), (>=)), all, and,
-                         any, length, zip, zipWith, (&&))
+import PlutusTx.Prelude (Bool (..), BuiltinByteString, Eq (..), Integer, Ord ((<=), (>=)), any,
+                         (&&))
 
 import PlutusLedgerApi.V1.Value qualified as Val
 import PlutusLedgerApi.V2 qualified as Ledger (Address (..), Credential (..), PubKeyHash (..),
@@ -81,15 +55,6 @@ import PlutusLedgerApi.V2 qualified as Ledger (Address (..), Credential (..), Pu
 import PlutusTx.AssocMap qualified as Map
 import Prelude qualified as Haskell
 
-
--- Functions that used in Plutus Core must be inlinable,
--- so their code is available for PlutusTx compiler.
-{-# INLINABLE getAction #-}
-{-# INLINABLE getInputContent #-}
-{-# INLINABLE inBounds #-}
-{-# INLINABLE emptyState #-}
-
-
 deriving stock instance Data POSIXTime
 deriving stock instance Data Ledger.Address
 deriving stock instance Data Ledger.Credential
@@ -97,60 +62,64 @@ deriving stock instance Data Ledger.PubKeyHash
 deriving stock instance Data Ledger.ScriptHash
 deriving stock instance Data Ledger.StakingCredential
 
-
--- | A Party to a contract.
-data Party =
-    Address Network Ledger.Address  -- ^ Party identified by a network address.
-  | Role TokenName                  -- ^ Party identified by a role token name.
-  deriving stock (Generic,Haskell.Eq,Haskell.Ord,Haskell.Show,Data)
-
+asData
+  [d|
+  -- | A Party to a contract.
+  data Party =
+      Address Network Ledger.Address  -- ^ Party identified by a network address.
+    | Role TokenName                  -- ^ Party identified by a role token name.
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
 
 -- | A party's internal account in a contract.
 type AccountId = Party
 
-
 -- | A timeout in a contract.
 type Timeout = POSIXTime
 
-
 -- | A multi-asset value.
 type Money = Val.Value
 
-
 -- | The name of a choice in a contract.
 type ChoiceName = BuiltinByteString
 
-
 -- | A numeric choice in a contract.
 type ChosenNum = Integer
 
-
 -- | The time validity range for a Marlowe transaction, inclusive of both endpoints.
 type TimeInterval = (POSIXTime, POSIXTime)
 
+asData
+  [d|
+  -- | Choices – of integers – are identified by ChoiceId which combines a name for
+  -- the choice with the Party who had made the choice.
+  data ChoiceId = ChoiceId BuiltinByteString Party
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+asData
+  [d|
+  -- | Token - represents a currency or token, it groups
+  --   a pair of a currency symbol and token name.
+  data Token = Token CurrencySymbol TokenName
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
 
 -- | The accounts in a contract.
 type Accounts = Map (AccountId, Token) Integer
 
-
--- | Choices – of integers – are identified by ChoiceId which combines a name for
--- the choice with the Party who had made the choice.
-data ChoiceId = ChoiceId BuiltinByteString Party
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | Token - represents a currency or token, it groups
---   a pair of a currency symbol and token name.
-data Token = Token CurrencySymbol TokenName
-  deriving stock (Generic,Haskell.Eq,Haskell.Ord,Haskell.Show,Data)
-
-
 -- | Values, as defined using Let ar e identified by name,
 --   and can be used by 'UseValue' construct.
 newtype ValueId = ValueId BuiltinByteString
   deriving (IsString, Haskell.Show) via TokenName
   deriving stock (Haskell.Eq,Haskell.Ord,Generic,Data)
   deriving anyclass (Newtype)
+  deriving newtype (Eq)
+
+makeIsDataIndexed ''ValueId [('ValueId, 0)]
 
 -- | Values include some quantities that change with time,
 --   including “the time interval”, “the current balance of an account”,
@@ -158,192 +127,19 @@ newtype ValueId = ValueId BuiltinByteString
 --
 --   Values can also be scaled, and combined using addition, subtraction, and negation.
 data Value a = AvailableMoney AccountId Token
-           | Constant Integer
-           | NegValue (Value a)
-           | AddValue (Value a) (Value a)
-           | SubValue (Value a) (Value a)
-           | MulValue (Value a) (Value a)
-           | DivValue (Value a) (Value a)
-           | ChoiceValue ChoiceId
-           | TimeIntervalStart
-           | TimeIntervalEnd
-           | UseValue ValueId
-           | Cond a (Value a) (Value a)
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | Observations are Boolean values derived by comparing values,
---   and can be combined using the standard Boolean operators.
---
---   It is also possible to observe whether any choice has been made
---   (for a particular identified choice).
-data Observation = AndObs Observation Observation
-                 | OrObs Observation Observation
-                 | NotObs Observation
-                 | ChoseSomething ChoiceId
-                 | ValueGE (Value Observation) (Value Observation)
-                 | ValueGT (Value Observation) (Value Observation)
-                 | ValueLT (Value Observation) (Value Observation)
-                 | ValueLE (Value Observation) (Value Observation)
-                 | ValueEQ (Value Observation) (Value Observation)
-                 | TrueObs
-                 | FalseObs
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | The (inclusive) bound on a choice number.
-data Bound = Bound Integer Integer
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | Actions happen at particular points during execution.
---   Three kinds of action are possible:
---
---   * A @Deposit n p v@ makes a deposit of value @v@ into account @n@ belonging to party @p@.
---
---   * A choice is made for a particular id with a list of bounds on the values that are acceptable.
---     For example, @[(0, 0), (3, 5]@ offers the choice of one of 0, 3, 4 and 5.
---
---   * The contract is notified that a particular observation be made.
---     Typically this would be done by one of the parties,
---     or one of their wallets acting automatically.
---
-data Action = Deposit AccountId Party Token (Value Observation)
-            | Choice ChoiceId [Bound]
-            | Notify Observation
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | A payment can be made to one of the parties to the contract,
---   or to one of the accounts of the contract,
---   and this is reflected in the definition.
-data Payee = Account AccountId
-           | Party Party
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | A case is a branch of a when clause, guarded by an action.
---   The continuation of the contract may be merkleized or not.
---
---   Plutus doesn't support mutually recursive data types yet.
---   datatype Case is mutually recursive with @Contract@
-data Case a = Case Action a
-            | MerkleizedCase Action BuiltinByteString
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | Extract the @Action@ from a @Case@.
-getAction :: Case a -> Action
-getAction (Case action _)           = action
-getAction (MerkleizedCase action _) = action
-
-
--- | Marlowe has six ways of building contracts.
---   Five of these – 'Pay', 'Let', 'If', 'When' and 'Assert' –
---   build a complex contract from simpler contracts, and the sixth, 'Close',
---   is a simple contract.
---   At each step of execution, as well as returning a new state and continuation contract,
---   it is possible that effects – payments – and warnings can be generated too.
-data Contract = Close
-              | Pay AccountId Payee Token (Value Observation) Contract
-              | If Observation Contract Contract
-              | When [Case Contract] Timeout Contract
-              | Let ValueId (Value Observation) Contract
-              | Assert Observation Contract
-  deriving stock (Haskell.Show,Generic,Haskell.Eq,Haskell.Ord,Data)
-
-
--- | Marlowe contract internal state. Stored in a /Datum/ of a transaction output.
-data State = State { accounts    :: Accounts
-                   , choices     :: Map ChoiceId ChosenNum
-                   , boundValues :: Map ValueId Integer
-                   , minTime     :: POSIXTime }
-  deriving stock (Haskell.Show,Haskell.Eq,Generic,Data)
-
-
--- | Execution environment. Contains a time interval of a transaction.
-newtype Environment = Environment { timeInterval :: TimeInterval }
-  deriving stock (Haskell.Show,Haskell.Eq,Haskell.Ord,Data)
-
--- | Input for a Marlowe contract. Correspond to expected 'Action's.
-data InputContent = IDeposit AccountId Party Token Integer
-                  | IChoice ChoiceId ChosenNum
-                  | INotify
-  deriving stock (Haskell.Show,Haskell.Eq,Generic,Data)
-
-
--- | Input to a contract, which may include the merkleized continuation
---   of the contract and its hash.
-data Input = NormalInput InputContent
-           | MerkleizedInput InputContent BuiltinByteString Contract
-  deriving stock (Haskell.Show,Haskell.Eq,Generic,Data)
-
-
--- | Extract the content of input.
-getInputContent :: Input -> InputContent
-getInputContent (NormalInput inputContent)         = inputContent
-getInputContent (MerkleizedInput inputContent _ _) = inputContent
-
-
--- | Time interval errors.
---   'InvalidInterval' means @slotStart > slotEnd@, and
---   'IntervalInPastError' means time interval is in the past, relative to the contract.
---
---   These errors should never occur, but we are always prepared.
-data IntervalError = InvalidInterval TimeInterval
-                   | IntervalInPastError POSIXTime TimeInterval
-  deriving stock (Haskell.Show, Haskell.Eq,Generic,Data)
-
-
--- | Result of 'fixInterval'
-data IntervalResult = IntervalTrimmed Environment State
-                    | IntervalError IntervalError
-  deriving stock (Haskell.Show,Generic,Data)
-
-
--- | Empty State for a given minimal 'POSIXTime'
-emptyState :: POSIXTime -> State
-emptyState sn = State
-    { accounts = Map.empty
-    , choices  = Map.empty
-    , boundValues = Map.empty
-    , minTime = sn }
-
-
--- | Check if a 'num' is withint a list of inclusive bounds.
-inBounds :: ChosenNum -> [Bound] -> Bool
-inBounds num = any (\(Bound l u) -> num >= l && num <= u)
-
-
-instance Eq Party where
-    {-# INLINABLE (==) #-}
-    Address n1 a1 == Address n2 a2 = n1 == n2 && a1 == a2
-    Address _ _   == _             = False
-    Role r1       == Role r2       = r1 == r2
-    Role _        == _             = False
-
-
-instance Eq ChoiceId where
-    {-# INLINABLE (==) #-}
-    ChoiceId n1 p1 == ChoiceId n2 p2 = n1 == n2 && p1 == p2
-
-
-instance Eq Token where
-    {-# INLINABLE (==) #-}
-    Token n1 p1 == Token n2 p2 = n1 == n2 && p1 == p2
-
-
-instance Eq ValueId where
-    {-# INLINABLE (==) #-}
-    ValueId n1 == ValueId n2 = n1 == n2
-
-
-instance Eq Payee where
-    {-# INLINABLE (==) #-}
-    Account acc1 == Account acc2 = acc1 == acc2
-    Account{}    == _            = False
-    Party p1 == Party p2         = p1 == p2
-    Party{}  == _                = False
+          | Constant Integer
+          | NegValue (Value a)
+          | AddValue (Value a) (Value a)
+          | SubValue (Value a) (Value a)
+          | MulValue (Value a) (Value a)
+          | DivValue (Value a) (Value a)
+          | ChoiceValue ChoiceId
+          | TimeIntervalStart
+          | TimeIntervalEnd
+          | UseValue ValueId
+          | Cond a (Value a) (Value a)
+  deriving stock (Generic, Data)
+  deriving stock (Haskell.Eq, Haskell.Ord, Haskell.Show)
 
 instance Eq a => Eq (Value a) where
     {-# INLINABLE (==) #-}
@@ -372,6 +168,26 @@ instance Eq a => Eq (Value a) where
     Cond obs1 thn1 els1 == Cond obs2 thn2 els2 = obs1 == obs2 && thn1 == thn2 && els1 == els2
     Cond{}              == _                   = False
 
+unstableMakeIsData ''Value
+
+-- | Observations are Boolean values derived by comparing values,
+--   and can be combined using the standard Boolean operators.
+--
+--   It is also possible to observe whether any choice has been made
+--   (for a particular identified choice).
+data Observation = AndObs Observation Observation
+                | OrObs Observation Observation
+                | NotObs Observation
+                | ChoseSomething ChoiceId
+                | ValueGE (Value Observation) (Value Observation)
+                | ValueGT (Value Observation) (Value Observation)
+                | ValueLT (Value Observation) (Value Observation)
+                | ValueLE (Value Observation) (Value Observation)
+                | ValueEQ (Value Observation) (Value Observation)
+                | TrueObs
+                | FalseObs
+  deriving stock (Generic, Data)
+  deriving stock (Haskell.Eq, Haskell.Ord, Haskell.Show)
 
 instance Eq Observation where
     {-# INLINABLE (==) #-}
@@ -398,119 +214,174 @@ instance Eq Observation where
     FalseObs == FalseObs                       = True
     FalseObs == _                              = False
 
+unstableMakeIsData ''Observation
+
+asData
+  [d|
+  -- | The (inclusive) bound on a choice number.
+  data Bound = Bound Integer Integer
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+asData
+  [d|
+  -- | Actions happen at particular points during execution.
+  --   Three kinds of action are possible:
+  --
+  --   * A @Deposit n p v@ makes a deposit of value @v@ into account @n@ belonging to party @p@.
+  --
+  --   * A choice is made for a particular id with a list of bounds on the values that are acceptable.
+  --     For example, @[(0, 0), (3, 5]@ offers the choice of one of 0, 3, 4 and 5.
+  --
+  --   * The contract is notified that a particular observation be made.
+  --     Typically this would be done by one of the parties,
+  --     or one of their wallets acting automatically.
+  --
+  data Action = Deposit AccountId Party Token (Value Observation)
+              | Choice ChoiceId [Bound]
+              | Notify Observation
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+asData
+  [d|
+  -- | A payment can be made to one of the parties to the contract,
+  --   or to one of the accounts of the contract,
+  --   and this is reflected in the definition.
+  data Payee = Account AccountId
+            | Party Party
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+
+asData
+  [d|
+  -- | A case is a branch of a when clause, guarded by an action.
+  --   The continuation of the contract may be merkleized or not.
+  --
+  --   Plutus doesn't support mutually recursive data types yet.
+  --   datatype Case is mutually recursive with @Contract@
+  data Case a = Case Action a
+              | MerkleizedCase Action BuiltinByteString
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
 
-instance Eq Action where
-    {-# INLINABLE (==) #-}
-    Deposit acc1 party1 tok1 val1 == Deposit acc2 party2 tok2 val2 =
-        acc1 == acc2 && party1 == party2 && tok1 == tok2 && val1 == val2
-    Deposit{}       == _ = False
-    Choice cid1 bounds1 == Choice cid2 bounds2 =
-        cid1 == cid2 && length bounds1 == length bounds2 && let
-            bounds = zip bounds1 bounds2
-            checkBound (Bound low1 high1, Bound low2 high2) = low1 == low2 && high1 == high2
-            in all checkBound bounds
-    Choice{}   == _ = False
-    Notify obs1 == Notify obs2 = obs1 == obs2
-    Notify{} == _ = False
-
-
-instance Eq a => Eq (Case a) where
-    {-# INLINABLE (==) #-}
-    Case acl cl == Case acr cr                       = acl == acr && cl == cr
-    Case{}      == _                                 = False
-    MerkleizedCase acl bsl == MerkleizedCase acr bsr = acl == acr && bsl == bsr
-    MerkleizedCase{}       == _                      = False
+-- | Extract the @Action@ from a @Case@.
+getAction :: (ToData a, UnsafeFromData a) => Case a -> Action
+getAction (Case action _)           = action
+getAction (MerkleizedCase action _) = action
+{-# INLINABLE getAction #-}
 
 
-instance Eq Contract where
-    {-# INLINABLE (==) #-}
-    Close == Close = True
-    Close == _ = False
-    Pay acc1 payee1 tok1 value1 cont1 == Pay acc2 payee2 tok2 value2 cont2 =
-        acc1 == acc2 && payee1 == payee2 && tok1 == tok2 && value1 == value2 && cont1 == cont2
-    Pay{} == _ = False
-    If obs1 cont1 cont2 == If obs2 cont3 cont4 =
-        obs1 == obs2 && cont1 == cont3 && cont2 == cont4
-    If{} == _ = False
-    When cases1 timeout1 cont1 == When cases2 timeout2 cont2 =
-        timeout1 == timeout2 && cont1 == cont2
-        && length cases1 == length cases2
-        && and (zipWith (==) cases1 cases2)
-    When{} == _ = False
-    Let valId1 val1 cont1 == Let valId2 val2 cont2 =
-        valId1 == valId2 && val1 == val2 && cont1 == cont2
-    Let{} == _ = False
-    Assert obs1 cont1 == Assert obs2 cont2 = obs1 == obs2 && cont1 == cont2
-    Assert{}  == _ = False
-
-
-instance Eq State where
-    {-# INLINABLE (==) #-}
-    l == r = minTime l == minTime r
-        && accounts l == accounts r
-        && choices l == choices r
-        && boundValues l == boundValues r
+asData
+  [d|
+  -- | Marlowe has six ways of building contracts.
+  --   Five of these – 'Pay', 'Let', 'If', 'When' and 'Assert' –
+  --   build a complex contract from simpler contracts, and the sixth, 'Close',
+  --   is a simple contract.
+  --   At each step of execution, as well as returning a new state and continuation contract,
+  --   it is possible that effects – payments – and warnings can be generated too.
+  data Contract = Close
+                | Pay AccountId Payee Token (Value Observation) Contract
+                | If Observation Contract Contract
+                | When [Case Contract] Timeout Contract
+                | Let ValueId (Value Observation) Contract
+                | Assert Observation Contract
+    deriving stock (Generic, Data)
+    --deriving stock (Haskell.Eq, Haskell.Ord, Haskell.Show)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+asData
+  [d|
+  -- | Marlowe contract internal state. Stored in a /Datum/ of a transaction output.
+  data State = State { accounts    :: Accounts
+                    , choices     :: Map ChoiceId ChosenNum
+                    , boundValues :: Map ValueId Integer
+                    , minTime     :: POSIXTime }
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+{-# INLINEABLE State #-}
+
+-- | Execution environment. Contains a time interval of a transaction.
+newtype Environment = Environment { timeInterval :: TimeInterval }
+  deriving stock (Haskell.Show,Haskell.Eq,Haskell.Ord,Data)
+  deriving newtype (Eq)
+
+makeIsDataIndexed ''Environment [('Environment, 0)]
+
+asData
+  [d|
+  -- | Input for a Marlowe contract. Correspond to expected 'Action's.
+  data InputContent = IDeposit AccountId Party Token Integer
+                    | IChoice ChoiceId ChosenNum
+                    | INotify
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+asData
+  [d|
+  -- | Input to a contract, which may include the merkleized continuation
+  --   of the contract and its hash.
+  data Input = NormalInput InputContent
+            | MerkleizedInput InputContent BuiltinByteString Contract
+    deriving stock (Generic, Data)
+    deriving newtype (ToData, FromData, UnsafeFromData, Haskell.Eq, Haskell.Ord, Haskell.Show, Eq)
+  |]
+
+-- | Extract the content of input.
+getInputContent :: Input -> InputContent
+getInputContent (NormalInput inputContent)         = inputContent
+getInputContent (MerkleizedInput inputContent _ _) = inputContent
+{-# INLINABLE getInputContent #-}
 
+-- | Time interval errors.
+--   'InvalidInterval' means @slotStart > slotEnd@, and
+--   'IntervalInPastError' means time interval is in the past, relative to the contract.
+--
+--   These errors should never occur, but we are always prepared.
+data IntervalError = InvalidInterval TimeInterval
+                   | IntervalInPastError POSIXTime TimeInterval
+  deriving stock (Haskell.Show, Haskell.Eq,Generic,Data)
+
+-- | Result of 'fixInterval'
+data IntervalResult = IntervalTrimmed Environment State
+                    | IntervalError IntervalError
+  deriving stock (Haskell.Show,Generic,Data)
+
+-- | Empty State for a given minimal 'POSIXTime'
+emptyState :: POSIXTime -> State
+emptyState sn = State
+    { accounts = Map.empty
+    , choices  = Map.empty
+    , boundValues = Map.empty
+    , minTime = sn }
+{-# INLINABLE emptyState #-}
+
+-- | Check if a 'num' is withint a list of inclusive bounds.
+inBounds :: ChosenNum -> [Bound] -> Bool
+inBounds num = any (\(Bound l u) -> num >= l && num <= u)
+{-# INLINABLE inBounds #-}
 
--- Lifting data types to Plutus Core
 makeLift ''Party
-makeIsDataIndexed ''Party [('Address,0),('Role,1)]
 makeLift ''ChoiceId
-makeIsDataIndexed ''ChoiceId [('ChoiceId,0)]
 makeLift ''Token
-makeIsDataIndexed ''Token [('Token,0)]
 makeLift ''ValueId
-makeIsDataIndexed ''ValueId [('ValueId,0)]
 makeLift ''Value
-makeIsDataIndexed ''Value [
-    ('AvailableMoney,0),
-    ('Constant,1),
-    ('NegValue,2),
-    ('AddValue,3),
-    ('SubValue,4),
-    ('MulValue,5),
-    ('DivValue,6),
-    ('ChoiceValue,7),
-    ('TimeIntervalStart, 8),
-    ('TimeIntervalEnd,9),
-    ('UseValue,10),
-    ('Cond,11)
-    ]
 makeLift ''Observation
-makeIsDataIndexed ''Observation [
-    ('AndObs,0),
-    ('OrObs,1),
-    ('NotObs,2),
-    ('ChoseSomething,3),
-    ('ValueGE,4),
-    ('ValueGT,5),
-    ('ValueLT,6),
-    ('ValueLE,7),
-    ('ValueEQ,8),
-    ('TrueObs,9),
-    ('FalseObs,10)
-    ]
 makeLift ''Bound
-makeIsDataIndexed ''Bound [('Bound,0)]
 makeLift ''Action
-makeIsDataIndexed ''Action [('Deposit,0),('Choice,1),('Notify,2)]
 makeLift ''Case
-makeIsDataIndexed ''Case [('Case,0),('MerkleizedCase,1)]
 makeLift ''Payee
-makeIsDataIndexed ''Payee [('Account,0),('Party,1)]
 makeLift ''Contract
-makeIsDataIndexed ''Contract [
-    ('Close,0),
-    ('Pay,1),
-    ('If,2),
-    ('When,3),
-    ('Let,4),
-    ('Assert,5)
-    ]
 makeLift ''State
-makeIsDataIndexed ''State [('State,0)]
 makeLift ''Environment
 makeLift ''InputContent
-makeIsDataIndexed ''InputContent [('IDeposit,0),('IChoice,1),('INotify,2)]
 makeLift ''Input
-makeIsDataIndexed ''Input [('NormalInput,0),('MerkleizedInput,1)]
diff --git a/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Scripts/Semantics.hs b/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Scripts/Semantics.hs
index 860cc7e4707..fcf33a09fc6 100644
--- a/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Scripts/Semantics.hs
+++ b/plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Scripts/Semantics.hs
@@ -23,11 +23,11 @@
 {-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE ViewPatterns          #-}
 
-{-# OPTIONS_GHC -fno-ignore-interface-pragmas #-}
-{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:defer-errors #-}
-{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-}
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
 
+{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:defer-errors #-}
+{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:context-level=0 #-}
+{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-}
 
 module PlutusBenchmark.Marlowe.Scripts.Semantics
   ( -- * Types
@@ -51,14 +51,7 @@ import PlutusBenchmark.Marlowe.Core.V1.Semantics as Semantics (MarloweData (..),
                                                                TransactionInput (TransactionInput, txInputs, txInterval),
                                                                TransactionOutput (Error, TransactionOutput, txOutContract, txOutPayments, txOutState),
                                                                computeTransaction, totalBalance)
-import PlutusBenchmark.Marlowe.Core.V1.Semantics.Types as Semantics (ChoiceId (ChoiceId),
-                                                                     Contract (Close), Input (..),
-                                                                     InputContent (..),
-                                                                     IntervalError (IntervalInPastError, InvalidInterval),
-                                                                     Party (..),
-                                                                     Payee (Account, Party),
-                                                                     State (..), Token (Token),
-                                                                     getInputContent)
+import PlutusBenchmark.Marlowe.Core.V1.Semantics.Types
 import PlutusBenchmark.Marlowe.Scripts.RolePayout (rolePayoutValidatorHash)
 import PlutusLedgerApi.V2 (Credential (..), Datum (Datum), DatumHash (DatumHash), Extended (..),
                            Interval (..), LowerBound (..), POSIXTime (..), POSIXTimeRange,
@@ -76,9 +69,9 @@ import PlutusTx.Prelude as PlutusTxPrelude (AdditiveGroup ((-)), AdditiveMonoid
                                             AdditiveSemigroup ((+)), Bool (..), BuiltinByteString,
                                             BuiltinData, BuiltinString, Enum (fromEnum), Eq (..),
                                             Functor (fmap), Integer, Maybe (..), Ord ((>)),
-                                            Semigroup ((<>)), all, any, check, elem, error, filter,
-                                            find, foldMap, id, null, otherwise, snd, toBuiltin, ($),
-                                            (&&), (.), (/=), (||))
+                                            Semigroup ((<>)), all, any, check, elem, filter, find,
+                                            foldMap, null, otherwise, snd, toBuiltin, ($), (&&),
+                                            (.), (/=), (||))
 
 import Cardano.Crypto.Hash qualified as Hash
 import Data.ByteString qualified as BS
@@ -89,20 +82,10 @@ import PlutusLedgerApi.V1.Value qualified as Val
 import PlutusLedgerApi.V2 qualified as Ledger (Address (Address))
 import PlutusTx qualified
 import PlutusTx.AssocMap qualified as AssocMap
+import PlutusTx.Trace (traceError, traceIfFalse)
 import Prelude qualified as Haskell
 
 
--- Suppress traces, in order to save bytes.
-
-{-# INLINABLE traceError #-}
-traceError :: BuiltinString -> a
-traceError _ = error ()
-
-{-# INLINABLE traceIfFalse #-}
-traceIfFalse :: BuiltinString -> a -> a
-traceIfFalse _ = id
-
-
 -- | Input to a Marlowe transaction.
 type MarloweInput = [MarloweTxInput]
 
diff --git a/plutus-benchmark/marlowe/test/Spec.hs b/plutus-benchmark/marlowe/test/Spec.hs
index 48015f8dd14..2603e9da0e6 100644
--- a/plutus-benchmark/marlowe/test/Spec.hs
+++ b/plutus-benchmark/marlowe/test/Spec.hs
@@ -12,10 +12,10 @@ import PlutusBenchmark.Marlowe.Scripts.RolePayout (rolePayoutValidator)
 import PlutusBenchmark.Marlowe.Scripts.Semantics (marloweValidator)
 import PlutusBenchmark.Marlowe.Types qualified as M
 import PlutusCore.Default (DefaultFun, DefaultUni)
-import PlutusCore.Test (goldenSize, goldenUEvalBudget)
+import PlutusCore.Test (goldenUEvalBudget)
 import PlutusLedgerApi.V2 (scriptContextTxInfo, txInfoId)
 import PlutusTx.Code (CompiledCode)
-import PlutusTx.Test ()
+import PlutusTx.Test
 import UntypedPlutusCore (NamedDeBruijn)
 import UntypedPlutusCore.Core.Type qualified as UPLC
 
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0000020002010200020101020201000100010001020101020201010000020102.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0000020002010200020101020201000100010001020101020201010000020102.eval.golden
index a10e75bf31d..6bb05951978 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0000020002010200020101020201000100010001020101020201010000020102.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0000020002010200020101020201000100010001020101020201010000020102.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 591244075
-| mem: 1936409})
\ No newline at end of file
+({cpu: 414378499
+| mem: 1504799})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0001000101000000010101000001000001010101010100000001000001010000.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0001000101000000010101000001000001010101010100000001000001010000.eval.golden
index e3a94a36e37..68484606572 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0001000101000000010101000001000001010101010100000001000001010000.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0001000101000000010101000001000001010101010100000001000001010000.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1115016711
-| mem: 3659574})
\ No newline at end of file
+({cpu: 529610877
+| mem: 1862048})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0003040402030103010203030303000200000104030002040304020400000102.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
index a2047352536..11c4a35532d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1298427981
-| mem: 4979238})
\ No newline at end of file
+({cpu: 1428979902
+| mem: 5367574})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden
index 27c9376a48f..e1943a1c4df 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2539370363
-| mem: 8045811})
\ No newline at end of file
+({cpu: 1008752584
+| mem: 3614871})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0101010001010101010101000100010100000001010000010001000001000101.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0101010001010101010101000100010100000001010000010001000001000101.eval.golden
index 755b6818e8c..7709b8cd361 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0101010001010101010101000100010100000001010000010001000001000101.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0101010001010101010101000100010100000001010000010001000001000101.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 7398006505
-| mem: 21554080})
\ No newline at end of file
+({cpu: 868513678
+| mem: 2585664})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0101020201010201010200010102000201000201010102000102010201010000.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0101020201010201010200010102000201000201010102000102010201010000.eval.golden
index 84394dbac50..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0101020201010201010200010102000201000201010102000102010201010000.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0101020201010201010200010102000201000201010102000102010201010000.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 462565773
-| mem: 1575077})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0101080808040600020306010000000302050807010208060100070207080202.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0101080808040600020306010000000302050807010208060100070207080202.eval.golden
index 20bf6b555c0..ce4ab21d3f0 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0101080808040600020306010000000302050807010208060100070207080202.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0101080808040600020306010000000302050807010208060100070207080202.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1464826912
-| mem: 5121328})
\ No newline at end of file
+({cpu: 1035407219
+| mem: 3802000})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0104010200020000040103020102020004040300030304040400010301040303.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0104010200020000040103020102020004040300030304040400010301040303.eval.golden
index b4e1071b3ad..32a6934fea0 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0104010200020000040103020102020004040300030304040400010301040303.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0104010200020000040103020102020004040300030304040400010301040303.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 812761747
-| mem: 3088639})
\ No newline at end of file
+({cpu: 1024462208
+| mem: 3769267})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden
index d4f089ef325..e77ae3ed036 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1347387686
-| mem: 4654281})
\ No newline at end of file
+({cpu: 961104191
+| mem: 3481333})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
index 5a8357722f1..981ef57b009 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1034044517
-| mem: 3674697})
\ No newline at end of file
+({cpu: 1438491380
+| mem: 5012365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0705030002040601010206030604080208020207000101060706050502040301.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0705030002040601010206030604080208020207000101060706050502040301.eval.golden
index b1524eecc3d..8688c36a714 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0705030002040601010206030604080208020207000101060706050502040301.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0705030002040601010206030604080208020207000101060706050502040301.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2198529613
-| mem: 7141220})
\ No newline at end of file
+({cpu: 1555673540
+| mem: 5301018})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
index 7aa5ca2d3b9..0de70ad2148 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1155346176
-| mem: 4383869})
\ No newline at end of file
+({cpu: 1417412598
+| mem: 5183617})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
index 8c04b7837dd..2c1fca2fb66 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1186543363
-| mem: 4514079})
\ No newline at end of file
+({cpu: 1544798878
+| mem: 5626951})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
index 17fabff5592..cd7cf5e15b6 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1786882171
-| mem: 6637076})
\ No newline at end of file
+({cpu: 1909249237
+| mem: 6938218})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden
index fc5299f8551..fa28d3d05b3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 968925063
-| mem: 3182575})
\ No newline at end of file
+({cpu: 631881543
+| mem: 2332431})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden
index 592ab336562..30338394223 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1072507017
-| mem: 3765477})
\ No newline at end of file
+({cpu: 973494384
+| mem: 3536889})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden
index 3c2b4c4a82d..e3f69bc7cd1 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 604511900
-| mem: 2211059})
\ No newline at end of file
+({cpu: 653885103
+| mem: 2414983})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
index 72fedb26e70..403dcdfc0c4 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 835851849
-| mem: 3142691})
\ No newline at end of file
+({cpu: 1005387218
+| mem: 3676461})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden
index 786aff131f8..dc77d6d3d42 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1817283117
-| mem: 5261155})
\ No newline at end of file
+({cpu: 391230639
+| mem: 1430467})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden
index 96dcaa5082e..09fa3d0e9aa 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1451982803
-| mem: 5264144})
\ No newline at end of file
+({cpu: 1212042941
+| mem: 4448632})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden
index 3aa4d39be17..11e870e94d4 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1362455496
-| mem: 4651427})
\ No newline at end of file
+({cpu: 976172001
+| mem: 3478479})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden
index 71f7db0a4e2..977d6d211ca 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 535250487
-| mem: 1776859})
\ No newline at end of file
+({cpu: 391255811
+| mem: 1430467})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden
index e9e9bb78cc8..f466801a5b6 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 30710028921
-| mem: 85510404})
\ No newline at end of file
+({cpu: 694001909
+| mem: 1357058})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden
index 72ad64cbdf3..85674f51fc3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 165803880453
-| mem: 473425690})
\ No newline at end of file
+({cpu: 2119274972
+| mem: 1781066})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden
index 29b0e5ad64d..a08e72033ec 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 766464422
-| mem: 2599102})
\ No newline at end of file
+({cpu: 461279449
+| mem: 1705792})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden
index 69cef7e0006..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 454666506
-| mem: 1583279})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden
index 243dfe2c486..244fe681e47 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 690521958
-| mem: 2602708})
\ No newline at end of file
+({cpu: 748493281
+| mem: 2783480})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden
index b5d627bdcf7..f60a45470ba 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 33722068278
-| mem: 95635220})
\ No newline at end of file
+({cpu: 1153228948
+| mem: 1824486})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden
index 83cc17c1a42..0e9247a38ea 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 3992389996
-| mem: 11970944})
\ No newline at end of file
+({cpu: 1072227981
+| mem: 3554654})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden
index 0cdf35c660d..0739bbf0bba 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 824426487
-| mem: 3129305})
\ No newline at end of file
+({cpu: 1036126948
+| mem: 3809933})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden
index 158fa77d9e8..b93869f34b5 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1488393833
-| mem: 5115346})
\ No newline at end of file
+({cpu: 973196779
+| mem: 3537206})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
index bf402153a4b..131ce049ae9 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1433597395
-| mem: 5461678})
\ No newline at end of file
+({cpu: 1600079695
+| mem: 5950644})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden
index cea6e1ca94b..dc77d6d3d42 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 444554049
-| mem: 1532925})
\ No newline at end of file
+({cpu: 391230639
+| mem: 1430467})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden
index a8d46c3a719..68beb210123 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 593400330
-| mem: 2164247})
\ No newline at end of file
+({cpu: 613320491
+| mem: 2268483})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden
index 49aaecba59a..ec37961a56d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 884200275
-| mem: 3273060})
\ No newline at end of file
+({cpu: 823535287
+| mem: 3078880})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
index baa5c964d00..23ba031108b 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 967108192
-| mem: 3581436})
\ No newline at end of file
+({cpu: 1008646729
+| mem: 3687894})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden
index fb9002c4089..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 498363397
-| mem: 1696925})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden
index b08d31a721f..52dabd73ccc 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1572863995
-| mem: 5207914})
\ No newline at end of file
+({cpu: 1042739598
+| mem: 3738370})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden
index 417659f662d..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 624283564
-| mem: 2006369})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
index 7997fadce2f..f89e39b7910 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1197659397
-| mem: 4552685})
\ No newline at end of file
+({cpu: 1421735134
+| mem: 5238131})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden
index 402e6a00f7c..6f715789210 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 841683178
-| mem: 3107737})
\ No newline at end of file
+({cpu: 918893857
+| mem: 3395073})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden
index 52f1cd0950e..4d2e281c730 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2032380416
-| mem: 6068842})
\ No newline at end of file
+({cpu: 486339086
+| mem: 1735828})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden
index b177e7fb446..64e0a55bb17 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 352449875
-| mem: 1286851})
\ No newline at end of file
+({cpu: 468961867
+| mem: 1690557})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden
index 96cbd66b594..14a0534c1dd 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 440016659
-| mem: 1530363})
\ No newline at end of file
+({cpu: 480306563
+| mem: 1725649})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden
index 6d499a93793..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 474889073
-| mem: 1638345})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden
index 1837e5deacd..33e498a7951 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1149885289
-| mem: 4291058})
\ No newline at end of file
+({cpu: 1052338558
+| mem: 3938288})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden
index 69cef7e0006..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 454666506
-| mem: 1583279})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden
index 33a2ee7e9a3..3cc0b3f8922 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 556213836
-| mem: 2071963})
\ No newline at end of file
+({cpu: 648353734
+| mem: 2392115})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
index 383476be7d9..c8633eebcc8 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1241559525
-| mem: 4406339})
\ No newline at end of file
+({cpu: 1431481884
+| mem: 5121021})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
index 748aa29235a..29661be8144 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1124907867
-| mem: 4286743})
\ No newline at end of file
+({cpu: 1459372109
+| mem: 5284223})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
index 6baf1eb8d27..113d2ffed4d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 564178069
-| mem: 2107319})
\ No newline at end of file
+({cpu: 698186900
+| mem: 2541975})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden
index d12cf5c880b..dc77d6d3d42 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 465116658
-| mem: 1580279})
\ No newline at end of file
+({cpu: 391230639
+| mem: 1430467})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
index 77aea9a38ae..185bb2d5445 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 977500529
-| mem: 3654216})
\ No newline at end of file
+({cpu: 1019039066
+| mem: 3760674})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden
index 01b913c8d40..8f90810c2f1 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 685518860
-| mem: 2440373})
\ No newline at end of file
+({cpu: 650688318
+| mem: 2400307})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden
index c88b0740d7c..51a0da14ae3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 842797286
-| mem: 3167536})
\ No newline at end of file
+({cpu: 884661356
+| mem: 3284792})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden
index 8c121c3e3c8..0887719399a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 69272775445
-| mem: 199903696})
\ No newline at end of file
+({cpu: 1363827225
+| mem: 1977922})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden
index 6af3f6c20ff..c5d0b4698f8 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2380721152
-| mem: 7737328})
\ No newline at end of file
+({cpu: 1830710874
+| mem: 6187902})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
index 9b8fa3e6456..76d6b984c1d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1196948917
-| mem: 4550857})
\ No newline at end of file
+({cpu: 1439049563
+| mem: 5281393})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden
index 72ad64cbdf3..85674f51fc3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 165803880453
-| mem: 473425690})
\ No newline at end of file
+({cpu: 2119274972
+| mem: 1781066})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden
index d4ba5d9cba4..4f8393cbed4 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 579374330
-| mem: 2137685})
\ No newline at end of file
+({cpu: 650879633
+| mem: 2397317})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden
index 7adb160616c..0cf6ceafbe5 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1092307126
-| mem: 3823077})
\ No newline at end of file
+({cpu: 993294493
+| mem: 3594489})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden
index d96e85ce50b..c1be2bb15f5 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 549961026
-| mem: 2038349})
\ No newline at end of file
+({cpu: 634457600
+| mem: 2337633})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden
index f69c2ba2698..1684e002c11 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1036236865
-| mem: 3832798})
\ No newline at end of file
+({cpu: 1054560236
+| mem: 3905072})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden
index 1883f597421..666771c1761 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1058407491
-| mem: 3954492})
\ No newline at end of file
+({cpu: 1076730862
+| mem: 4026766})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden
index 8e1929bdc53..31c9dddfee9 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 838558853
-| mem: 3094161})
\ No newline at end of file
+({cpu: 915769532
+| mem: 3381497})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden
index 9b2f2ccb7ce..c05e7af95cc 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 682739163
-| mem: 2299880})
\ No newline at end of file
+({cpu: 656433083
+| mem: 2320424})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden
index 8578c466b56..1ebf788531a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 804054581
-| mem: 2855434})
\ No newline at end of file
+({cpu: 615106572
+| mem: 2267114})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden
index 55b22b93a0b..6e8f19c0ea4 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2701178364
-| mem: 8612588})
\ No newline at end of file
+({cpu: 1618930794
+| mem: 5436076})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden
index d6576f84ff4..6ffd0fa2689 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1572071351
-| mem: 5877866})
\ No newline at end of file
+({cpu: 1610547719
+| mem: 5928990})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden
index 29b0e5ad64d..a08e72033ec 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 766464422
-| mem: 2599102})
\ No newline at end of file
+({cpu: 461279449
+| mem: 1705792})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden
index a66c344b34f..dc77d6d3d42 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 801826115
-| mem: 2503067})
\ No newline at end of file
+({cpu: 391230639
+| mem: 1430467})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
index c5022ac8c82..3dc2da53698 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1042181184
-| mem: 3701603})
\ No newline at end of file
+({cpu: 1448656659
+| mem: 5039771})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden
index 96cbd66b594..14a0534c1dd 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 440016659
-| mem: 1530363})
\ No newline at end of file
+({cpu: 480306563
+| mem: 1725649})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden
index 9b2f2ccb7ce..c05e7af95cc 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 682739163
-| mem: 2299880})
\ No newline at end of file
+({cpu: 656433083
+| mem: 2320424})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden
index 5eeb0a8222b..614632e3457 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 908411561
-| mem: 3349142})
\ No newline at end of file
+({cpu: 847746573
+| mem: 3154962})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden
index e4b3cc0f9b5..d5c1f76ffa9 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1269630348
-| mem: 3656305})
\ No newline at end of file
+({cpu: 408894365
+| mem: 1422349})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden
index b1e797bc50a..a03273300e1 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 752564786
-| mem: 2808954})
\ No newline at end of file
+({cpu: 771827313
+| mem: 2860098})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
index 42ef0adac49..9d853f14ed9 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1763611383
-| mem: 6536718})
\ No newline at end of file
+({cpu: 1885978449
+| mem: 6837860})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden
index 1c25c2b26b3..f2032d267de 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1298885322
-| mem: 4662936})
\ No newline at end of file
+({cpu: 1026606892
+| mem: 3827768})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden
index 8c6da48e27d..8dcb1383774 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1200848637
-| mem: 4527440})
\ No newline at end of file
+({cpu: 1352696408
+| mem: 4978090})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden
index 0009c9101eb..4976892eba2 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 810359498
-| mem: 3081343})
\ No newline at end of file
+({cpu: 981150448
+| mem: 3645139})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden
index 45b11c8135d..ac327d8a8ea 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1066033859
-| mem: 3956916})
\ No newline at end of file
+({cpu: 1084357230
+| mem: 4029190})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden
index 40d2ebfa42a..bdc893c0687 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 14193699612
-| mem: 40654116})
\ No newline at end of file
+({cpu: 682992861
+| mem: 1321820})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden
index be442a10c0b..6912441b727 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1454986175
-| mem: 5329712})
\ No newline at end of file
+({cpu: 1215046313
+| mem: 4514200})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden
index d99effb1e24..31d8a101561 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1179703757
-| mem: 4398964})
\ No newline at end of file
+({cpu: 1137724250
+| mem: 4208442})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden
index 4f75cacd18d..c35d257f92d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 584023400
-| mem: 2152759})
\ No newline at end of file
+({cpu: 656184921
+| mem: 2418843})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden
index 5414e63285c..723f687b89d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 211222525643
-| mem: 619830416})
\ No newline at end of file
+({cpu: 8438261145
+| mem: 1177074})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
index 20384a67fa7..89b1fad1755 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1199688133
-| mem: 4575861})
\ No newline at end of file
+({cpu: 1423763870
+| mem: 5261307})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden
index 84394dbac50..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 462565773
-| mem: 1575077})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden
index d1a4778ff89..3c59d5d76a9 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 595951215
-| mem: 2169449})
\ No newline at end of file
+({cpu: 615871376
+| mem: 2273685})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden
index 2374d50ab26..5a618522e85 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1121387866
-| mem: 4178032})
\ No newline at end of file
+({cpu: 1023841135
+| mem: 3825262})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden
index f446d559b1b..cc5c04a916f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 807037345
-| mem: 2698590})
\ No newline at end of file
+({cpu: 456439367
+| mem: 1651038})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden
index 940eddbb75e..3c2ab22a44b 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 570315149
-| mem: 2006812})
\ No newline at end of file
+({cpu: 512435555
+| mem: 1886882})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden
index 2871b40fd82..dc77d6d3d42 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 372558202
-| mem: 1332771})
\ No newline at end of file
+({cpu: 391230639
+| mem: 1430467})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden
index 1ceaca0022c..d2d981a34e2 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 7404658547
-| mem: 21570966})
\ No newline at end of file
+({cpu: 912008412
+| mem: 2719038})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden
index 4c84263f360..90b0161af5f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 610119790
-| mem: 1969499})
\ No newline at end of file
+({cpu: 388679754
+| mem: 1425265})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden
index 8b62bbfdde3..6974a516945 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1596122008
-| mem: 5330060})
\ No newline at end of file
+({cpu: 843251281
+| mem: 3065524})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden
index 33f7a71f02c..d9bf6100f1e 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 3873601443
-| mem: 11656794})
\ No newline at end of file
+({cpu: 948465981
+| mem: 3227048})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden
index 16479362aaf..ff9065766f5 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 69981699045
-| mem: 199507886})
\ No newline at end of file
+({cpu: 1965603964
+| mem: 1261864})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.2/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
index a3493d45416..3ab0b2c8b2e 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1380334909
-| mem: 5042502})
\ No newline at end of file
+({cpu: 1269996610
+| mem: 4667910})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/semantics.size.golden b/plutus-benchmark/marlowe/test/semantics/9.2/semantics.size.golden
index 31370c75074..b2395399b24 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.2/semantics.size.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.2/semantics.size.golden
@@ -1 +1 @@
-13032
\ No newline at end of file
+11593
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.eval.golden
index c6deebac2af..2ab64ef95ab 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 590853075
-| mem: 1934709})
\ No newline at end of file
+({cpu: 413021499
+| mem: 1498899})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.eval.golden
index ae54129b3b9..b6e9aedc1fe 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1113222711
-| mem: 3651774})
\ No newline at end of file
+({cpu: 527678877
+| mem: 1853648})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
index 34fc7a1c3c1..36898d6e834 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1303556981
-| mem: 5001538})
\ No newline at end of file
+({cpu: 1431072902
+| mem: 5376674})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden
index 0db579bc86c..040644c5cf4 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2537254363
-| mem: 8036611})
\ No newline at end of file
+({cpu: 1007740584
+| mem: 3610471})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.eval.golden
index 58706addf9b..25e03db8c28 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 7393061505
-| mem: 21532580})
\ No newline at end of file
+({cpu: 867156678
+| mem: 2579764})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.eval.golden
index c0b01b072dc..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 462174773
-| mem: 1573377})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.eval.golden
index 5858b976851..78d17d19981 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1469012912
-| mem: 5139528})
\ No newline at end of file
+({cpu: 1036695219
+| mem: 3807600})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.eval.golden
index 7c6829ba08b..e1b91fae858 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 815613747
-| mem: 3101039})
\ No newline at end of file
+({cpu: 1025175208
+| mem: 3772367})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden
index c0e97dc3d84..e15101a3f29 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1348514686
-| mem: 4659181})
\ No newline at end of file
+({cpu: 961334191
+| mem: 3482333})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
index 665878100fe..a504ff1998d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1038483517
-| mem: 3693997})
\ No newline at end of file
+({cpu: 1438514380
+| mem: 5012465})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.eval.golden
index 273b2170dc5..0b995e39512 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2201979613
-| mem: 7156220})
\ No newline at end of file
+({cpu: 1560986540
+| mem: 5324118})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
index 75900e31fde..0fb849d2909 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1161533176
-| mem: 4410769})
\ No newline at end of file
+({cpu: 1420011598
+| mem: 5194917})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
index 3b041921f21..3118d72fc6f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1193282363
-| mem: 4543379})
\ No newline at end of file
+({cpu: 1547742878
+| mem: 5639751})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
index 0f25a01d253..a88bdc33431 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1797531171
-| mem: 6683376})
\ No newline at end of file
+({cpu: 1912515237
+| mem: 6952418})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden
index 687d3b45707..1c230319b1a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 971179063
-| mem: 3192375})
\ No newline at end of file
+({cpu: 631996543
+| mem: 2332931})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden
index 592ab336562..36077904655 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1072507017
-| mem: 3765477})
\ No newline at end of file
+({cpu: 972804384
+| mem: 3533889})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden
index c82491f81b2..5ea78d7d8f4 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 605891900
-| mem: 2217059})
\ No newline at end of file
+({cpu: 653126103
+| mem: 2411683})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
index ff634bca523..55342f3f82d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 839761849
-| mem: 3159691})
\ No newline at end of file
+({cpu: 1007365218
+| mem: 3685061})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden
index 19bf0dfa0e1..9243d7b5d49 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1816892117
-| mem: 5259455})
\ No newline at end of file
+({cpu: 389873639
+| mem: 1424567})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden
index 3c80be67b10..13c04b8a5d1 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1459572803
-| mem: 5297144})
\ No newline at end of file
+({cpu: 1215906941
+| mem: 4465432})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden
index a874333964c..6792a47d9b0 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1363582496
-| mem: 4656327})
\ No newline at end of file
+({cpu: 976402001
+| mem: 3479479})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden
index c41d5bfc92f..3007545083e 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 534859487
-| mem: 1775159})
\ No newline at end of file
+({cpu: 389898811
+| mem: 1424567})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden
index 317fd118967..7f0431f5c21 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 30700368921
-| mem: 85468404})
\ No newline at end of file
+({cpu: 691448909
+| mem: 1345958})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden
index e8407ed2b9e..199569ce756 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 165731361453
-| mem: 473110390})
\ No newline at end of file
+({cpu: 2116721972
+| mem: 1769966})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden
index 518a934b16c..59e5938de9a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 764532422
-| mem: 2590702})
\ No newline at end of file
+({cpu: 459347449
+| mem: 1697392})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden
index 3e39a378d46..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 454275506
-| mem: 1581579})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden
index ea2025296e6..506b9d8a87c 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 691717958
-| mem: 2607908})
\ No newline at end of file
+({cpu: 748654281
+| mem: 2784180})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden
index 47ce4d76f73..5634de24425 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 33705439278
-| mem: 95562920})
\ No newline at end of file
+({cpu: 1150744948
+| mem: 1813686})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden
index 7a3cd627a91..246d3f318f9 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 3992435996
-| mem: 11971144})
\ No newline at end of file
+({cpu: 1072480981
+| mem: 3555754})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden
index 62dadffd30f..e72450fa7e3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 827278487
-| mem: 3141705})
\ No newline at end of file
+({cpu: 1036839948
+| mem: 3813033})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden
index cf6fc80768e..14d6acf5825 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1491751833
-| mem: 5129946})
\ No newline at end of file
+({cpu: 973656779
+| mem: 3539206})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
index 4618d982972..31daf8557e8 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1438657395
-| mem: 5483678})
\ No newline at end of file
+({cpu: 1601482695
+| mem: 5956744})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden
index fe15d2a8244..9243d7b5d49 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 444163049
-| mem: 1531225})
\ No newline at end of file
+({cpu: 389873639
+| mem: 1424567})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden
index ff504927a37..75ff19c6abe 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 595378330
-| mem: 2172847})
\ No newline at end of file
+({cpu: 613159491
+| mem: 2267783})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden
index 5d180f321ba..7d95c88624e 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 886224275
-| mem: 3281860})
\ No newline at end of file
+({cpu: 823351287
+| mem: 3078080})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
index 1c46c7192a7..2811f73b8b7 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 969385192
-| mem: 3591336})
\ No newline at end of file
+({cpu: 1008094729
+| mem: 3685494})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden
index 122f8ec71bb..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 497972397
-| mem: 1695225})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden
index 81f778c719b..847ce1b9b4d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1572886995
-| mem: 5208014})
\ No newline at end of file
+({cpu: 1042486598
+| mem: 3737270})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden
index 98f79219228..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 623892564
-| mem: 2004669})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
index fabbf560505..8e0a6ea58f3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1203202397
-| mem: 4576785})
\ No newline at end of file
+({cpu: 1423483134
+| mem: 5245731})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden
index dbf11136727..ba6e0d34dbf 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 845317178
-| mem: 3123537})
\ No newline at end of file
+({cpu: 919767857
+| mem: 3398873})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden
index 4c958782324..8fdb8e420a5 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2030172416
-| mem: 6059242})
\ No newline at end of file
+({cpu: 484407086
+| mem: 1727428})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden
index 2136a6f7341..609c13e1dfc 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 352058875
-| mem: 1285151})
\ No newline at end of file
+({cpu: 467604867
+| mem: 1684657})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden
index 30e7c824ff1..125b4f8d7e7 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 439625659
-| mem: 1528663})
\ No newline at end of file
+({cpu: 478949563
+| mem: 1719749})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden
index a1c9dae4c74..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 474498073
-| mem: 1636645})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden
index a7b84bba121..48c50f65906 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1155244289
-| mem: 4314358})
\ No newline at end of file
+({cpu: 1055144558
+| mem: 3950488})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden
index 3e39a378d46..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 454275506
-| mem: 1581579})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden
index 14f751921b5..ebc4c1f160a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 557340836
-| mem: 2076863})
\ No newline at end of file
+({cpu: 647341734
+| mem: 2387715})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
index a61cdcd874b..82fd27c75bc 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1244664525
-| mem: 4419839})
\ No newline at end of file
+({cpu: 1431826884
+| mem: 5122521})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
index b4d3d16306c..d58bb1e2487 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1132911867
-| mem: 4321543})
\ No newline at end of file
+({cpu: 1464202109
+| mem: 5305223})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
index eb0e0b7e1fa..2564957ca49 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 565167069
-| mem: 2111619})
\ No newline at end of file
+({cpu: 697243900
+| mem: 2537875})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden
index 36d93e7f7da..9243d7b5d49 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 464725658
-| mem: 1578579})
\ No newline at end of file
+({cpu: 389873639
+| mem: 1424567})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
index 09e2f84fb91..31aaae8f69f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 979455529
-| mem: 3662716})
\ No newline at end of file
+({cpu: 1018165066
+| mem: 3756874})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden
index b9341bf15ad..d3aa37cff2a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 686645860
-| mem: 2445273})
\ No newline at end of file
+({cpu: 649676318
+| mem: 2395907})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden
index a465482772e..b4c83ca1476 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 845235286
-| mem: 3178136})
\ No newline at end of file
+({cpu: 884891356
+| mem: 3285792})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden
index 7ad1d0579bf..68649c5d484 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 69235584445
-| mem: 199741996})
\ No newline at end of file
+({cpu: 1361688225
+| mem: 1968622})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden
index eff1e6cdecd..3ae6af9d856 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2385873152
-| mem: 7759728})
\ No newline at end of file
+({cpu: 1835931874
+| mem: 6210602})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
index 888937b1e67..bb491f0172b 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1202491917
-| mem: 4574957})
\ No newline at end of file
+({cpu: 1440797563
+| mem: 5288993})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden
index e8407ed2b9e..199569ce756 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 165731361453
-| mem: 473110390})
\ No newline at end of file
+({cpu: 2116721972
+| mem: 1769966})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden
index a15d74b5000..c456f5e8d5a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 580501330
-| mem: 2142585})
\ No newline at end of file
+({cpu: 649867633
+| mem: 2392917})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden
index be0bd31cf5a..5bf573a5126 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1091985126
-| mem: 3821677})
\ No newline at end of file
+({cpu: 992282493
+| mem: 3590089})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden
index 20a8b20d33b..96d5e5b08ae 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 552215026
-| mem: 2048149})
\ No newline at end of file
+({cpu: 634572600
+| mem: 2338133})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden
index a98bec84ffd..b3c9713df27 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1037754865
-| mem: 3839398})
\ No newline at end of file
+({cpu: 1055181236
+| mem: 3907772})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden
index 5c16825f815..05e28306d77 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1059603491
-| mem: 3959692})
\ No newline at end of file
+({cpu: 1077029862
+| mem: 4028066})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden
index 177109e2c09..80f4512d094 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 842192853
-| mem: 3109961})
\ No newline at end of file
+({cpu: 916643532
+| mem: 3385297})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden
index 132db155063..0c801d9b869 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 682348163
-| mem: 2298180})
\ No newline at end of file
+({cpu: 654800083
+| mem: 2313324})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden
index b84cca62fc6..b5ff45f7d42 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 804330581
-| mem: 2856634})
\ No newline at end of file
+({cpu: 613795572
+| mem: 2261414})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden
index 99404235d62..2e304726e56 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 2700856364
-| mem: 8611188})
\ No newline at end of file
+({cpu: 1620609794
+| mem: 5443376})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden
index 8694062fd6b..f6a6aba8c14 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1582191351
-| mem: 5921866})
\ No newline at end of file
+({cpu: 1617355719
+| mem: 5958590})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden
index 518a934b16c..59e5938de9a 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 764532422
-| mem: 2590702})
\ No newline at end of file
+({cpu: 459347449
+| mem: 1697392})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden
index fe6baefca34..9243d7b5d49 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 801435115
-| mem: 2501367})
\ No newline at end of file
+({cpu: 389873639
+| mem: 1424567})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
index 66d595dfe7f..13aa0548525 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1046620184
-| mem: 3720903})
\ No newline at end of file
+({cpu: 1448679659
+| mem: 5039871})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden
index 30e7c824ff1..125b4f8d7e7 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 439625659
-| mem: 1528663})
\ No newline at end of file
+({cpu: 478949563
+| mem: 1719749})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden
index 132db155063..0c801d9b869 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 682348163
-| mem: 2298180})
\ No newline at end of file
+({cpu: 654800083
+| mem: 2313324})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden
index d93aeb389cd..466a0ed7cd8 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 910113561
-| mem: 3356542})
\ No newline at end of file
+({cpu: 847240573
+| mem: 3152762})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden
index e2c602cff09..c453f4f293f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1268595348
-| mem: 3651805})
\ No newline at end of file
+({cpu: 407721365
+| mem: 1417249})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden
index ace4d989a3e..2442436a625 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 753185786
-| mem: 2811654})
\ No newline at end of file
+({cpu: 771413313
+| mem: 2858298})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
index 09ee5c35987..7842b4a6386 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1774582383
-| mem: 6584418})
\ No newline at end of file
+({cpu: 1889566449
+| mem: 6853460})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden
index 3a70a3467cc..af2839c7f22 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1304152322
-| mem: 4685836})
\ No newline at end of file
+({cpu: 1029734892
+| mem: 3841368})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden
index 2a0b4d4b000..e0216e74ef6 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1208024637
-| mem: 4558640})
\ No newline at end of file
+({cpu: 1357112408
+| mem: 4997290})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden
index 69b4ba0435c..d9315b8c905 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 813211498
-| mem: 3093743})
\ No newline at end of file
+({cpu: 981242448
+| mem: 3645539})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden
index 283c5ac76e5..5e571a9193f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1067229859
-| mem: 3962116})
\ No newline at end of file
+({cpu: 1084656230
+| mem: 4030490})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden
index 44206cb39c3..90fa283e320 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 14184108612
-| mem: 40612416})
\ No newline at end of file
+({cpu: 680439861
+| mem: 1310720})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden
index 9f8f189ef59..7c7fc8dbcc5 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1462576175
-| mem: 5362712})
\ No newline at end of file
+({cpu: 1218910313
+| mem: 4531000})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden
index 5023386dfc8..121cbabc13b 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1186580757
-| mem: 4428864})
\ No newline at end of file
+({cpu: 1141358250
+| mem: 4224242})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden
index 9321d50fa9c..f9d66090a93 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 586277400
-| mem: 2162559})
\ No newline at end of file
+({cpu: 656299921
+| mem: 2419343})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden
index 6e733e6f81f..95ee3c652d2 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 211045195643
-| mem: 619059416})
\ No newline at end of file
+({cpu: 8435708145
+| mem: 1165974})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
index b417ec5bc6e..a2c4a6460f3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1205231133
-| mem: 4599961})
\ No newline at end of file
+({cpu: 1425511870
+| mem: 5268907})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden
index c0b01b072dc..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 462174773
-| mem: 1573377})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden
index 5f453977d13..3b9a0043c3c 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 597929215
-| mem: 2178049})
\ No newline at end of file
+({cpu: 615710376
+| mem: 2272985})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden
index bd1a8190fc7..745d6c17ce8 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1127068866
-| mem: 4202732})
\ No newline at end of file
+({cpu: 1026969135
+| mem: 3838862})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden
index f3cb222d29b..251400c77b3 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 805105345
-| mem: 2690190})
\ No newline at end of file
+({cpu: 454507367
+| mem: 1642638})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden
index e6c7bd4161e..829f13579e2 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 568935149
-| mem: 2000812})
\ No newline at end of file
+({cpu: 510503555
+| mem: 1878482})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden
index 8eacaeb8cd1..9243d7b5d49 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 372167202
-| mem: 1331071})
\ No newline at end of file
+({cpu: 389873639
+| mem: 1424567})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden
index 758d8018fa8..5c4952a903d 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 7400380547
-| mem: 21552366})
\ No newline at end of file
+({cpu: 911387412
+| mem: 2716338})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden
index 6077fb5578a..189e6aa5074 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 609728790
-| mem: 1967799})
\ No newline at end of file
+({cpu: 387322754
+| mem: 1419365})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden
index 8b62bbfdde3..1686cb137ee 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1596122008
-| mem: 5330060})
\ No newline at end of file
+({cpu: 842837281
+| mem: 3063724})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden
index 85ebb0a5db1..89c5977f66f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 3872957443
-| mem: 11653994})
\ No newline at end of file
+({cpu: 949960981
+| mem: 3233548})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden
index b08329de538..0770c5e6559 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 69944232045
-| mem: 199344986})
\ No newline at end of file
+({cpu: 1963050964
+| mem: 1250764})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
index e3ec4e368b7..f5d6d30936f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1386337909
-| mem: 5068602})
\ No newline at end of file
+({cpu: 1272963610
+| mem: 4680810})
\ No newline at end of file
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden b/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden
index 28609208d50..f3b30f7270f 100644
--- a/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden
+++ b/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden
@@ -1 +1 @@
-13120
\ No newline at end of file
+11652
\ No newline at end of file
diff --git a/plutus-benchmark/plutus-benchmark.cabal b/plutus-benchmark/plutus-benchmark.cabal
index b8de7866368..21b4d97e285 100644
--- a/plutus-benchmark/plutus-benchmark.cabal
+++ b/plutus-benchmark/plutus-benchmark.cabal
@@ -44,8 +44,8 @@ common lang
 
   -- See Note [-fno-full-laziness in Plutus Tx]
   ghc-options:
-    -fno-specialise -fno-spec-constr -fno-ignore-interface-pragmas
-    -fno-omit-interface-pragmas -fno-strictness
+    -fno-specialise -fno-spec-constr -fno-strictness
+    -fno-ignore-interface-pragmas -fno-omit-interface-pragmas
     -fno-unbox-strict-fields -fno-unbox-small-strict-fields
     -fno-full-laziness
 
diff --git a/plutus-core/testlib/PlutusCore/Test.hs b/plutus-core/testlib/PlutusCore/Test.hs
index 4c21b37f87d..2f6613c32f3 100644
--- a/plutus-core/testlib/PlutusCore/Test.hs
+++ b/plutus-core/testlib/PlutusCore/Test.hs
@@ -29,6 +29,7 @@ module PlutusCore.Test (
   goldenUEval,
   goldenUEvalLogs,
   goldenUEvalProfile,
+  goldenUEvalProfile',
   goldenUEvalBudget,
   goldenSize,
   initialSrcSpan,
@@ -276,9 +277,30 @@ runUPlcProfile values = do
     Left err -> throwError (SomeException $ EvaluationExceptionWithLogsAndBudget err budget logs)
     Right _  -> pure logs
 
+runUPlcProfile' ::
+  (ToUPlc a TPLC.DefaultUni UPLC.DefaultFun) =>
+  [a] ->
+  ExceptT
+    SomeException
+    IO
+    [Text]
+-- Can't use runUplcFull here, as with the others, becasue this one actually needs
+-- to set a different logging method
+runUPlcProfile' values = do
+  ps <- traverse toUPlc values
+  let (UPLC.Program _ _ t) = foldl1 (unsafeFromRight .* UPLC.applyProgram) ps
+      (res, UPLC.CountingSt _, logs) =
+        UPLC.runCek TPLC.defaultCekParameters UPLC.counting UPLC.logWithBudgetEmitter t
+  case res of
+    Left err -> throwError (SomeException $ err)
+    Right _  -> pure logs
+
 ppCatch :: (PrettyPlc a) => ExceptT SomeException IO a -> IO (Doc ann)
 ppCatch value = either (PP.pretty . show) prettyPlcClassicDebug <$> runExceptT value
 
+ppCatch' :: ExceptT SomeException IO (Doc ann) -> IO (Doc ann)
+ppCatch' value = either (PP.pretty . show) id <$> runExceptT value
+
 ppCatchReadable :: (PrettyBy (PrettyConfigReadable PrettyConfigName) a)
   => ExceptT SomeException IO a -> IO (Doc ann)
 ppCatchReadable value = either (PP.pretty . show) (pretty . AsReadable) <$> runExceptT value
@@ -393,6 +415,18 @@ goldenSize name value =
   nestedGoldenVsDocM name ".size" $
     pure . pretty . UPLC.programSize =<< rethrow (toUPlc value)
 
+-- | This is mostly useful for profiling a test that is normally
+-- tested with one of the other functions, as it's a drop-in
+-- replacement and you can then pass the output into `traceToStacks`.
+goldenUEvalProfile' ::
+  (ToUPlc a TPLC.DefaultUni TPLC.DefaultFun) =>
+  String ->
+  [a] ->
+  TestNested
+goldenUEvalProfile' name values =
+  nestedGoldenVsDocM name ".eval" $ ppCatch' $
+    fmap (\ts -> PP.vsep (fmap pretty ts)) $ runUPlcProfile' values
+
 -- | A made-up `SrcSpan` for testing.
 initialSrcSpan :: FilePath -> SrcSpan
 initialSrcSpan fp = SrcSpan fp 1 1 1 2
diff --git a/plutus-tx-plugin/test/Optimization/9.2/matchAsData.pir.golden b/plutus-tx-plugin/test/Optimization/9.2/matchAsData.pir.golden
deleted file mode 100644
index b893d8b1d0c..00000000000
--- a/plutus-tx-plugin/test/Optimization/9.2/matchAsData.pir.golden
+++ /dev/null
@@ -1,53 +0,0 @@
-let
-  data Unit | Unit_match where
-    Unit : Unit
-  data Bool | Bool_match where
-    True : Bool
-    False : Bool
-  data (Tuple2 :: * -> * -> *) a b | Tuple2_match where
-    Tuple2 : a -> b -> Tuple2 a b
-in
-\(ds : (\a -> data) integer) ->
-  Tuple2_match
-    {integer}
-    {list data}
-    ((let
-         b = list data
-       in
-       \(tup : pair integer b) ->
-         Tuple2
-           {integer}
-           {b}
-           (fstPair {integer} {b} tup)
-           (sndPair {integer} {b} tup))
-       (unConstrData ds))
-    {integer}
-    (\(ds : integer) (ds : list data) ->
-       ifThenElse
-         {all dead. integer}
-         (equalsInteger 0 ds)
-         (/\dead -> unIData (headList {data} ds))
-         (/\dead ->
-            Tuple2_match
-              {integer}
-              {list data}
-              ((let
-                   b = list data
-                 in
-                 \(tup : pair integer b) ->
-                   Tuple2
-                     {integer}
-                     {b}
-                     (fstPair {integer} {b} tup)
-                     (sndPair {integer} {b} tup))
-                 (unConstrData ds))
-              {integer}
-              (\(ds : integer) (ds : list data) ->
-                 ifThenElse
-                   {all dead. integer}
-                   (equalsInteger 1 ds)
-                   (/\dead -> 1)
-                   (/\dead ->
-                      Unit_match (error {Unit}) {integer} (error {integer}))
-                   {all dead. dead}))
-         {all dead. dead})
\ No newline at end of file
diff --git a/plutus-tx-plugin/test/Optimization/9.6/matchAsData.pir.golden b/plutus-tx-plugin/test/Optimization/9.6/matchAsData.pir.golden
index b893d8b1d0c..6fa7df7c449 100644
--- a/plutus-tx-plugin/test/Optimization/9.6/matchAsData.pir.golden
+++ b/plutus-tx-plugin/test/Optimization/9.6/matchAsData.pir.golden
@@ -26,7 +26,11 @@ in
        ifThenElse
          {all dead. integer}
          (equalsInteger 0 ds)
-         (/\dead -> unIData (headList {data} ds))
+         (/\dead ->
+            let
+              !ds : integer = unIData (headList {data} (tailList {data} ds))
+            in
+            unIData (headList {data} ds))
          (/\dead ->
             Tuple2_match
               {integer}
diff --git a/plutus-tx-plugin/test/Optimization/Spec.hs b/plutus-tx-plugin/test/Optimization/Spec.hs
index 8a995832a1d..3a79790867a 100644
--- a/plutus-tx-plugin/test/Optimization/Spec.hs
+++ b/plutus-tx-plugin/test/Optimization/Spec.hs
@@ -27,7 +27,7 @@ import PlutusTx.Test
 import PlutusTx.TH (compile)
 
 AsData.asData [d|
-  data MaybeD a = JustD a | NothingD
+  data MaybeD a = JustD a a | NothingD
   |]
 
 -- These are tests that run with the simplifier on, and some run all the way to UPLC.
@@ -56,8 +56,8 @@ maybeFun = $$(compile
 matchAsData :: CompiledCode (MaybeD Integer -> Integer)
 matchAsData = plc (Proxy @"matchAsData") (
   \case
-    JustD a  -> a
-    NothingD -> 1)
+    JustD a _ -> a
+    NothingD  -> 1)
 
 unsafeDeconstructData :: CompiledCode (Builtins.BuiltinData -> Maybe (Integer, Integer))
 unsafeDeconstructData = plc (Proxy @"deconstructData")