diff --git a/.gas-snapshot b/.gas-snapshot
index 596b166e8..b20a5f7e6 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,92 +1,90 @@
-GenericPoolOrderBookV3ArbOrderTakerTest:testMinimumOutput((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 332013, ~: 330346)
-GenericPoolOrderBookV3ArbOrderTakerTest:testTakeOrdersSender((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 266192, ~: 265239)
-GenericPoolOrderBookV3FlashBorrowerTest:testMinimumOutput((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 609043, ~: 605031)
-GenericPoolOrderBookV3FlashBorrowerTest:testTakeOrdersSender((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 522442, ~: 519665)
+GenericPoolOrderBookV3ArbOrderTakerTest:testGenericPoolMinimumOutput((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 332052, ~: 330383)
+GenericPoolOrderBookV3ArbOrderTakerTest:testGenericPoolTakeOrdersSender((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 266210, ~: 265260)
+GenericPoolOrderBookV3FlashBorrowerTest:testGenericPoolOrderBookV3FlashBorrowerMinimumOutput((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 609059, ~: 605057)
+GenericPoolOrderBookV3FlashBorrowerTest:testGenericPoolOrderBookV3FlashBorrowerTakeOrdersSender((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 522448, ~: 519675)
 LibOrderTest:testHashEqual((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[])) (runs: 5096, μ: 196882, ~: 195948)
 LibOrderTest:testHashNotEqual((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[])) (runs: 5096, μ: 298108, ~: 295793)
-OrderBookAddOrderMockTest:testAddOrderSameAccountWithDifferentConfig(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,address) (runs: 5096, μ: 2776550, ~: 2764101)
-OrderBookAddOrderMockTest:testAddOrderTwoAccountsWithDifferentConfig(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,address) (runs: 5096, μ: 2598395, ~: 2573145)
-OrderBookAddOrderMockTest:testAddOrderTwoAccountsWithSameConfig(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 2495879, ~: 2483615)
-OrderBookAddOrderMockTest:testAddOrderWithCalculationsInputsAndOutputsSucceeds(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 1295278, ~: 1291768)
-OrderBookAddOrderMockTest:testAddOrderWithNonEmptyMetaEmitsMetaV1(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 1305903, ~: 1301693)
-OrderBookAddOrderMockTest:testAddOrderWithNonEmptyMetaReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 702817, ~: 702452)
-OrderBookAddOrderMockTest:testAddOrderWithoutCalculationsReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 225204, ~: 222658)
-OrderBookAddOrderMockTest:testAddOrderWithoutInputsReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 180738, ~: 180602)
-OrderBookAddOrderMockTest:testAddOrderWithoutOutputsReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 181522, ~: 180944)
-OrderBookAddOrderTest:testAddOrderRealNoHandleIOReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 173437, ~: 171095)
-OrderBookAddOrderTest:testAddOrderRealNoSourcesReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 176629, ~: 174639)
-OrderBookAddOrderTest:testAddOrderRealOneStackCalculateReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 186730, ~: 184388)
-OrderBookAddOrderTest:testAddOrderRealThreeStackCalculate(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 723949, ~: 717416)
-OrderBookAddOrderTest:testAddOrderRealTwoStackCalculateReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 717244, ~: 710711)
-OrderBookAddOrderTest:testAddOrderRealZeroStackCalculateReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 182024, ~: 179682)
-OrderBookClearHandleIORevertTest:testClearOrderHandleIO0() (gas: 629944)
-OrderBookClearHandleIORevertTest:testClearOrderHandleIO1() (gas: 612268)
-OrderBookClearHandleIORevertTest:testClearOrderHandleIO2() (gas: 612253)
-OrderBookClearHandleIORevertTest:testClearOrderHandleIO3() (gas: 629982)
-OrderBookClearHandleIORevertTest:testClearOrderHandleIO4() (gas: 642423)
-OrderBookClearHandleIORevertTest:testClearOrderHandleIO5() (gas: 555978)
-OrderBookClearTest:testClearSimple(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),uint256,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),uint256,address,address,uint256,uint256) (runs: 5096, μ: 569599, ~: 569270)
+OrderBookAddOrderMockTest:testAddOrderSameAccountWithDifferentConfig(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,address) (runs: 5096, μ: 2778415, ~: 2765965)
+OrderBookAddOrderMockTest:testAddOrderTwoAccountsWithDifferentConfig(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,address) (runs: 5096, μ: 2600373, ~: 2575117)
+OrderBookAddOrderMockTest:testAddOrderTwoAccountsWithSameConfig(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 2498007, ~: 2485547)
+OrderBookAddOrderMockTest:testAddOrderWithCalculationsInputsAndOutputsSucceeds(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 1296186, ~: 1292677)
+OrderBookAddOrderMockTest:testAddOrderWithNonEmptyMetaEmitsMetaV1(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 1306812, ~: 1302603)
+OrderBookAddOrderMockTest:testAddOrderWithNonEmptyMetaReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 703198, ~: 702834)
+OrderBookAddOrderMockTest:testAddOrderWithoutCalculationsReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 225041, ~: 222495)
+OrderBookAddOrderMockTest:testAddOrderWithoutInputsReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 180462, ~: 180326)
+OrderBookAddOrderMockTest:testAddOrderWithoutOutputsReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 181258, ~: 180681)
+OrderBookAddOrderTest:testAddOrderRealNoHandleIOReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 173061, ~: 170719)
+OrderBookAddOrderTest:testAddOrderRealNoSourcesReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 176464, ~: 174474)
+OrderBookAddOrderTest:testAddOrderRealThreeStackCalculate(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 725463, ~: 718929)
+OrderBookAddOrderTest:testAddOrderRealTwoStackCalculateReverts(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 718735, ~: 712201)
+OrderBookClearHandleIORevertTest:testClearOrderHandleIO0() (gas: 637093)
+OrderBookClearHandleIORevertTest:testClearOrderHandleIO1() (gas: 619410)
+OrderBookClearHandleIORevertTest:testClearOrderHandleIO2() (gas: 619395)
+OrderBookClearHandleIORevertTest:testClearOrderHandleIO3() (gas: 637131)
+OrderBookClearHandleIORevertTest:testClearOrderHandleIO4() (gas: 650594)
+OrderBookClearHandleIORevertTest:testClearOrderHandleIO5() (gas: 560228)
+OrderBookClearTest:testClearSimple(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),uint256,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),uint256,address,address,uint256,uint256) (runs: 5096, μ: 571829, ~: 571538)
 OrderBookClearTest:testFlashLoanToNonReceiver(uint256,bytes,bytes32,bytes) (runs: 5096, μ: 28752, ~: 28661)
 OrderBookDepositTest:testDepositEvent(address,uint256,uint256) (runs: 5096, μ: 38710, ~: 38710)
-OrderBookDepositTest:testDepositFail(address,uint256,uint256) (runs: 5096, μ: 8937393460516740791, ~: 8937393460516740786)
+OrderBookDepositTest:testDepositFail(address,uint256,uint256) (runs: 5096, μ: 8937393460516740788, ~: 8937393460516740786)
 OrderBookDepositTest:testDepositGas00() (gas: 8176)
 OrderBookDepositTest:testDepositGas01() (gas: 34642)
-OrderBookDepositTest:testDepositMany((address,address,uint256,uint248)[]) (runs: 5096, μ: 5241523, ~: 4958934)
+OrderBookDepositTest:testDepositMany((address,address,uint256,uint248)[]) (runs: 5096, μ: 5149740, ~: 4820767)
 OrderBookDepositTest:testDepositOverflow(address,uint256,uint256,uint256) (runs: 5096, μ: 46667, ~: 46667)
-OrderBookDepositTest:testDepositReentrancy(address,uint256,uint256,address,uint256,uint256) (runs: 5096, μ: 596098, ~: 597676)
+OrderBookDepositTest:testDepositReentrancy(address,uint256,uint256,address,uint256,uint256) (runs: 5096, μ: 596141, ~: 597676)
 OrderBookDepositTest:testDepositSimple(address,uint256,uint256) (runs: 5096, μ: 37712, ~: 37712)
 OrderBookDepositTest:testDepositZero(address,uint256) (runs: 5096, μ: 12639, ~: 12639)
 OrderBookDepositTest:testVaultBalanceNoDeposits(address,uint256) (runs: 5096, μ: 6135, ~: 6135)
-OrderBookRemoveOrderMockTest:testRemoveOrderAddRemoveMulti(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 7247993, ~: 7174461)
-OrderBookRemoveOrderMockTest:testRemoveOrderDifferent(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 5046655, ~: 5004628)
-OrderBookRemoveOrderMockTest:testRemoveOrderDifferentOwners(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 4860524, ~: 4822798)
-OrderBookRemoveOrderMockTest:testRemoveOrderDifferentOwnersDifferent(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 10434451, ~: 10321656)
-OrderBookRemoveOrderMockTest:testRemoveOrderDoesNotExist(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 386436, ~: 384448)
-OrderBookRemoveOrderMockTest:testRemoveOrderOnlyOwner(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 2606450, ~: 2590636)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO0() (gas: 282916)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO1() (gas: 495749)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO10(uint256) (runs: 5096, μ: 878430, ~: 836750)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO2() (gas: 495915)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO3() (gas: 690855)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO4() (gas: 708540)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO5() (gas: 708561)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO6() (gas: 708353)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO7(uint256) (runs: 5096, μ: 1022470, ~: 1022199)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO8(uint256) (runs: 5096, μ: 1217981, ~: 1217713)
-OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO9(uint256) (runs: 5096, μ: 1020159, ~: 939210)
-OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputMultipleOrders(uint256,uint256) (runs: 5096, μ: 483323, ~: 501086)
-OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputMultipleOrdersMultipleOwners(uint256,uint256,uint256) (runs: 5096, μ: 532058, ~: 558239)
-OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleAnyDeposit(uint256,uint256) (runs: 5096, μ: 290502, ~: 295936)
-OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleOrderLessThanMaximumInput(uint256,uint256) (runs: 5096, μ: 275711, ~: 278060)
-OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleOrderLessThanMaximumOutput(uint256) (runs: 5096, μ: 275942, ~: 275876)
-OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleOrderUnlimitedMax(uint256) (runs: 5096, μ: 269545, ~: 269275)
+OrderBookRemoveOrderMockTest:testRemoveOrderAddRemoveMulti(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 7251567, ~: 7178043)
+OrderBookRemoveOrderMockTest:testRemoveOrderDifferent(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 5048742, ~: 5006707)
+OrderBookRemoveOrderMockTest:testRemoveOrderDifferentOwners(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 4862699, ~: 4824975)
+OrderBookRemoveOrderMockTest:testRemoveOrderDifferentOwnersDifferent(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 10439221, ~: 10325141)
+OrderBookRemoveOrderMockTest:testRemoveOrderDoesNotExist(address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 386341, ~: 384353)
+OrderBookRemoveOrderMockTest:testRemoveOrderOnlyOwner(address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),address) (runs: 5096, μ: 2607347, ~: 2591533)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO0() (gas: 286845)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO1() (gas: 499663)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO10(uint256) (runs: 5096, μ: 881707, ~: 837687)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO2() (gas: 499829)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO3() (gas: 694760)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO4() (gas: 712453)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO5() (gas: 712474)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO6() (gas: 712266)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO7(uint256) (runs: 5096, μ: 1029675, ~: 1029405)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO8(uint256) (runs: 5096, μ: 1225189, ~: 1224920)
+OrderBookTakeOrderHandleIORevertTest:testTakeOrderHandleIO9(uint256) (runs: 5096, μ: 1021085, ~: 938201)
+OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputMultipleOrders(uint256,uint256) (runs: 5096, μ: 485689, ~: 503562)
+OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputMultipleOrdersMultipleOwners(uint256,uint256,uint256) (runs: 5096, μ: 534273, ~: 560716)
+OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleAnyDeposit(uint256,uint256) (runs: 5096, μ: 292843, ~: 298422)
+OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleOrderLessThanMaximumInput(uint256,uint256) (runs: 5096, μ: 278253, ~: 280546)
+OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleOrderLessThanMaximumOutput(uint256) (runs: 5096, μ: 278432, ~: 278362)
+OrderBookTakeOrderMaximumInputTest:testTakeOrderMaximumInputSingleOrderUnlimitedMax(uint256) (runs: 5096, μ: 272028, ~: 271757)
 OrderBookTakeOrderMaximumInputTest:testTakeOrderNoopZeroMaxTakerInput((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),(address,uint256[],bytes)) (runs: 5096, μ: 185762, ~: 184115)
-OrderBookTakeOrderNoopTest:testTakeOrderNoopNonLiveOrderOne((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,uint256[],bytes)) (runs: 5096, μ: 429838, ~: 428425)
-OrderBookTakeOrderNoopTest:testTakeOrderNoopNonLiveOrderTwo((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256,(address,uint256[],bytes),(address,uint256[],bytes)) (runs: 5096, μ: 847255, ~: 844850)
+OrderBookTakeOrderNoopTest:testTakeOrderNoopNonLiveOrderOne((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,uint256[],bytes)) (runs: 5096, μ: 429868, ~: 428457)
+OrderBookTakeOrderNoopTest:testTakeOrderNoopNonLiveOrderTwo((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256,(address,uint256[],bytes),(address,uint256[],bytes)) (runs: 5096, μ: 847318, ~: 844873)
 OrderBookTakeOrderNoopTest:testTakeOrderNoopZeroOrders() (gas: 12358)
-OrderBookTakeOrderPrecisionTest:testTakeOrderPrecisionKnownBad01() (gas: 2629544)
-OrderBookTakeOrderTokenMismatchDecimalsTest:testTokenMismatchInputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 619265, ~: 615316)
-OrderBookTakeOrderTokenMismatchDecimalsTest:testTokenMismatchOutputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 619982, ~: 616076)
-OrderBookTakeOrderTokenMismatchTest:testTokenMismatchInputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 618233, ~: 615901)
-OrderBookTakeOrderTokenMismatchTest:testTokenMismatchOutputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 619563, ~: 617215)
+OrderBookTakeOrderPrecisionTest:testTakeOrderPrecisionKnownBad01() (gas: 2632077)
+OrderBookTakeOrderTokenMismatchDecimalsTest:testTokenMismatchInputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 619193, ~: 614892)
+OrderBookTakeOrderTokenMismatchDecimalsTest:testTokenMismatchOutputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 620134, ~: 616108)
+OrderBookTakeOrderTokenMismatchTest:testTokenMismatchInputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 618300, ~: 615952)
+OrderBookTakeOrderTokenMismatchTest:testTokenMismatchOutputs((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 619596, ~: 617164)
 OrderBookV3FlashLenderFeeTest:testFlashFee(address,uint256) (runs: 5096, μ: 3702, ~: 3702)
 OrderBookV3FlashLenderMaxFlashLoanTest:testFlashMaxLoan(uint256) (runs: 5096, μ: 7638, ~: 7638)
 OrderBookV3FlashLenderMockSuccessTest:testFlashLoanToReceiver(uint256,bytes) (runs: 5096, μ: 14721, ~: 14674)
-OrderBookV3FlashLenderReentrant:testReenterAddOrder(uint256,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 18621561, ~: 18497524)
-OrderBookV3FlashLenderReentrant:testReenterCheckOrderExists(bytes32,uint256) (runs: 5096, μ: 552771, ~: 553611)
-OrderBookV3FlashLenderReentrant:testReenterClear(uint256,address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 37709735, ~: 37616965)
-OrderBookV3FlashLenderReentrant:testReenterDeposit(uint256,uint256,uint256) (runs: 5096, μ: 628333, ~: 630052)
-OrderBookV3FlashLenderReentrant:testReenterReadVaultBalances(uint256,uint256) (runs: 5096, μ: 597383, ~: 598938)
-OrderBookV3FlashLenderReentrant:testReenterRemoveOrder(uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[])) (runs: 5096, μ: 17734084, ~: 17708028)
-OrderBookV3FlashLenderReentrant:testReenterTakeOrder(uint256,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 19224537, ~: 19063930)
-OrderBookV3FlashLenderReentrant:testReenterWithdraw(uint256,uint256,uint256) (runs: 5096, μ: 604691, ~: 606629)
+OrderBookV3FlashLenderReentrant:testReenterAddOrder(uint256,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 18620167, ~: 18493610)
+OrderBookV3FlashLenderReentrant:testReenterCheckOrderExists(bytes32,uint256) (runs: 5096, μ: 552732, ~: 553611)
+OrderBookV3FlashLenderReentrant:testReenterClear(uint256,address,address,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes),((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 37691976, ~: 37610240)
+OrderBookV3FlashLenderReentrant:testReenterDeposit(uint256,uint256,uint256) (runs: 5096, μ: 628422, ~: 630052)
+OrderBookV3FlashLenderReentrant:testReenterReadVaultBalances(uint256,uint256) (runs: 5096, μ: 597379, ~: 598938)
+OrderBookV3FlashLenderReentrant:testReenterRemoveOrder(uint256,(address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[])) (runs: 5096, μ: 17727199, ~: 17723209)
+OrderBookV3FlashLenderReentrant:testReenterTakeOrder(uint256,((address,uint8,uint256)[],(address,uint8,uint256)[],(address,bytes,uint256[]),bytes)) (runs: 5096, μ: 19227598, ~: 19079033)
+OrderBookV3FlashLenderReentrant:testReenterWithdraw(uint256,uint256,uint256) (runs: 5096, μ: 604742, ~: 606629)
 OrderBookV3FlashLenderTransferTest:testFlashLoanTransferFail(uint256,uint256,bool) (runs: 5096, μ: 1344450, ~: 1344917)
-OrderBookV3FlashLenderTransferTest:testFlashLoanTransferSuccess(uint256,bool) (runs: 5096, μ: 1288441, ~: 1297392)
+OrderBookV3FlashLenderTransferTest:testFlashLoanTransferSuccess(uint256,bool) (runs: 5096, μ: 1288429, ~: 1289421)
 OrderBookWithdrawTest:testWithdrawEmptyVault(address,address,uint256,uint256) (runs: 5096, μ: 15251, ~: 15251)
-OrderBookWithdrawTest:testWithdrawFailure(address,uint256,uint256,uint256) (runs: 5096, μ: 8937393460516716964, ~: 8937393460516698169)
-OrderBookWithdrawTest:testWithdrawFullVault(address,uint256,uint256,uint256) (runs: 5096, μ: 39264, ~: 39262)
+OrderBookWithdrawTest:testWithdrawFailure(address,uint256,uint256,uint256) (runs: 5096, μ: 8937393460516716949, ~: 8937393460516698157)
+OrderBookWithdrawTest:testWithdrawFullVault(address,uint256,uint256,uint256) (runs: 5096, μ: 39263, ~: 39262)
 OrderBookWithdrawTest:testWithdrawMany((bool,address,address,uint256,uint248)[]) (runs: 5096, μ: 3169906, ~: 3156574)
 OrderBookWithdrawTest:testWithdrawPartialVault(address,uint256,uint256,uint256) (runs: 5096, μ: 49439, ~: 49439)
 OrderBookWithdrawTest:testWithdrawZero(address,address,uint256) (runs: 5096, μ: 12809, ~: 12809)
-RouteProcessorOrderBookV3ArbOrderTakerTest:testMinimumOutput((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 332180, ~: 330641)
-RouteProcessorOrderBookV3ArbOrderTakerTest:testTakeOrdersSender((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 266353, ~: 265402)
\ No newline at end of file
+RouteProcessorOrderBookV3ArbOrderTakerTest:testRouteProcessorMinimumOutput((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256,uint256,uint256) (runs: 5096, μ: 332202, ~: 330538)
+RouteProcessorOrderBookV3ArbOrderTakerTest:testRouteProcessorTakeOrdersSender((address,bool,(address,address,address),(address,uint8,uint256)[],(address,uint8,uint256)[]),uint256,uint256) (runs: 5096, μ: 266376, ~: 265424)
\ No newline at end of file
diff --git a/script/DeployGenericPoolOrderBookV3FlashBorrower.sol b/script/DeployGenericPoolOrderBookV3FlashBorrower.sol
index b6abc9cc0..18860b0ca 100644
--- a/script/DeployGenericPoolOrderBookV3FlashBorrower.sol
+++ b/script/DeployGenericPoolOrderBookV3FlashBorrower.sol
@@ -2,7 +2,10 @@
 pragma solidity =0.8.19;
 
 import {Script, console2} from "forge-std/Script.sol";
-import {GenericPoolOrderBookV3FlashBorrower, DeployerDiscoverableMetaV3ConstructionConfig} from "src/concrete/GenericPoolOrderBookV3FlashBorrower.sol";
+import {
+    GenericPoolOrderBookV3FlashBorrower,
+    DeployerDiscoverableMetaV3ConstructionConfig
+} from "src/concrete/GenericPoolOrderBookV3FlashBorrower.sol";
 
 /// @title DeployGenericPoolOrderBookV3FlashBorrower
 /// @notice A script that deploys a `GenericPoolOrderBookV3FlashBorrower`. This
diff --git a/src/abstract/OrderBookV3FlashBorrower.sol b/src/abstract/OrderBookV3FlashBorrower.sol
index 487529ad6..dfb3f08d2 100644
--- a/src/abstract/OrderBookV3FlashBorrower.sol
+++ b/src/abstract/OrderBookV3FlashBorrower.sol
@@ -19,7 +19,9 @@ import {ON_FLASH_LOAN_CALLBACK_SUCCESS} from "../interface/ierc3156/IERC3156Flas
 import {IOrderBookV3, TakeOrdersConfigV2, NoOrders} from "../interface/unstable/IOrderBookV3.sol";
 import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/src/interface/ICloneableV2.sol";
 import {
-    IInterpreterV2, SourceIndexV2, DEFAULT_STATE_NAMESPACE
+    IInterpreterV2,
+    SourceIndexV2,
+    DEFAULT_STATE_NAMESPACE
 } from "rain.interpreter/src/interface/unstable/IInterpreterV2.sol";
 import {IERC3156FlashBorrower} from "../interface/ierc3156/IERC3156FlashBorrower.sol";
 import {IInterpreterStoreV1} from "rain.interpreter/src/interface/IInterpreterStoreV1.sol";
diff --git a/src/concrete/GenericPoolOrderBookV3FlashBorrower.sol b/src/concrete/GenericPoolOrderBookV3FlashBorrower.sol
index 9506f7d87..ea62e9cc3 100644
--- a/src/concrete/GenericPoolOrderBookV3FlashBorrower.sol
+++ b/src/concrete/GenericPoolOrderBookV3FlashBorrower.sol
@@ -9,7 +9,7 @@ import "src/abstract/OrderBookV3FlashBorrower.sol";
 /// @dev Metadata hash for `DeployerDiscoverableMetaV1`.
 /// - ABI for GenericPoolOrderBookV3FlashBorrower
 /// - Interpreter caller metadata V1 for GenericPoolOrderBookV3FlashBorrower
-bytes32 constant CALLER_META_HASH = bytes32(0xc527f81e4dac946943b3ffe7a99d82535b44a79eb92692159566eea43659365e);
+bytes32 constant CALLER_META_HASH = bytes32(0x5307fcdf3fa283e1e7d5d58baaa516cdefb10aba9eb23211d9cfb11afd6e4b4c);
 
 /// @title GenericPoolOrderBookV3FlashBorrower
 /// Implements the OrderBookV3FlashBorrower interface for a external liquidity
diff --git a/src/concrete/OrderBook.sol b/src/concrete/OrderBook.sol
index 89faed4fb..7bf43f22c 100644
--- a/src/concrete/OrderBook.sol
+++ b/src/concrete/OrderBook.sol
@@ -19,7 +19,9 @@ import {
     LibMeta
 } from "rain.interpreter/src/abstract/DeployerDiscoverableMetaV3.sol";
 import {LibBytecode} from "rain.interpreter/src/lib/bytecode/LibBytecode.sol";
-import {SourceIndexV2, StateNamespace, IInterpreterV2} from "rain.interpreter/src/interface/unstable/IInterpreterV2.sol";
+import {
+    SourceIndexV2, StateNamespace, IInterpreterV2
+} from "rain.interpreter/src/interface/unstable/IInterpreterV2.sol";
 import {
     IOrderBookV3,
     NoOrders,
@@ -297,10 +299,7 @@ contract OrderBook is IOrderBookV3, ReentrancyGuard, Multicall, OrderBookV3Flash
         (IInterpreterV2 interpreter, IInterpreterStoreV1 store, address expression, bytes memory io) = config
             .evaluableConfig
             .deployer
-            .deployExpression2(
-            config.evaluableConfig.bytecode,
-            config.evaluableConfig.constants
-        );
+            .deployExpression2(config.evaluableConfig.bytecode, config.evaluableConfig.constants);
         {
             uint256 calculateInputs;
             uint256 calculateOutputs;
@@ -742,7 +741,13 @@ contract OrderBook is IOrderBookV3, ReentrancyGuard, Multicall, OrderBookV3Flash
             (uint256[] memory calculateOrderStack, uint256[] memory calculateOrderKVs) = order
                 .evaluable
                 .interpreter
-                .eval2(order.evaluable.store, LibNamespace.qualifyNamespace(namespace, address(this)), _calculateOrderDispatch(order.evaluable.expression), context, new uint256[](0));
+                .eval2(
+                order.evaluable.store,
+                LibNamespace.qualifyNamespace(namespace, address(this)),
+                _calculateOrderDispatch(order.evaluable.expression),
+                context,
+                new uint256[](0)
+            );
 
             Output18Amount orderOutputMax18 = Output18Amount.wrap(calculateOrderStack[1]);
             uint256 orderIORatio = calculateOrderStack[0];
diff --git a/src/interface/unstable/IOrderBookV3.sol b/src/interface/unstable/IOrderBookV3.sol
index b4676f3c7..5516eb773 100644
--- a/src/interface/unstable/IOrderBookV3.sol
+++ b/src/interface/unstable/IOrderBookV3.sol
@@ -2,10 +2,12 @@
 pragma solidity ^0.8.18;
 
 import "../ierc3156/IERC3156FlashLender.sol";
+import {IExpressionDeployerV3, EvaluableV2} from "lib/rain.interpreter/src/lib/caller/LibEvaluable.sol";
 import {
-    IExpressionDeployerV3, EvaluableV2
-} from "lib/rain.interpreter/src/lib/caller/LibEvaluable.sol";
-import {EvaluableConfigV3, IInterpreterCallerV2, SignedContextV1} from "lib/rain.interpreter/src/interface/IInterpreterCallerV2.sol";
+    EvaluableConfigV3,
+    IInterpreterCallerV2,
+    SignedContextV1
+} from "lib/rain.interpreter/src/interface/IInterpreterCallerV2.sol";
 
 /// Import unmodified structures from older versions of `IOrderBook`.
 import {IO, ClearConfig, ClearStateChange} from "../deprecated/IOrderBookV2.sol";
diff --git a/test/concrete/GenericPoolOrderBookV3ArbOrderTaker.sender.t.sol b/test/concrete/GenericPoolOrderBookV3ArbOrderTaker.sender.t.sol
index 1773bea2e..2c3b9b7de 100644
--- a/test/concrete/GenericPoolOrderBookV3ArbOrderTaker.sender.t.sol
+++ b/test/concrete/GenericPoolOrderBookV3ArbOrderTaker.sender.t.sol
@@ -27,7 +27,9 @@ contract GenericPoolOrderBookV3ArbOrderTakerTest is ArbTest {
         );
     }
 
-    function testGenericPoolTakeOrdersSender(OrderV2 memory order, uint256 inputIOIndex, uint256 outputIOIndex) public {
+    function testGenericPoolTakeOrdersSender(OrderV2 memory order, uint256 inputIOIndex, uint256 outputIOIndex)
+        public
+    {
         TakeOrderConfigV2[] memory orders = buildTakeOrderConfig(order, inputIOIndex, outputIOIndex);
 
         GenericPoolOrderBookV3ArbOrderTaker(iArb).arb(
diff --git a/test/concrete/GenericPoolOrderBookV3FlashBorrower.sender.t.sol b/test/concrete/GenericPoolOrderBookV3FlashBorrower.sender.t.sol
index b022b7721..4b088e914 100644
--- a/test/concrete/GenericPoolOrderBookV3FlashBorrower.sender.t.sol
+++ b/test/concrete/GenericPoolOrderBookV3FlashBorrower.sender.t.sol
@@ -27,7 +27,11 @@ contract GenericPoolOrderBookV3FlashBorrowerTest is ArbTest {
         );
     }
 
-    function testTakeOrdersSender(OrderV2 memory order, uint256 inputIOIndex, uint256 outputIOIndex) public {
+    function testGenericPoolOrderBookV3FlashBorrowerTakeOrdersSender(
+        OrderV2 memory order,
+        uint256 inputIOIndex,
+        uint256 outputIOIndex
+    ) public {
         TakeOrderConfigV2[] memory orders = buildTakeOrderConfig(order, inputIOIndex, outputIOIndex);
 
         GenericPoolOrderBookV3FlashBorrower(iArb).arb(
@@ -37,7 +41,7 @@ contract GenericPoolOrderBookV3FlashBorrowerTest is ArbTest {
         );
     }
 
-    function testMinimumOutput(
+    function testGenericPoolOrderBookV3FlashBorrowerMinimumOutput(
         OrderV2 memory order,
         uint256 inputIOIndex,
         uint256 outputIOIndex,
diff --git a/test/concrete/OrderBook.clear.handleIO.revert.t.sol b/test/concrete/OrderBook.clear.handleIO.revert.t.sol
index ba14f5de7..733c4e7a1 100644
--- a/test/concrete/OrderBook.clear.handleIO.revert.t.sol
+++ b/test/concrete/OrderBook.clear.handleIO.revert.t.sol
@@ -2,9 +2,7 @@
 pragma solidity =0.8.19;
 
 import {Vm} from "forge-std/Vm.sol";
-import {
-    OrderBookExternalRealTest
-} from "test/util/abstract/OrderBookExternalRealTest.sol";
+import {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol";
 import {ClearConfig, OrderV2, TakeOrderConfigV2, IO, OrderConfigV2} from "src/interface/unstable/IOrderBookV3.sol";
 import {SignedContextV1, EvaluableConfigV3} from "rain.interpreter/src/interface/IInterpreterCallerV2.sol";
 import {IParserV1} from "rain.interpreter/src/interface/IParserV1.sol";
diff --git a/test/concrete/OrderBook.takeOrder.handleIO.revert.t.sol b/test/concrete/OrderBook.takeOrder.handleIO.revert.t.sol
index 532ac4b42..2562d1cf4 100644
--- a/test/concrete/OrderBook.takeOrder.handleIO.revert.t.sol
+++ b/test/concrete/OrderBook.takeOrder.handleIO.revert.t.sol
@@ -2,10 +2,15 @@
 pragma solidity =0.8.19;
 
 import {Vm} from "forge-std/Vm.sol";
+import {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol";
 import {
-    OrderBookExternalRealTest
-} from "test/util/abstract/OrderBookExternalRealTest.sol";
-import {ClearConfig, OrderV2, TakeOrderConfigV2, IO, OrderConfigV2, TakeOrdersConfigV2} from "src/interface/unstable/IOrderBookV3.sol";
+    ClearConfig,
+    OrderV2,
+    TakeOrderConfigV2,
+    IO,
+    OrderConfigV2,
+    TakeOrdersConfigV2
+} from "src/interface/unstable/IOrderBookV3.sol";
 import {EnsureFailed} from "rain.interpreter/src/lib/op/logic/LibOpEnsureNP.sol";
 import {IParserV1} from "rain.interpreter/src/interface/IParserV1.sol";
 import {SignedContextV1, EvaluableConfigV3} from "rain.interpreter/src/interface/IInterpreterCallerV2.sol";
diff --git a/test/concrete/OrderBook.takeOrder.precision.t.sol b/test/concrete/OrderBook.takeOrder.precision.t.sol
index f01aaee6b..27273344c 100644
--- a/test/concrete/OrderBook.takeOrder.precision.t.sol
+++ b/test/concrete/OrderBook.takeOrder.precision.t.sol
@@ -2,10 +2,10 @@
 pragma solidity =0.8.19;
 
 import {Vm} from "forge-std/Test.sol";
+import {OrderBookExternalRealTest} from "test/util/abstract/OrderBookExternalRealTest.sol";
 import {
-    OrderBookExternalRealTest
-} from "test/util/abstract/OrderBookExternalRealTest.sol";
-import {OrderV2, TakeOrdersConfigV2, TakeOrderConfigV2, IO, OrderConfigV2} from "src/interface/unstable/IOrderBookV3.sol";
+    OrderV2, TakeOrdersConfigV2, TakeOrderConfigV2, IO, OrderConfigV2
+} from "src/interface/unstable/IOrderBookV3.sol";
 import {IParserV1} from "rain.interpreter/src/interface/IParserV1.sol";
 import {SignedContextV1, EvaluableConfigV3} from "rain.interpreter/src/interface/IInterpreterCallerV2.sol";
 
diff --git a/test/concrete/RouteProcessorOrderBookV3ArbOrderTaker.sender.t.sol b/test/concrete/RouteProcessorOrderBookV3ArbOrderTaker.sender.t.sol
index d98dc528b..a5f649f53 100644
--- a/test/concrete/RouteProcessorOrderBookV3ArbOrderTaker.sender.t.sol
+++ b/test/concrete/RouteProcessorOrderBookV3ArbOrderTaker.sender.t.sol
@@ -30,7 +30,9 @@ contract RouteProcessorOrderBookV3ArbOrderTakerTest is ArbTest {
         );
     }
 
-    function testRouteProcessorTakeOrdersSender(OrderV2 memory order, uint256 inputIOIndex, uint256 outputIOIndex) public {
+    function testRouteProcessorTakeOrdersSender(OrderV2 memory order, uint256 inputIOIndex, uint256 outputIOIndex)
+        public
+    {
         TakeOrderConfigV2[] memory orders = buildTakeOrderConfig(order, inputIOIndex, outputIOIndex);
 
         RouteProcessorOrderBookV3ArbOrderTaker(iArb).arb(
diff --git a/test/util/abstract/IOrderBookV3Stub.sol b/test/util/abstract/IOrderBookV3Stub.sol
index f8e63659d..963543d73 100644
--- a/test/util/abstract/IOrderBookV3Stub.sol
+++ b/test/util/abstract/IOrderBookV3Stub.sol
@@ -20,10 +20,13 @@ abstract contract IOrderBookV3Stub is IOrderBookV3 {
     }
 
     /// @inheritdoc IOrderBookV3
-    function clear(OrderV2 memory, OrderV2 memory, ClearConfig calldata, SignedContextV1[] memory, SignedContextV1[] memory)
-        external
-        pure
-    {
+    function clear(
+        OrderV2 memory,
+        OrderV2 memory,
+        ClearConfig calldata,
+        SignedContextV1[] memory,
+        SignedContextV1[] memory
+    ) external pure {
         revert("clear");
     }
 
diff --git a/test/util/abstract/OrderBookExternalMockTest.sol b/test/util/abstract/OrderBookExternalMockTest.sol
index 016182600..85f11f5c6 100644
--- a/test/util/abstract/OrderBookExternalMockTest.sol
+++ b/test/util/abstract/OrderBookExternalMockTest.sol
@@ -17,7 +17,8 @@ import {IOrderBookV3, OrderConfigV2, OrderV2} from "src/interface/unstable/IOrde
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import {LibOrder} from "src/lib/LibOrder.sol";
 import {OrderBook} from "src/concrete/OrderBook.sol";
-import {DeployerDiscoverableMetaV3ConstructionConfig} from "rain.interpreter/src/abstract/DeployerDiscoverableMetaV3.sol";
+import {DeployerDiscoverableMetaV3ConstructionConfig} from
+    "rain.interpreter/src/abstract/DeployerDiscoverableMetaV3.sol";
 
 /// @title OrderBookExternalTest
 /// Abstract contract that performs common setup needed for testing an orderbook
diff --git a/test/util/abstract/OrderBookExternalRealTest.sol b/test/util/abstract/OrderBookExternalRealTest.sol
index e451b7edb..deb2fed34 100644
--- a/test/util/abstract/OrderBookExternalRealTest.sol
+++ b/test/util/abstract/OrderBookExternalRealTest.sol
@@ -4,7 +4,10 @@ pragma solidity =0.8.19;
 import {Test, Vm, console2} from "forge-std/Test.sol";
 import {RainterpreterNPE2} from "rain.interpreter/src/concrete/RainterpreterNPE2.sol";
 import {RainterpreterStoreNPE2} from "rain.interpreter/src/concrete/RainterpreterStoreNPE2.sol";
-import {RainterpreterExpressionDeployerNPE2, RainterpreterExpressionDeployerNPE2ConstructionConfig} from "rain.interpreter/src/concrete/RainterpreterExpressionDeployerNPE2.sol";
+import {
+    RainterpreterExpressionDeployerNPE2,
+    RainterpreterExpressionDeployerNPE2ConstructionConfig
+} from "rain.interpreter/src/concrete/RainterpreterExpressionDeployerNPE2.sol";
 import {LibAllStandardOpsNP} from "rain.interpreter/src/lib/op/LibAllStandardOpsNP.sol";
 import {REVERTING_MOCK_BYTECODE} from "test/util/lib/LibTestConstants.sol";
 import {ORDER_BOOK_META_PATH} from "test/util/lib/LibOrderBookConstants.sol";