diff --git a/.forge-snapshots/FullOracleObserve0After5Seconds.snap b/.forge-snapshots/FullOracleObserve0After5Seconds.snap
index 6f6e5593..8fa2b472 100644
--- a/.forge-snapshots/FullOracleObserve0After5Seconds.snap
+++ b/.forge-snapshots/FullOracleObserve0After5Seconds.snap
@@ -1 +1 @@
-2012
\ No newline at end of file
+1922
\ No newline at end of file
diff --git a/.forge-snapshots/FullOracleObserve200By13.snap b/.forge-snapshots/FullOracleObserve200By13.snap
index ce4e8ad9..9e3ceb1e 100644
--- a/.forge-snapshots/FullOracleObserve200By13.snap
+++ b/.forge-snapshots/FullOracleObserve200By13.snap
@@ -1 +1 @@
-21260
\ No newline at end of file
+20282
\ No newline at end of file
diff --git a/.forge-snapshots/FullOracleObserve200By13Plus5.snap b/.forge-snapshots/FullOracleObserve200By13Plus5.snap
index 442b8ddb..0da8d066 100644
--- a/.forge-snapshots/FullOracleObserve200By13Plus5.snap
+++ b/.forge-snapshots/FullOracleObserve200By13Plus5.snap
@@ -1 +1 @@
-21510
\ No newline at end of file
+20520
\ No newline at end of file
diff --git a/.forge-snapshots/FullOracleObserve5After5Seconds.snap b/.forge-snapshots/FullOracleObserve5After5Seconds.snap
index 1c412146..5ee5d632 100644
--- a/.forge-snapshots/FullOracleObserve5After5Seconds.snap
+++ b/.forge-snapshots/FullOracleObserve5After5Seconds.snap
@@ -1 +1 @@
-2082
\ No newline at end of file
+2034
\ No newline at end of file
diff --git a/.forge-snapshots/FullOracleObserveOldest.snap b/.forge-snapshots/FullOracleObserveOldest.snap
index a2bd8d93..3c45c181 100644
--- a/.forge-snapshots/FullOracleObserveOldest.snap
+++ b/.forge-snapshots/FullOracleObserveOldest.snap
@@ -1 +1 @@
-20368
\ No newline at end of file
+19330
\ No newline at end of file
diff --git a/.forge-snapshots/FullOracleObserveOldestAfter5Seconds.snap b/.forge-snapshots/FullOracleObserveOldestAfter5Seconds.snap
index 823374d9..eda3bfd7 100644
--- a/.forge-snapshots/FullOracleObserveOldestAfter5Seconds.snap
+++ b/.forge-snapshots/FullOracleObserveOldestAfter5Seconds.snap
@@ -1 +1 @@
-20662
\ No newline at end of file
+19612
\ No newline at end of file
diff --git a/.forge-snapshots/FullOracleObserveZero.snap b/.forge-snapshots/FullOracleObserveZero.snap
index c2af4839..ce4798b6 100644
--- a/.forge-snapshots/FullOracleObserveZero.snap
+++ b/.forge-snapshots/FullOracleObserveZero.snap
@@ -1 +1 @@
-1531
\ No newline at end of file
+1483
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeAddInitialLiquidity.snap b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
index b5756721..fac70738 100644
--- a/.forge-snapshots/FullRangeAddInitialLiquidity.snap
+++ b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
@@ -1 +1 @@
-397142
\ No newline at end of file
+393062
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeAddLiquidity.snap b/.forge-snapshots/FullRangeAddLiquidity.snap
index d652016e..8ff9c7d3 100644
--- a/.forge-snapshots/FullRangeAddLiquidity.snap
+++ b/.forge-snapshots/FullRangeAddLiquidity.snap
@@ -1 +1 @@
-191375
\ No newline at end of file
+187418
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeFirstSwap.snap b/.forge-snapshots/FullRangeFirstSwap.snap
index 815cd2fa..6350e081 100644
--- a/.forge-snapshots/FullRangeFirstSwap.snap
+++ b/.forge-snapshots/FullRangeFirstSwap.snap
@@ -1 +1 @@
-140622
\ No newline at end of file
+136762
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeInitialize.snap b/.forge-snapshots/FullRangeInitialize.snap
index 09df15fe..44dce048 100644
--- a/.forge-snapshots/FullRangeInitialize.snap
+++ b/.forge-snapshots/FullRangeInitialize.snap
@@ -1 +1 @@
-894027
\ No newline at end of file
+1059719
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidity.snap b/.forge-snapshots/FullRangeRemoveLiquidity.snap
index 05c472a7..232c6f67 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidity.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidity.snap
@@ -1 +1 @@
-184400
\ No newline at end of file
+180886
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
index afddb4b0..569e77f5 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
@@ -1 +1 @@
-383631
\ No newline at end of file
+373831
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeSecondSwap.snap b/.forge-snapshots/FullRangeSecondSwap.snap
index f84fb3b9..6620403b 100644
--- a/.forge-snapshots/FullRangeSecondSwap.snap
+++ b/.forge-snapshots/FullRangeSecondSwap.snap
@@ -1 +1 @@
-100961
\ No newline at end of file
+97479
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeSwap.snap b/.forge-snapshots/FullRangeSwap.snap
index c225636a..c7357ed2 100644
--- a/.forge-snapshots/FullRangeSwap.snap
+++ b/.forge-snapshots/FullRangeSwap.snap
@@ -1 +1 @@
-138917
\ No newline at end of file
+135037
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow10Slots.snap b/.forge-snapshots/OracleGrow10Slots.snap
index d90e6d60..c82060cc 100644
--- a/.forge-snapshots/OracleGrow10Slots.snap
+++ b/.forge-snapshots/OracleGrow10Slots.snap
@@ -1 +1 @@
-233037
\ No newline at end of file
+232968
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap b/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
index f0ae54e5..d8ee5c94 100644
--- a/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
+++ b/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
@@ -1 +1 @@
-223726
\ No newline at end of file
+223657
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow1Slot.snap b/.forge-snapshots/OracleGrow1Slot.snap
index 39d5f0b2..3c7800f1 100644
--- a/.forge-snapshots/OracleGrow1Slot.snap
+++ b/.forge-snapshots/OracleGrow1Slot.snap
@@ -1 +1 @@
-32895
\ No newline at end of file
+32853
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap b/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
index aec580ae..80d77105 100644
--- a/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
+++ b/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
@@ -1 +1 @@
-23595
\ No newline at end of file
+23553
\ No newline at end of file
diff --git a/.forge-snapshots/OracleInitialize.snap b/.forge-snapshots/OracleInitialize.snap
index 7364ee67..4262e6e4 100644
--- a/.forge-snapshots/OracleInitialize.snap
+++ b/.forge-snapshots/OracleInitialize.snap
@@ -1 +1 @@
-51456
\ No newline at end of file
+51321
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveBetweenOldestAndOldestPlusOne.snap b/.forge-snapshots/OracleObserveBetweenOldestAndOldestPlusOne.snap
index 2c87e067..e4417bef 100644
--- a/.forge-snapshots/OracleObserveBetweenOldestAndOldestPlusOne.snap
+++ b/.forge-snapshots/OracleObserveBetweenOldestAndOldestPlusOne.snap
@@ -1 +1 @@
-5607
\ No newline at end of file
+5397
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveCurrentTime.snap b/.forge-snapshots/OracleObserveCurrentTime.snap
index c2af4839..ce4798b6 100644
--- a/.forge-snapshots/OracleObserveCurrentTime.snap
+++ b/.forge-snapshots/OracleObserveCurrentTime.snap
@@ -1 +1 @@
-1531
\ No newline at end of file
+1483
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveCurrentTimeCounterfactual.snap b/.forge-snapshots/OracleObserveCurrentTimeCounterfactual.snap
index c2af4839..ce4798b6 100644
--- a/.forge-snapshots/OracleObserveCurrentTimeCounterfactual.snap
+++ b/.forge-snapshots/OracleObserveCurrentTimeCounterfactual.snap
@@ -1 +1 @@
-1531
\ No newline at end of file
+1483
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveLast20Seconds.snap b/.forge-snapshots/OracleObserveLast20Seconds.snap
index 07f99967..bbc0ec1f 100644
--- a/.forge-snapshots/OracleObserveLast20Seconds.snap
+++ b/.forge-snapshots/OracleObserveLast20Seconds.snap
@@ -1 +1 @@
-76487
\ No newline at end of file
+73451
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveLatestEqual.snap b/.forge-snapshots/OracleObserveLatestEqual.snap
index c2af4839..ce4798b6 100644
--- a/.forge-snapshots/OracleObserveLatestEqual.snap
+++ b/.forge-snapshots/OracleObserveLatestEqual.snap
@@ -1 +1 @@
-1531
\ No newline at end of file
+1483
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveLatestTransform.snap b/.forge-snapshots/OracleObserveLatestTransform.snap
index 6f6e5593..8fa2b472 100644
--- a/.forge-snapshots/OracleObserveLatestTransform.snap
+++ b/.forge-snapshots/OracleObserveLatestTransform.snap
@@ -1 +1 @@
-2012
\ No newline at end of file
+1922
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveMiddle.snap b/.forge-snapshots/OracleObserveMiddle.snap
index 69fb26dc..dd7e3e1f 100644
--- a/.forge-snapshots/OracleObserveMiddle.snap
+++ b/.forge-snapshots/OracleObserveMiddle.snap
@@ -1 +1 @@
-5782
\ No newline at end of file
+5572
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveOldest.snap b/.forge-snapshots/OracleObserveOldest.snap
index 057d71fd..63bada90 100644
--- a/.forge-snapshots/OracleObserveOldest.snap
+++ b/.forge-snapshots/OracleObserveOldest.snap
@@ -1 +1 @@
-5313
\ No newline at end of file
+5115
\ No newline at end of file
diff --git a/.forge-snapshots/OracleObserveSinceMostRecent.snap b/.forge-snapshots/OracleObserveSinceMostRecent.snap
index 9d76efbb..13e432b0 100644
--- a/.forge-snapshots/OracleObserveSinceMostRecent.snap
+++ b/.forge-snapshots/OracleObserveSinceMostRecent.snap
@@ -1 +1 @@
-2627
\ No newline at end of file
+2537
\ No newline at end of file
diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
index ad18d877..7c2297c1 100644
--- a/.forge-snapshots/TWAMMSubmitOrder.snap
+++ b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-123575
\ No newline at end of file
+122817
\ No newline at end of file