diff --git a/.gas-snapshot b/.gas-snapshot
index 8829d0d5..2a857647 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,103 +1,96 @@
-AllowanceTransferInvariants:invariant_balanceEqualsSpent() (runs: 256, calls: 3840, reverts: 886)
-AllowanceTransferInvariants:invariant_permit2NeverHoldsBalance() (runs: 256, calls: 3840, reverts: 886)
-AllowanceTransferInvariants:invariant_spendNeverExceedsPermit() (runs: 256, calls: 3840, reverts: 886)
-AllowanceTransferTest:testApprove() (gas: 47561)
-AllowanceTransferTest:testBatchTransferFrom() (gas: 159268)
-AllowanceTransferTest:testBatchTransferFromDifferentOwners() (gas: 235508)
-AllowanceTransferTest:testBatchTransferFromMultiToken() (gas: 231828)
-AllowanceTransferTest:testBatchTransferFromWithGasSnapshot() (gas: 159818)
-AllowanceTransferTest:testExcessiveInvalidation() (gas: 64136)
-AllowanceTransferTest:testInvalidateMultipleNonces() (gas: 83139)
-AllowanceTransferTest:testInvalidateNonces() (gas: 62679)
-AllowanceTransferTest:testInvalidateNoncesInvalid() (gas: 16261)
-AllowanceTransferTest:testLockdown() (gas: 145952)
-AllowanceTransferTest:testLockdownEvent() (gas: 117758)
-AllowanceTransferTest:testMaxAllowance() (gas: 134993)
-AllowanceTransferTest:testMaxAllowanceDirtyWrite() (gas: 117582)
-AllowanceTransferTest:testPartialAllowance() (gas: 105067)
-AllowanceTransferTest:testReuseOrderedNonceInvalid() (gas: 69095)
-AllowanceTransferTest:testSetAllowance() (gas: 89583)
-AllowanceTransferTest:testSetAllowanceBatch() (gas: 133608)
-AllowanceTransferTest:testSetAllowanceBatchDifferentNonces() (gas: 118583)
-AllowanceTransferTest:testSetAllowanceBatchDirtyWrite() (gas: 99144)
-AllowanceTransferTest:testSetAllowanceBatchEvent() (gas: 115892)
-AllowanceTransferTest:testSetAllowanceCompactSig() (gas: 89543)
-AllowanceTransferTest:testSetAllowanceDeadlinePassed() (gas: 56500)
-AllowanceTransferTest:testSetAllowanceDirtyWrite() (gas: 72175)
-AllowanceTransferTest:testSetAllowanceIncorrectSigLength() (gas: 29157)
-AllowanceTransferTest:testSetAllowanceInvalidSignature() (gas: 64071)
-AllowanceTransferTest:testSetAllowanceTransfer() (gas: 103161)
-AllowanceTransferTest:testSetAllowanceTransferDirtyNonceDirtyTransfer() (gas: 97432)
-AllowanceTransferTest:testTransferFromWithGasSnapshot() (gas: 133004)
-AllowanceUnitTest:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 38976, ~: 39054)
-AllowanceUnitTest:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40200, ~: 40201)
-AllowanceUnitTest:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39290, ~: 39291)
-CompactSignature:testCompactSignature27() (gas: 253)
+AllowanceTransferInvariants:invariant_balanceEqualsSpent() (runs: 256, calls: 3840, reverts: 887)
+AllowanceTransferInvariants:invariant_permit2NeverHoldsBalance() (runs: 256, calls: 3840, reverts: 887)
+AllowanceTransferInvariants:invariant_spendNeverExceedsPermit() (runs: 256, calls: 3840, reverts: 887)
+AllowanceTransferTest_ERC20:testApprove() (gas: 47610)
+AllowanceTransferTest_ERC20:testMaxAllowance() (gas: 135412)
+AllowanceTransferTest_ERC20:testMaxAllowanceDirtyWrite() (gas: 118045)
+AllowanceTransferTest_ERC20:testPartialAllowance() (gas: 105603)
+AllowanceTransferTest_ERC20:testReuseOrderedNonceInvalid() (gas: 69865)
+AllowanceTransferTest_ERC20:testSetAllowance() (gas: 89936)
+AllowanceTransferTest_ERC20:testSetAllowanceBatch() (gas: 144498)
+AllowanceTransferTest_ERC20:testSetAllowanceBatchDifferentNonces() (gas: 129658)
+AllowanceTransferTest_ERC20:testSetAllowanceBatchDirtyWrite() (gas: 110034)
+AllowanceTransferTest_ERC20:testSetAllowanceBatchEvent() (gas: 124271)
+AllowanceTransferTest_ERC20:testSetAllowanceCompactSig() (gas: 89950)
+AllowanceTransferTest_ERC20:testSetAllowanceDeadlinePassed() (gas: 56816)
+AllowanceTransferTest_ERC20:testSetAllowanceDirtyWrite() (gas: 72528)
+AllowanceTransferTest_ERC20:testSetAllowanceIncorrectSigLength() (gas: 29552)
+AllowanceTransferTest_ERC20:testSetAllowanceInvalidSignature() (gas: 64467)
+AllowanceTransferTest_ERC20:testSetAllowanceTransfer() (gas: 103558)
+AllowanceTransferTest_ERC20:testSetAllowanceTransferDirtyNonceDirtyTransfer() (gas: 97849)
+AllowanceTransferTest_ERC20:testTransferFromWithGasSnapshot() (gas: 133453)
+CompactSignature:testCompactSignature27() (gas: 275)
 CompactSignature:testCompactSignature28() (gas: 141)
 EIP712Test:testDomainSeparator() (gas: 5804)
 EIP712Test:testDomainSeparatorAfterFork() (gas: 10787)
-Permit2LibTest:testOZSafePermit() (gas: 24509)
-Permit2LibTest:testOZSafePermitPlusOZSafeTransferFrom() (gas: 129197)
-Permit2LibTest:testOZSafeTransferFrom() (gas: 38919)
-Permit2LibTest:testPermit2() (gas: 22776)
-Permit2LibTest:testPermit2DSLessToken() (gas: 6989)
-Permit2LibTest:testPermit2DSMore32Token() (gas: 7076)
-Permit2LibTest:testPermit2DSMoreToken() (gas: 6957)
-Permit2LibTest:testPermit2Full() (gas: 42196)
-Permit2LibTest:testPermit2InvalidAmount() (gas: 20619)
-Permit2LibTest:testPermit2LargerDS() (gas: 51226)
-Permit2LibTest:testPermit2LargerDSRevert() (gas: 32650)
-Permit2LibTest:testPermit2NonPermitFallback() (gas: 37048)
-Permit2LibTest:testPermit2NonPermitToken() (gas: 32011)
-Permit2LibTest:testPermit2PlusTransferFrom2() (gas: 126893)
-Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermit() (gas: 147999)
-Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermitFallback() (gas: 174659)
-Permit2LibTest:testPermit2PlusTransferFrom2WithWETH9Mainnet() (gas: 147693)
-Permit2LibTest:testPermit2SmallerDS() (gas: 77619)
-Permit2LibTest:testPermit2SmallerDSNoRevert() (gas: 59269)
-Permit2LibTest:testPermit2WETH9Mainnet() (gas: 28712)
-Permit2LibTest:testStandardPermit() (gas: 22340)
-Permit2LibTest:testStandardTransferFrom() (gas: 38121)
-Permit2LibTest:testTransferFrom2() (gas: 38580)
-Permit2LibTest:testTransferFrom2Full() (gas: 53258)
+Permit2LibTest:testOZSafePermit() (gas: 24555)
+Permit2LibTest:testOZSafePermitPlusOZSafeTransferFrom() (gas: 129243)
+Permit2LibTest:testOZSafeTransferFrom() (gas: 38941)
+Permit2LibTest:testPermit2() (gas: 22822)
+Permit2LibTest:testPermit2DSLessToken() (gas: 7011)
+Permit2LibTest:testPermit2DSMore32Token() (gas: 7098)
+Permit2LibTest:testPermit2DSMoreToken() (gas: 6979)
+Permit2LibTest:testPermit2Full() (gas: 42242)
+Permit2LibTest:testPermit2InvalidAmount() (gas: 20665)
+Permit2LibTest:testPermit2LargerDS() (gas: 51272)
+Permit2LibTest:testPermit2LargerDSRevert() (gas: 32696)
+Permit2LibTest:testPermit2NonPermitFallback() (gas: 37094)
+Permit2LibTest:testPermit2NonPermitToken() (gas: 32057)
+Permit2LibTest:testPermit2PlusTransferFrom2() (gas: 126939)
+Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermit() (gas: 148045)
+Permit2LibTest:testPermit2PlusTransferFrom2WithNonPermitFallback() (gas: 174683)
+Permit2LibTest:testPermit2PlusTransferFrom2WithWETH9Mainnet() (gas: 147739)
+Permit2LibTest:testPermit2SmallerDS() (gas: 77643)
+Permit2LibTest:testPermit2SmallerDSNoRevert() (gas: 59293)
+Permit2LibTest:testPermit2WETH9Mainnet() (gas: 28736)
+Permit2LibTest:testStandardPermit() (gas: 22386)
+Permit2LibTest:testStandardTransferFrom() (gas: 38143)
+Permit2LibTest:testTransferFrom2() (gas: 38602)
+Permit2LibTest:testTransferFrom2Full() (gas: 53280)
 Permit2LibTest:testTransferFrom2InvalidAmount() (gas: 12710)
-Permit2LibTest:testTransferFrom2NonPermitToken() (gas: 53104)
+Permit2LibTest:testTransferFrom2NonPermitToken() (gas: 53126)
 SignatureTransferTest:testCorrectWitnessTypehashes() (gas: 3075)
-SignatureTransferTest:testGasMultiplePermitBatchTransferFrom() (gas: 270919)
-SignatureTransferTest:testGasSinglePermitBatchTransferFrom() (gas: 186316)
-SignatureTransferTest:testGasSinglePermitTransferFrom() (gas: 123850)
-SignatureTransferTest:testInvalidateUnorderedNonces() (gas: 41268)
-SignatureTransferTest:testPermitBatchMultiPermitSingleTransfer() (gas: 133644)
+SignatureTransferTest:testGasMultiplePermitBatchTransferFrom() (gas: 270943)
+SignatureTransferTest:testGasSinglePermitBatchTransferFrom() (gas: 186340)
+SignatureTransferTest:testGasSinglePermitTransferFrom() (gas: 123852)
+SignatureTransferTest:testInvalidateUnorderedNonces() (gas: 41233)
+SignatureTransferTest:testPermitBatchMultiPermitSingleTransfer() (gas: 133666)
 SignatureTransferTest:testPermitBatchTransferFrom() (gas: 162010)
-SignatureTransferTest:testPermitBatchTransferFromSingleRecipient() (gas: 190319)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitness() (gas: 239854)
+SignatureTransferTest:testPermitBatchTransferFromSingleRecipient() (gas: 190277)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitness() (gas: 239856)
 SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidType() (gas: 84467)
-SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidTypeHash() (gas: 85864)
+SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidTypeHash() (gas: 85842)
 SignatureTransferTest:testPermitBatchTransferFromTypedWitnessInvalidWitness() (gas: 85688)
 SignatureTransferTest:testPermitBatchTransferInvalidAmountsLengthMismatch() (gas: 43967)
-SignatureTransferTest:testPermitBatchTransferMultiAddr() (gas: 160406)
-SignatureTransferTest:testPermitBatchTransferSingleRecipientManyTokens() (gas: 211834)
+SignatureTransferTest:testPermitBatchTransferMultiAddr() (gas: 160384)
+SignatureTransferTest:testPermitBatchTransferSingleRecipientManyTokens() (gas: 211836)
 SignatureTransferTest:testPermitTransferFrom() (gas: 93012)
 SignatureTransferTest:testPermitTransferFromCompactSig() (gas: 123927)
-SignatureTransferTest:testPermitTransferFromIncorrectSigLength() (gas: 51327)
-SignatureTransferTest:testPermitTransferFromInvalidNonce() (gas: 72799)
+SignatureTransferTest:testPermitTransferFromIncorrectSigLength() (gas: 51349)
+SignatureTransferTest:testPermitTransferFromInvalidNonce() (gas: 72755)
 SignatureTransferTest:testPermitTransferFromRandomNonceAndAmount(uint256,uint128) (runs: 256, μ: 95754, ~: 96730)
-SignatureTransferTest:testPermitTransferFromToSpender() (gas: 93342)
-SignatureTransferTest:testPermitTransferFromTypedWitness() (gas: 125271)
-SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidType() (gas: 55906)
+SignatureTransferTest:testPermitTransferFromToSpender() (gas: 93364)
+SignatureTransferTest:testPermitTransferFromTypedWitness() (gas: 125273)
+SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidType() (gas: 55928)
 SignatureTransferTest:testPermitTransferFromTypedWitnessInvalidTypehash() (gas: 56794)
-SignatureTransferTest:testPermitTransferSpendLessThanFull(uint256,uint128) (runs: 256, μ: 97989, ~: 99707)
-TypehashGeneration:testPermitBatch() (gas: 40493)
+SignatureTransferTest:testPermitTransferSpendLessThanFull(uint256,uint128) (runs: 256, μ: 97967, ~: 99685)
+TypehashGeneration:testPermitBatch() (gas: 40515)
 TypehashGeneration:testPermitBatchTransferFrom() (gas: 49854)
-TypehashGeneration:testPermitBatchTransferFromWithWitness() (gas: 56587)
+TypehashGeneration:testPermitBatchTransferFromWithWitness() (gas: 56609)
 TypehashGeneration:testPermitBatchTransferFromWithWitnessIncorrectPermitData() (gas: 56744)
-TypehashGeneration:testPermitBatchTransferFromWithWitnessIncorrectTypehashStub() (gas: 57229)
+TypehashGeneration:testPermitBatchTransferFromWithWitnessIncorrectTypehashStub() (gas: 57251)
 TypehashGeneration:testPermitSingle() (gas: 28117)
 TypehashGeneration:testPermitTransferFrom() (gas: 36520)
-TypehashGeneration:testPermitTransferFromWithWitness() (gas: 43369)
+TypehashGeneration:testPermitTransferFromWithWitness() (gas: 43391)
 TypehashGeneration:testPermitTransferFromWithWitnessIncorrectPermitData() (gas: 43430)
-TypehashGeneration:testPermitTransferFromWithWitnessIncorrectTypehashStub() (gas: 43833)
+TypehashGeneration:testPermitTransferFromWithWitnessIncorrectTypehashStub() (gas: 43855)
 MockPermit2Lib:testPermit2Code(address):(bool) (runs: 256, μ: 3025, ~: 3016)
+AllowanceUnitTest_ERC20:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 38727, ~: 38805)
+AllowanceUnitTest_ERC20:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40210, ~: 40211)
+AllowanceUnitTest_ERC20:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39330, ~: 39331)
+AllowanceUnitTest_ERC721:testPackAndUnpack(uint160,uint48,uint48) (runs: 256, μ: 38727, ~: 38805)
+AllowanceUnitTest_ERC721:testUpdateAllRandomly(uint160,uint48,uint48) (runs: 256, μ: 40210, ~: 40211)
+AllowanceUnitTest_ERC721:testUpdateAmountExpirationRandomly(uint160,uint48) (runs: 256, μ: 39330, ~: 39331)
 NonceBitmapTest_ERC20:testHighNonces() (gas: 36142)
 NonceBitmapTest_ERC20:testInvalidateFullWord() (gas: 63031)
 NonceBitmapTest_ERC20:testInvalidateNoncesRandomly(uint248,uint256) (runs: 256, μ: 30335, ~: 31035)