diff --git a/.gas-snapshot b/.gas-snapshot
index e1447e33f..8b6c50eb8 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -8,7 +8,7 @@ HooksTest:testBeforeModifyPositionInvalidReturn() (gas: 132850)
 HooksTest:testBeforeSwapInvalidReturn() (gas: 133833)
 HooksTest:testDonateSucceedsWithHook() (gas: 531091)
 HooksTest:testGas() (gas: 38344)
-HooksTest:testInitializeSucceedsWithHook() (gas: 6204741)
+HooksTest:testInitializeSucceedsWithHook() (gas: 6190895)
 HooksTest:testInvalidIfNoFlags() (gas: 907)
 HooksTest:testIsValidHookAddressAnyFlags() (gas: 1827)
 HooksTest:testIsValidHookAddressZeroAddress() (gas: 382)
@@ -29,12 +29,12 @@ HooksTest:testValidateHookAddressBeforeInitialize(uint152) (runs: 256, μ: 1829,
 HooksTest:testValidateHookAddressBeforeModify(uint152) (runs: 256, μ: 1855, ~: 1855)
 HooksTest:testValidateHookAddressBeforeSwap(uint152) (runs: 256, μ: 1848, ~: 1848)
 HooksTest:testValidateHookAddressFailsAllHooks(uint152,uint8) (runs: 256, μ: 4727, ~: 4676)
-HooksTest:testValidateHookAddressFailsNoHooks(uint152,uint8) (runs: 256, μ: 4775, ~: 4719)
+HooksTest:testValidateHookAddressFailsNoHooks(uint152,uint8) (runs: 256, μ: 4779, ~: 4719)
 HooksTest:testValidateHookAddressNoHooks(uint152) (runs: 256, μ: 1837, ~: 1837)
-OwnedTest:testConstructor(address) (runs: 256, μ: 159767, ~: 159767)
+OwnedTest:testConstructor(address) (runs: 256, μ: 159689, ~: 159767)
 OwnedTest:testSetOwnerFromNonOwner(address,address) (runs: 256, μ: 160839, ~: 160925)
-OwnedTest:testSetOwnerFromOwner(address,address) (runs: 256, μ: 162840, ~: 162996)
-PoolManagerTest:testDonateFailsIfNoLiquidity(uint160) (runs: 256, μ: 104874, ~: 105038)
+OwnedTest:testSetOwnerFromOwner(address,address) (runs: 256, μ: 162918, ~: 162996)
+PoolManagerTest:testDonateFailsIfNoLiquidity(uint160) (runs: 256, μ: 104878, ~: 105037)
 PoolManagerTest:testDonateFailsIfNotInitialized() (gas: 69323)
 PoolManagerTest:testDonateFailsWithIncorrectSelectors() (gas: 1103240)
 PoolManagerTest:testDonateSucceedsForNativeTokensWhenPoolHasLiquidity() (gas: 500356)
@@ -45,33 +45,33 @@ PoolManagerTest:testExtsloadMultipleSlots() (gas: 7333225)
 PoolManagerTest:testGasDonateOneToken() (gas: 512324)
 PoolManagerTest:testGasMint() (gas: 319940)
 PoolManagerTest:testGasMintWithHooks() (gas: 802768)
-PoolManagerTest:testGasMintWithNative() (gas: 305008)
+PoolManagerTest:testGasMintWithNative() (gas: 304946)
 PoolManagerTest:testGasPoolManagerInitialize() (gas: 72812)
-PoolManagerTest:testGasSwap() (gas: 196573)
+PoolManagerTest:testGasSwap() (gas: 196624)
 PoolManagerTest:testGasSwapAgainstLiq() (gas: 668537)
-PoolManagerTest:testGasSwapAgainstLiqWithNative() (gas: 710056)
-PoolManagerTest:testGasSwapWithHooks() (gas: 641207)
-PoolManagerTest:testGasSwapWithNative() (gas: 196625)
+PoolManagerTest:testGasSwapAgainstLiqWithNative() (gas: 709872)
+PoolManagerTest:testGasSwapWithHooks() (gas: 641268)
+PoolManagerTest:testGasSwapWithNative() (gas: 196676)
 PoolManagerTest:testLockEmitsCorrectId() (gas: 47981)
 PoolManagerTest:testMintFailsIfNotInitialized() (gas: 70529)
 PoolManagerTest:testMintFailsWithIncorrectSelectors() (gas: 872989)
-PoolManagerTest:testMintSucceedsForNativeTokensIfInitialized(uint160) (runs: 256, μ: 260555, ~: 274683)
-PoolManagerTest:testMintSucceedsIfInitialized(uint160) (runs: 256, μ: 263786, ~: 265288)
+PoolManagerTest:testMintSucceedsForNativeTokensIfInitialized(uint160) (runs: 256, μ: 260264, ~: 274621)
+PoolManagerTest:testMintSucceedsIfInitialized(uint160) (runs: 256, μ: 263719, ~: 261717)
 PoolManagerTest:testMintSucceedsWithCorrectSelectors() (gas: 809654)
-PoolManagerTest:testMintSucceedsWithHooksIfInitialized(uint160) (runs: 256, μ: 806544, ~: 804021)
+PoolManagerTest:testMintSucceedsWithHooksIfInitialized(uint160) (runs: 256, μ: 806679, ~: 808507)
 PoolManagerTest:testNoOpLockIsOk() (gas: 87210)
 PoolManagerTest:testPoolManagerFeeControllerSet() (gas: 35330)
-PoolManagerTest:testPoolManagerFetchFeeWhenController(uint160) (runs: 256, μ: 108234, ~: 108394)
-PoolManagerTest:testPoolManagerInitialize((address,address,uint24,int24,address),uint160) (runs: 256, μ: 18051, ~: 13442)
+PoolManagerTest:testPoolManagerFetchFeeWhenController(uint160) (runs: 256, μ: 108235, ~: 108394)
+PoolManagerTest:testPoolManagerInitialize((address,address,uint24,int24,address),uint160) (runs: 256, μ: 17880, ~: 13442)
 PoolManagerTest:testPoolManagerInitializeFailsIfTickSpaceNeg(uint160) (runs: 256, μ: 15323, ~: 15323)
 PoolManagerTest:testPoolManagerInitializeFailsIfTickSpaceTooLarge(uint160) (runs: 256, μ: 16271, ~: 16271)
 PoolManagerTest:testPoolManagerInitializeFailsIfTickSpaceZero(uint160) (runs: 256, μ: 15324, ~: 15324)
 PoolManagerTest:testPoolManagerInitializeFailsWithIncorrectSelectors() (gas: 578101)
-PoolManagerTest:testPoolManagerInitializeForNativeTokens(uint160) (runs: 256, μ: 57782, ~: 58110)
+PoolManagerTest:testPoolManagerInitializeForNativeTokens(uint160) (runs: 256, μ: 57800, ~: 58111)
 PoolManagerTest:testPoolManagerInitializeSucceedsWithCorrectSelectors() (gas: 578125)
-PoolManagerTest:testPoolManagerInitializeSucceedsWithEmptyHooks(uint160) (runs: 256, μ: 543521, ~: 543687)
-PoolManagerTest:testPoolManagerInitializeSucceedsWithHooks(uint160) (runs: 256, μ: 608222, ~: 608372)
-PoolManagerTest:testPoolManagerInitializeSucceedsWithMaxTickSpacing(uint160) (runs: 256, μ: 49734, ~: 49893)
+PoolManagerTest:testPoolManagerInitializeSucceedsWithEmptyHooks(uint160) (runs: 256, μ: 543524, ~: 543687)
+PoolManagerTest:testPoolManagerInitializeSucceedsWithHooks(uint160) (runs: 256, μ: 608215, ~: 608373)
+PoolManagerTest:testPoolManagerInitializeSucceedsWithMaxTickSpacing(uint160) (runs: 256, μ: 49727, ~: 49893)
 PoolManagerTest:testSwapFailsIfNotInitialized(uint160) (runs: 256, μ: 72844, ~: 72844)
 PoolManagerTest:testSwapFailsWithIncorrectSelectors() (gas: 948595)
 PoolManagerTest:testSwapMintERC1155IfOutputNotTaken() (gas: 535548)
@@ -81,24 +81,24 @@ PoolManagerTest:testSwapSucceedsWithHooksIfInitialized() (gas: 649679)
 PoolManagerTest:testSwapSucceedsWithNativeTokensIfInitialized() (gas: 105500)
 PoolManagerTest:testSwapUse1155AsInput() (gas: 713157)
 PoolTest:testModifyPosition(uint160,(address,int24,int24,int128,int24)) (runs: 256, μ: 20321, ~: 6980)
-PoolTest:testPoolInitialize(uint160,uint8) (runs: 256, μ: 12709, ~: 5591)
+PoolTest:testPoolInitialize(uint160,uint8) (runs: 256, μ: 12687, ~: 5591)
 PoolTest:testSwap(uint160,(uint24,int24,bool,int256,uint160)) (runs: 256, μ: 776640, ~: 7290)
-SafeCastTest:testToInt128(int256) (runs: 256, μ: 1342, ~: 511)
-SafeCastTest:testToInt128(uint256) (runs: 256, μ: 1344, ~: 390)
+SafeCastTest:testToInt128(int256) (runs: 256, μ: 1352, ~: 511)
+SafeCastTest:testToInt128(uint256) (runs: 256, μ: 1355, ~: 390)
 SafeCastTest:testToInt256(uint256) (runs: 256, μ: 993, ~: 450)
 SafeCastTest:testToUint160(uint256) (runs: 256, μ: 1231, ~: 454)
 TestBalanceDelta:testAdd(int128,int128,int128,int128) (runs: 256, μ: 4750, ~: 4750)
 TestBalanceDelta:testSub(int128,int128,int128,int128) (runs: 256, μ: 4724, ~: 4724)
 TestBalanceDelta:testToBalanceDelta() (gas: 968)
 TestBalanceDelta:testToBalanceDelta(int128,int128) (runs: 256, μ: 613, ~: 613)
-TestBitMath:testLeastSignificantBit(uint256) (runs: 256, μ: 3954, ~: 3748)
+TestBitMath:testLeastSignificantBit(uint256) (runs: 256, μ: 4268, ~: 3748)
 TestBitMath:testLeastSignificantBitMaxUint256() (gas: 697)
 TestBitMath:testLeastSignificantBitOne() (gas: 715)
 TestBitMath:testLeastSignificantBitPowersOfTwo() (gas: 151449)
 TestBitMath:testLeastSignificantBitTwo() (gas: 673)
 TestBitMath:testLeastSignificantBitZero() (gas: 3086)
 TestBitMath:testLsbGas() (gas: 115496)
-TestBitMath:testMostSignificantBit(uint256) (runs: 256, μ: 15100, ~: 7978)
+TestBitMath:testMostSignificantBit(uint256) (runs: 256, μ: 15281, ~: 8087)
 TestBitMath:testMostSignificantBitMaxUint256() (gas: 650)
 TestBitMath:testMostSignificantBitOne() (gas: 538)
 TestBitMath:testMostSignificantBitPowersOfTwo() (gas: 125789)