diff --git a/.gas-snapshot b/.gas-snapshot
index 4121ef5b..85aec0d8 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,28 +1,28 @@
-IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 369613)
-IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 323372)
-IntegrationTestCaveats:testOriginateWCaveats() (gas: 297466)
+IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 369661)
+IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 323396)
+IntegrationTestCaveats:testOriginateWCaveats() (gas: 297490)
 IntegrationTestCaveats:testOriginateWCaveatsExpired() (gas: 177232)
 IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 205798)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 303717)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 303741)
 IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 179719)
-IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 323448)
-IntegrationTestCaveats:testRefinanceAsLender() (gas: 1088462)
-IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 437545)
-IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 384815)
-IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 495425)
-IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 414216)
-IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 437545)
-ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 436187)
-ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 439054)
-ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 435177)
-ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 435998)
-ModuleTesting:testModuleValidation() (gas: 1272828)
+IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 323472)
+IntegrationTestCaveats:testRefinanceAsLender() (gas: 1088486)
+IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 437593)
+IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 384839)
+IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 495473)
+IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 414240)
+IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 437569)
+ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 436235)
+ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 439102)
+ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 435225)
+ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 436046)
+ModuleTesting:testModuleValidation() (gas: 1272876)
 PausableNonReentrantImpl:test() (gas: 2442)
 PausableNonReentrantImpl:testReentrancy() (gas: 2735)
-TestBorrowerEnforcer:testBERevertAdditionalTransfers() (gas: 75662)
-TestBorrowerEnforcer:testBERevertInvalidLoanTerms() (gas: 80937)
-TestBorrowerEnforcer:testBEValidLoanTerms() (gas: 72021)
-TestBorrowerEnforcer:testBEValidLoanTermsAnyIssuer() (gas: 72085)
+TestBorrowerEnforcer:testBERevertAdditionalTransfers() (gas: 75686)
+TestBorrowerEnforcer:testBERevertInvalidLoanTerms() (gas: 80961)
+TestBorrowerEnforcer:testBEValidLoanTerms() (gas: 72045)
+TestBorrowerEnforcer:testBEValidLoanTermsAnyIssuer() (gas: 72109)
 TestCustodian:testCannotLazyMintTwice() (gas: 78796)
 TestCustodian:testCannotMintInvalidLoanInvalidCustodian() (gas: 69031)
 TestCustodian:testCannotMintInvalidLoanValidCustodian() (gas: 74555)
@@ -32,8 +32,8 @@ TestCustodian:testGenerateOrderInvalidPostRepayment() (gas: 173324)
 TestCustodian:testGenerateOrderInvalidPostSettlement() (gas: 163179)
 TestCustodian:testGenerateOrderRepay() (gas: 177479)
 TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 193948)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 874180)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 803573)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 874228)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 803621)
 TestCustodian:testGenerateOrderRepayInvalidHookAddress() (gas: 97601)
 TestCustodian:testGenerateOrderRepayInvalidHookReturnType() (gas: 91984)
 TestCustodian:testGenerateOrderRepayNotBorrower() (gas: 106839)
@@ -41,13 +41,13 @@ TestCustodian:testGenerateOrderSettlement() (gas: 154934)
 TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 160331)
 TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 163342)
 TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 101813)
-TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 461053)
+TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 461077)
 TestCustodian:testGetBorrower() (gas: 78641)
 TestCustodian:testInvalidAction() (gas: 173284)
 TestCustodian:testInvalidActionRepayInActiveLoan() (gas: 130104)
 TestCustodian:testInvalidActionSettleActiveLoan() (gas: 130086)
 TestCustodian:testInvalidEncodedData() (gas: 26192)
-TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 362794)
+TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 362821)
 TestCustodian:testMintWithApprovalSetAsBorrowerInvalidLoan() (gas: 60792)
 TestCustodian:testMintWithApprovalSetNotAuthorized() (gas: 76759)
 TestCustodian:testName() (gas: 7121)
@@ -64,69 +64,69 @@ TestCustodian:testSupportsInterface() (gas: 9428)
 TestCustodian:testSymbol() (gas: 7105)
 TestCustodian:testTokenURI() (gas: 67024)
 TestCustodian:testTokenURIInvalidLoan() (gas: 13151)
-TestLenderEnforcer:testLERevertAdditionalTransfersFromLender() (gas: 76210)
-TestLenderEnforcer:testLERevertInvalidLoanTerms() (gas: 80962)
-TestLenderEnforcer:testLEValidLoanTerms() (gas: 71955)
-TestLenderEnforcer:testLEValidLoanTermsAnyBorrower() (gas: 72087)
-TestLenderEnforcer:testLEValidLoanTermsWithAdditionalTransfers() (gas: 73310)
-TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 589926)
-TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 597139)
-TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 588220)
-TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 578030)
-TestNewLoan:testBuyNowPayLater() (gas: 2872541)
+TestLenderEnforcer:testLERevertAdditionalTransfersFromLender() (gas: 76234)
+TestLenderEnforcer:testLERevertInvalidLoanTerms() (gas: 80986)
+TestLenderEnforcer:testLEValidLoanTerms() (gas: 71979)
+TestLenderEnforcer:testLEValidLoanTermsAnyBorrower() (gas: 72111)
+TestLenderEnforcer:testLEValidLoanTermsWithAdditionalTransfers() (gas: 73334)
+TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 589974)
+TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 597187)
+TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 588268)
+TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 578078)
+TestNewLoan:testBuyNowPayLater() (gas: 2872565)
 TestNewLoan:testInvalidSenderBNPL() (gas: 1613720)
 TestNewLoan:testInvalidUserDataHashBNPL() (gas: 1616299)
-TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 864172)
-TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 873557)
-TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 427351)
-TestNewLoan:testNewLoanRefinance() (gas: 588882)
+TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 864196)
+TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 873605)
+TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 427399)
+TestNewLoan:testNewLoanRefinance() (gas: 588930)
 TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 328439)
-TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 384733)
-TestNewLoan:testSettleLoan() (gas: 639410)
+TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 384757)
+TestNewLoan:testSettleLoan() (gas: 639458)
 TestPausableNonReentrant:testNotOwner() (gas: 21254)
 TestPausableNonReentrant:testPauseAndUnpause() (gas: 22555)
 TestPausableNonReentrant:testReentrancy() (gas: 15360)
 TestPausableNonReentrant:testUnpauseWhenNotPaused() (gas: 12582)
-TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 661916)
-TestRepayLoan:testRepayLoanBase() (gas: 598119)
-TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 436382)
-TestRepayLoan:testRepayLoanInSettlement() (gas: 583446)
-TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 601777)
-TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 857426)
+TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 661964)
+TestRepayLoan:testRepayLoanBase() (gas: 598167)
+TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 436430)
+TestRepayLoan:testRepayLoanInSettlement() (gas: 583494)
+TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 601825)
+TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 857474)
 TestSimpleInterestPricing:test_calculateInterest() (gas: 895930)
 TestSimpleInterestPricing:test_getPaymentConsideration() (gas: 943140)
 TestSimpleInterestPricing:test_getRefinanceConsideration() (gas: 933907)
 TestStarport:testActive() (gas: 69320)
-TestStarport:testAdditionalTransfers() (gas: 301282)
-TestStarport:testAdditionalTransfersOriginate() (gas: 276000)
+TestStarport:testAdditionalTransfers() (gas: 301306)
+TestStarport:testAdditionalTransfersOriginate() (gas: 276024)
 TestStarport:testAdditionalTransfersRefinance() (gas: 214275)
 TestStarport:testApplyRefinanceConsiderationToLoanMalformed() (gas: 121896)
-TestStarport:testCannotIssueSameLoanTwice() (gas: 364572)
+TestStarport:testCannotIssueSameLoanTwice() (gas: 364620)
 TestStarport:testCannotOriginateWhilePaused() (gas: 73457)
 TestStarport:testCannotSettleInvalidLoan() (gas: 74915)
 TestStarport:testCannotSettleUnlessValidCustodian() (gas: 70985)
 TestStarport:testCaveatEnforcerRevert() (gas: 99214)
-TestStarport:testDefaultFeeRake() (gas: 361421)
-TestStarport:testDefaultFeeRakeExoticDebt() (gas: 370933)
-TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 377404)
+TestStarport:testDefaultFeeRake() (gas: 361445)
+TestStarport:testDefaultFeeRakeExoticDebt() (gas: 370957)
+TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 377428)
 TestStarport:testIncrementCaveatNonce() (gas: 35208)
 TestStarport:testInitializedFlagSetProperly() (gas: 67393)
-TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 228469)
+TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 228493)
 TestStarport:testInvalidAdditionalTransfersRefinance() (gas: 163974)
-TestStarport:testInvalidAmountCollateral() (gas: 163481)
-TestStarport:testInvalidAmountCollateral721() (gas: 163481)
-TestStarport:testInvalidItemType() (gas: 149429)
-TestStarport:testInvalidTransferLengthCollateral() (gas: 151635)
-TestStarport:testInvalidTransferLengthDebt() (gas: 173436)
+TestStarport:testInvalidAmountCollateral() (gas: 163505)
+TestStarport:testInvalidAmountCollateral721() (gas: 163505)
+TestStarport:testInvalidItemType() (gas: 149453)
+TestStarport:testInvalidTransferLengthCollateral() (gas: 151659)
+TestStarport:testInvalidTransferLengthDebt() (gas: 173460)
 TestStarport:testInvalidateCaveatSalt() (gas: 33463)
-TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 264447)
-TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 290660)
+TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 264471)
+TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 290684)
 TestStarport:testNonPayableFunctions() (gas: 112043)
-TestStarport:testOverrideFeeRake() (gas: 357317)
+TestStarport:testOverrideFeeRake() (gas: 357341)
 TestStarport:testPause() (gas: 18093)
 TestStarport:testRefinancePostRepaymentFails() (gas: 120803)
-TestStarport:testTokenNoCodeCollateral() (gas: 148242)
-TestStarport:testTokenNoCodeDebt() (gas: 178649)
+TestStarport:testTokenNoCodeCollateral() (gas: 148266)
+TestStarport:testTokenNoCodeDebt() (gas: 178673)
 TestStarport:testUnpause() (gas: 17198)
 TestStrategistOriginator:testEncodeWithAccountCounter() (gas: 12307)
 TestStrategistOriginator:testGetStrategistData() (gas: 1489933)
@@ -139,6 +139,6 @@ TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 2117
 TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 212095)
 TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 212049)
 TestStrategistOriginator:testInvalidDebtLength() (gas: 210678)
-TestStrategistOriginator:testInvalidOffer() (gas: 427302)
+TestStrategistOriginator:testInvalidOffer() (gas: 427326)
 TestStrategistOriginator:testInvalidSigner() (gas: 214006)
 TestStrategistOriginator:testSetStrategist() (gas: 17796)
\ No newline at end of file