diff --git a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
index 63e482c1..2fb484c4 100644
--- a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
+++ b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
@@ -1 +1 @@
-129601
\ No newline at end of file
+129642
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
index 1be91a8b..ff128171 100644
--- a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
+++ b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
@@ -1 +1 @@
-131664
\ No newline at end of file
+131705
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
index e3d47b59..7703a32a 100644
--- a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
+++ b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
@@ -1 +1 @@
-123869
\ No newline at end of file
+123910
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
index e8e1e8fa..0830d929 100644
--- a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
+++ b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
@@ -1 +1 @@
-124011
\ No newline at end of file
+124052
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
index 9e62ab4d..5ad0da0a 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
@@ -1 +1 @@
-125584
\ No newline at end of file
+125624
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
index 33aa7739..030a3e44 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
@@ -1 +1 @@
-125031
\ No newline at end of file
+125106
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
index 6a3bb39f..5c745f93 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
@@ -1 +1 @@
-132446
\ No newline at end of file
+132486
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
index 62abe7a1..9bb02f5c 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
@@ -1 +1 @@
-131893
\ No newline at end of file
+131968
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_native.snap b/.forge-snapshots/PositionManager_collect_native.snap
index 83e0e3d6..1396b4fb 100644
--- a/.forge-snapshots/PositionManager_collect_native.snap
+++ b/.forge-snapshots/PositionManager_collect_native.snap
@@ -1 +1 @@
-146294
\ No newline at end of file
+146344
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_sameRange.snap b/.forge-snapshots/PositionManager_collect_sameRange.snap
index ab27c01b..ecf3a285 100644
--- a/.forge-snapshots/PositionManager_collect_sameRange.snap
+++ b/.forge-snapshots/PositionManager_collect_sameRange.snap
@@ -1 +1 @@
-154872
\ No newline at end of file
+154922
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_withClose.snap b/.forge-snapshots/PositionManager_collect_withClose.snap
index ab27c01b..ecf3a285 100644
--- a/.forge-snapshots/PositionManager_collect_withClose.snap
+++ b/.forge-snapshots/PositionManager_collect_withClose.snap
@@ -1 +1 @@
-154872
\ No newline at end of file
+154922
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_withTakePair.snap b/.forge-snapshots/PositionManager_collect_withTakePair.snap
index 47b66e44..22d50eaf 100644
--- a/.forge-snapshots/PositionManager_collect_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_collect_withTakePair.snap
@@ -1 +1 @@
-154193
\ No newline at end of file
+154287
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
index e13e87a3..1a2e6b27 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
@@ -1 +1 @@
-111980
\ No newline at end of file
+112020
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
index f5f1f8b2..f52a7eff 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
@@ -1 +1 @@
-119753
\ No newline at end of file
+119803
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
index e4b3cfde..11fddf42 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
@@ -1 +1 @@
-119074
\ No newline at end of file
+119168
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
index 31c3a99c..95a005d3 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
@@ -1 +1 @@
-135243
\ No newline at end of file
+135283
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
index 5cbd7ccc..588100f5 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
@@ -1 +1 @@
-128380
\ No newline at end of file
+128420
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap b/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
index af29b36e..d467feba 100644
--- a/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
+++ b/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
@@ -1 +1 @@
-132440
\ No newline at end of file
+132490
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_take_take.snap b/.forge-snapshots/PositionManager_decrease_take_take.snap
index 9497d424..0b9cd698 100644
--- a/.forge-snapshots/PositionManager_decrease_take_take.snap
+++ b/.forge-snapshots/PositionManager_decrease_take_take.snap
@@ -1 +1 @@
-120329
\ No newline at end of file
+120423
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
index df7539ba..974deb9e 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
@@ -1 +1 @@
-159057
\ No newline at end of file
+159083
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
index d62921d3..1cafe695 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
@@ -1 +1 @@
-157997
\ No newline at end of file
+158035
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
index 5224273f..7647c22b 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
@@ -1 +1 @@
-140872
\ No newline at end of file
+140898
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap b/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
index d9726ba2..76da88df 100644
--- a/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
+++ b/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
@@ -1 +1 @@
-177364
\ No newline at end of file
+177414
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_native.snap b/.forge-snapshots/PositionManager_mint_native.snap
index 742cc68e..fef9a7fb 100644
--- a/.forge-snapshots/PositionManager_mint_native.snap
+++ b/.forge-snapshots/PositionManager_mint_native.snap
@@ -1 +1 @@
-364745
\ No newline at end of file
+364771
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
index 7c56236a..42f3e8cd 100644
--- a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
+++ b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
@@ -1 +1 @@
-373268
\ No newline at end of file
+373294
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
index 822d688b..1423455f 100644
--- a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
@@ -1 +1 @@
-372491
\ No newline at end of file
+372529
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
index ccfdb51f..8521dbe7 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
@@ -1 +1 @@
-317617
\ No newline at end of file
+317643
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
index 9f9a6b77..afd46945 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
@@ -1 +1 @@
-318287
\ No newline at end of file
+318313
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_sameRange.snap b/.forge-snapshots/PositionManager_mint_sameRange.snap
index ccc454dd..ab86eec5 100644
--- a/.forge-snapshots/PositionManager_mint_sameRange.snap
+++ b/.forge-snapshots/PositionManager_mint_sameRange.snap
@@ -1 +1 @@
-243856
\ No newline at end of file
+243882
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
index 23648cc9..301b01af 100644
--- a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
+++ b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
@@ -1 +1 @@
-419060
\ No newline at end of file
+419098
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
index cedd0614..2610fc39 100644
--- a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
+++ b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
@@ -1 +1 @@
-323648
\ No newline at end of file
+323674
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_withClose.snap b/.forge-snapshots/PositionManager_mint_withClose.snap
index cf0292c9..57b8c920 100644
--- a/.forge-snapshots/PositionManager_mint_withClose.snap
+++ b/.forge-snapshots/PositionManager_mint_withClose.snap
@@ -1 +1 @@
-420170
\ No newline at end of file
+420196
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_withSettlePair.snap
index 549b6841..3171f975 100644
--- a/.forge-snapshots/PositionManager_mint_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_mint_withSettlePair.snap
@@ -1 +1 @@
-419228
\ No newline at end of file
+419266
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
index b51b3f66..124c6a1e 100644
--- a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
+++ b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
@@ -1 +1 @@
-455975
\ No newline at end of file
+456001
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_Bytecode.snap b/.forge-snapshots/V4Router_Bytecode.snap
index 0528d987..9c58b982 100644
--- a/.forge-snapshots/V4Router_Bytecode.snap
+++ b/.forge-snapshots/V4Router_Bytecode.snap
@@ -1 +1 @@
-7037
\ No newline at end of file
+7063
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
index 2a724576..a3d9bfc1 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
@@ -1 +1 @@
-115708
\ No newline at end of file
+115753
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
index 3afc230e..f637e5fe 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
@@ -1 +1 @@
-116029
\ No newline at end of file
+116070
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
index 94d611de..f2476e2f 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
@@ -1 +1 @@
-124847
\ No newline at end of file
+124888
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
index 01a3e91e..690eed05 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
@@ -1 +1 @@
-130570
\ No newline at end of file
+130611
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops.snap b/.forge-snapshots/V4Router_ExactIn2Hops.snap
index 9620022f..beee482b 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops.snap
@@ -1 +1 @@
-185411
\ No newline at end of file
+185452
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
index a7d52792..36622c52 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
@@ -1 +1 @@
-170549
\ No newline at end of file
+170594
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops.snap b/.forge-snapshots/V4Router_ExactIn3Hops.snap
index aecf0666..c55ea7d8 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops.snap
@@ -1 +1 @@
-240255
\ No newline at end of file
+240296
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
index 3ea0d0bf..0758ae8f 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
@@ -1 +1 @@
-225393
\ No newline at end of file
+225438
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle.snap b/.forge-snapshots/V4Router_ExactInputSingle.snap
index 63e482c1..2fb484c4 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle.snap
@@ -1 +1 @@
-129601
\ No newline at end of file
+129642
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
index d9151a23..a8669680 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
@@ -1 +1 @@
-114739
\ No newline at end of file
+114784
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
index e039a25d..d8315aec 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
@@ -1 +1 @@
-115028
\ No newline at end of file
+115069
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
index 5e64389a..0b08fa2f 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
@@ -1 +1 @@
-121971
\ No newline at end of file
+122016
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
index 4e7b78af..b1d78c0e 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
@@ -1 +1 @@
-117093
\ No newline at end of file
+117134
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
index 59f0e691..6202f067 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
@@ -1 +1 @@
-125911
\ No newline at end of file
+125952
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
index 5e7fe01c..1c782b16 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
@@ -1 +1 @@
-129856
\ No newline at end of file
+129897
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops.snap b/.forge-snapshots/V4Router_ExactOut2Hops.snap
index 87c5e704..ff527d26 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops.snap
@@ -1 +1 @@
-183759
\ No newline at end of file
+183800
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
index d15e6c89..75b2b47c 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
@@ -1 +1 @@
-175874
\ No newline at end of file
+175919
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops.snap b/.forge-snapshots/V4Router_ExactOut3Hops.snap
index 5df7f78e..1ed797a7 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops.snap
@@ -1 +1 @@
-237693
\ No newline at end of file
+237734
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
index 72b7efd5..209ae505 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
@@ -1 +1 @@
-229808
\ No newline at end of file
+229853
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
index 810acacb..50495b29 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
@@ -1 +1 @@
-217048
\ No newline at end of file
+217089
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle.snap b/.forge-snapshots/V4Router_ExactOutputSingle.snap
index 1fb8a61a..178defb9 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle.snap
@@ -1 +1 @@
-128884
\ No newline at end of file
+128925
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
index cd9382b3..c7076c46 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
@@ -1 +1 @@
-120999
\ No newline at end of file
+121044
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
index a14cba0f..a21b83f7 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
@@ -1 +1 @@
-116195
\ No newline at end of file
+116236
\ No newline at end of file
diff --git a/src/PositionManager.sol b/src/PositionManager.sol
index d5721e34..ca3012ee 100644
--- a/src/PositionManager.sol
+++ b/src/PositionManager.sol
@@ -363,7 +363,7 @@ contract PositionManager is
         if (currencyDelta < 0) {
             // Casting is safe due to limits on the total supply of a pool
             _settle(currency, caller, uint256(-currencyDelta));
-        } else if (currencyDelta > 0) {
+        } else {
             _take(currency, caller, uint256(currencyDelta));
         }
     }
diff --git a/src/base/DeltaResolver.sol b/src/base/DeltaResolver.sol
index ccde3d4d..57261bd8 100644
--- a/src/base/DeltaResolver.sol
+++ b/src/base/DeltaResolver.sol
@@ -21,7 +21,9 @@ abstract contract DeltaResolver is ImmutableState {
     /// @param currency Currency to take
     /// @param recipient Address to receive the currency
     /// @param amount Amount to take
+    /// @dev Returns early if the amount is 0
     function _take(Currency currency, address recipient, uint256 amount) internal {
+        if (amount == 0) return;
         poolManager.take(currency, recipient, amount);
     }
 
@@ -30,7 +32,9 @@ abstract contract DeltaResolver is ImmutableState {
     /// @param currency Currency to settle
     /// @param payer Address of the payer
     /// @param amount Amount to send
+    /// @dev Returns early if the amount is 0
     function _settle(Currency currency, address payer, uint256 amount) internal {
+        if (amount == 0) return;
         if (currency.isAddressZero()) {
             poolManager.settle{value: amount}();
         } else {