diff --git a/.gas-snapshot b/.gas-snapshot
index b51adc99..92ca76c7 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,24 +1,24 @@
-IntegrationTestCaveats:testInvalidCaveatLength() (gas: 136392)
-IntegrationTestCaveats:testInvalidCaveats() (gas: 168369)
-IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 341270)
-IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 291935)
-IntegrationTestCaveats:testOriginateWCaveatsAsBorrower() (gas: 315793)
-IntegrationTestCaveats:testOriginateWCaveatsExpired() (gas: 165568)
-IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 174350)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 299632)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 148201)
-IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 292055)
-IntegrationTestCaveats:testRefinanceAsLender() (gas: 1071391)
-IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 423956)
-IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 363371)
-IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 474530)
-IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 393396)
-IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 420544)
-ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 447587)
-ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 450477)
-ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 446599)
-ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 447398)
-ModuleTesting:testModuleValidation() (gas: 1283844)
+IntegrationTestCaveats:testInvalidCaveatLength() (gas: 130462)
+IntegrationTestCaveats:testInvalidCaveats() (gas: 162492)
+IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 333065)
+IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 283734)
+IntegrationTestCaveats:testOriginateWCaveatsAsBorrower() (gas: 307193)
+IntegrationTestCaveats:testOriginateWCaveatsExpired() (gas: 159743)
+IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 168532)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 285255)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 142384)
+IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 283854)
+IntegrationTestCaveats:testRefinanceAsLender() (gas: 1054269)
+IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 408850)
+IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 348456)
+IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 457486)
+IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 378176)
+IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 403428)
+ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 438951)
+ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 441840)
+ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 437963)
+ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 438762)
+ModuleTesting:testModuleValidation() (gas: 1275150)
 PausableNonReentrantImpl:test() (gas: 2464)
 PausableNonReentrantImpl:testReentrancy() (gas: 2757)
 TestBorrowerEnforcer:testBERevertAdditionalTransfersFromBorrower() (gas: 76462)
@@ -34,8 +34,8 @@ TestCustodian:testGenerateOrderInvalidPostRepayment() (gas: 173121)
 TestCustodian:testGenerateOrderInvalidPostSettlement() (gas: 163220)
 TestCustodian:testGenerateOrderRepay() (gas: 177276)
 TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 193762)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 894122)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 823702)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 876401)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 805987)
 TestCustodian:testGenerateOrderRepayInvalidHookAddress() (gas: 97653)
 TestCustodian:testGenerateOrderRepayInvalidHookReturnType() (gas: 92014)
 TestCustodian:testGenerateOrderRepayNotBorrower() (gas: 106933)
@@ -43,13 +43,13 @@ TestCustodian:testGenerateOrderSettlement() (gas: 154953)
 TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 160350)
 TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 163420)
 TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 101861)
-TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 471018)
+TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 462318)
 TestCustodian:testGetBorrower() (gas: 78643)
 TestCustodian:testInvalidAction() (gas: 173340)
 TestCustodian:testInvalidActionRepayInActiveLoan() (gas: 130184)
 TestCustodian:testInvalidActionSettleActiveLoan() (gas: 130144)
 TestCustodian:testInvalidEncodedData() (gas: 26170)
-TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 372602)
+TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 363996)
 TestCustodian:testMintWithApprovalSetAsBorrowerInvalidLoan() (gas: 60792)
 TestCustodian:testMintWithApprovalSetNotAuthorized() (gas: 76701)
 TestCustodian:testName() (gas: 7121)
@@ -71,82 +71,82 @@ TestLenderEnforcer:testLERevertInvalidLoanTerms() (gas: 81096)
 TestLenderEnforcer:testLEValidLoanTerms() (gas: 72169)
 TestLenderEnforcer:testLEValidLoanTermsAnyBorrower() (gas: 72323)
 TestLenderEnforcer:testLEValidLoanTermsWithAdditionalTransfers() (gas: 73525)
-TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 601541)
-TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 608735)
-TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 599998)
-TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 589868)
-TestNewLoan:testBuyNowPayLater() (gas: 3028328)
-TestNewLoan:testInvalidSenderBNPL() (gas: 1759020)
-TestNewLoan:testInvalidUserDataHashBNPL() (gas: 1761621)
-TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 877948)
-TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 894378)
-TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 439228)
-TestNewLoan:testNewLoanRefinance() (gas: 609112)
-TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 334419)
-TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 393605)
-TestNewLoan:testSettleLoan() (gas: 651031)
+TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 592848)
+TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 600039)
+TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 591288)
+TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 581172)
+TestNewLoan:testBuyNowPayLater() (gas: 2874813)
+TestNewLoan:testInvalidSenderBNPL() (gas: 1613098)
+TestNewLoan:testInvalidUserDataHashBNPL() (gas: 1615699)
+TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 874782)
+TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 886047)
+TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 430463)
+TestNewLoan:testNewLoanRefinance() (gas: 591211)
+TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 325552)
+TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 384794)
+TestNewLoan:testSettleLoan() (gas: 642220)
 TestPausableNonReentrant:testNotOwner() (gas: 21254)
 TestPausableNonReentrant:testPauseAndUnpause() (gas: 22621)
 TestPausableNonReentrant:testReentrancy() (gas: 15404)
 TestPausableNonReentrant:testUnpauseWhenNotPaused() (gas: 12582)
-TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 673314)
-TestRepayLoan:testRepayLoanBase() (gas: 609538)
-TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 448315)
-TestRepayLoan:testRepayLoanInSettlement() (gas: 595181)
-TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 613671)
-TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 868531)
+TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 664607)
+TestRepayLoan:testRepayLoanBase() (gas: 600831)
+TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 439605)
+TestRepayLoan:testRepayLoanInSettlement() (gas: 586342)
+TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 604879)
+TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 859630)
 TestSimpleInterestPricing:test_calculateInterest() (gas: 899536)
 TestSimpleInterestPricing:test_getPaymentConsideration() (gas: 946746)
 TestSimpleInterestPricing:test_getRefinanceConsideration() (gas: 937602)
 TestStarport:testAcquireTokensFail() (gas: 60430)
 TestStarport:testAcquireTokensSuccess() (gas: 162977)
 TestStarport:testActive() (gas: 69291)
-TestStarport:testAdditionalTransfers() (gas: 309370)
-TestStarport:testAdditionalTransfersOriginate() (gas: 284066)
-TestStarport:testAdditionalTransfersRefinance() (gas: 226704)
+TestStarport:testAdditionalTransfers() (gas: 301168)
+TestStarport:testAdditionalTransfersOriginate() (gas: 275864)
+TestStarport:testAdditionalTransfersRefinance() (gas: 218277)
 TestStarport:testApplyRefinanceConsiderationToLoanMalformed() (gas: 129820)
-TestStarport:testCannotIssueSameLoanTwice() (gas: 379383)
-TestStarport:testCannotOriginateWhilePaused() (gas: 79481)
+TestStarport:testCannotIssueSameLoanTwice() (gas: 364949)
+TestStarport:testCannotOriginateWhilePaused() (gas: 73545)
 TestStarport:testCannotSettleInvalidLoan() (gas: 74881)
 TestStarport:testCannotSettleUnlessValidCustodian() (gas: 70941)
-TestStarport:testCaveatEnforcerRevert() (gas: 106536)
-TestStarport:testDefaultFeeRake1() (gas: 397222)
-TestStarport:testDefaultFeeRakeExoticDebt() (gas: 407043)
+TestStarport:testCaveatEnforcerRevert() (gas: 100726)
+TestStarport:testDefaultFeeRake1() (gas: 388604)
+TestStarport:testDefaultFeeRakeExoticDebt() (gas: 398431)
 TestStarport:testEIP712Signing() (gas: 83377)
-TestStarport:testExoticDebtWithCustomPricingAndRepayment() (gas: 1247118)
-TestStarport:testExoticDebtWithCustomPricingAndSettlement() (gas: 1702068)
-TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 386146)
+TestStarport:testExoticDebtWithCustomPricingAndRepayment() (gas: 1238218)
+TestStarport:testExoticDebtWithCustomPricingAndSettlement() (gas: 1693177)
+TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 377266)
 TestStarport:testIncrementCaveatNonce() (gas: 35316)
 TestStarport:testInitializedFlagSetProperly() (gas: 67416)
-TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 236662)
-TestStarport:testInvalidAdditionalTransfersRefinance() (gas: 177007)
-TestStarport:testInvalidAmountCollateral() (gas: 172176)
-TestStarport:testInvalidAmountCollateral721() (gas: 172176)
-TestStarport:testInvalidItemType() (gas: 158123)
-TestStarport:testInvalidTransferLengthCollateral() (gas: 160442)
-TestStarport:testInvalidTransferLengthDebt() (gas: 182240)
-TestStarport:testInvalidateCaveatSalt() (gas: 33417)
-TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 270496)
-TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 299027)
-TestStarport:testNonPayableFunctions() (gas: 112909)
-TestStarport:testOverrideFeeRake() (gas: 393462)
+TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 230839)
+TestStarport:testInvalidAdditionalTransfersRefinance() (gas: 170859)
+TestStarport:testInvalidAmountCollateral() (gas: 166358)
+TestStarport:testInvalidAmountCollateral721() (gas: 166358)
+TestStarport:testInvalidItemType() (gas: 152306)
+TestStarport:testInvalidTransferLengthCollateral() (gas: 154596)
+TestStarport:testInvalidTransferLengthDebt() (gas: 176395)
+TestStarport:testInvalidateCaveatSalt() (gas: 33428)
+TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 264679)
+TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 290826)
+TestStarport:testNonPayableFunctions() (gas: 112450)
+TestStarport:testOverrideFeeRake() (gas: 384850)
 TestStarport:testPause() (gas: 18215)
-TestStarport:testRefinancePostRepaymentFails() (gas: 133975)
+TestStarport:testRefinancePostRepaymentFails() (gas: 128036)
 TestStarport:testStargateGetOwner() (gas: 8808)
-TestStarport:testTokenNoCodeCollateral() (gas: 156958)
-TestStarport:testTokenNoCodeDebt() (gas: 187209)
+TestStarport:testTokenNoCodeCollateral() (gas: 151141)
+TestStarport:testTokenNoCodeDebt() (gas: 181392)
 TestStarport:testUnpause() (gas: 17297)
-TestStrategistOriginator:testEncodeWithAccountCounter() (gas: 12305)
-TestStrategistOriginator:testGetStrategistData() (gas: 1675537)
+TestStrategistOriginator:testEncodeWithAccountCounter() (gas: 12307)
+TestStrategistOriginator:testGetStrategistData() (gas: 1511582)
 TestStrategistOriginator:testIncrementCounterAsStrategist() (gas: 18676)
 TestStrategistOriginator:testIncrementCounterNotAuthorized() (gas: 13401)
-TestStrategistOriginator:testInvalidCollateral() (gas: 211212)
-TestStrategistOriginator:testInvalidDeadline() (gas: 216963)
-TestStrategistOriginator:testInvalidDebt() (gas: 212908)
-TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 213259)
-TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 213592)
-TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 213524)
-TestStrategistOriginator:testInvalidDebtLength() (gas: 212134)
-TestStrategistOriginator:testInvalidOffer() (gas: 436509)
-TestStrategistOriginator:testInvalidSigner() (gas: 215301)
-TestStrategistOriginator:testSetStrategist() (gas: 17768)
\ No newline at end of file
+TestStrategistOriginator:testInvalidCollateral() (gas: 210724)
+TestStrategistOriginator:testInvalidDeadline() (gas: 216403)
+TestStrategistOriginator:testInvalidDebt() (gas: 212384)
+TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 212723)
+TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 213044)
+TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 212976)
+TestStrategistOriginator:testInvalidDebtLength() (gas: 211651)
+TestStrategistOriginator:testInvalidOffer() (gas: 427136)
+TestStrategistOriginator:testInvalidSigner() (gas: 214830)
+TestStrategistOriginator:testSetStrategist() (gas: 17774)
\ No newline at end of file