diff --git a/.gas-snapshot b/.gas-snapshot
index 51dba99..20cd0d6 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,19 +1,19 @@
-QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 67131189, ~: 74970077)
-QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 67275063, ~: 75584848)
+QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65806302, ~: 74826166)
+QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 64996916, ~: 74226210)
 QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056944892)
 QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 80136, ~: 80169)
 QueryProcessorTest:testGetInstantValue() (gas: 123891)
 QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19378, ~: 19378)
-QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68260442, ~: 68260368)
-QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 26901, ~: 26962)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 72548137, ~: 80824705)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 67657128, ~: 76073918)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 67686828, ~: 76105399)
-QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 67249010, ~: 75556685)
-QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 67282896, ~: 75591074)
-QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 67240616, ~: 75547815)
-QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 67252023, ~: 75558006)
-QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 107327695, ~: 115516665)
+QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68260435, ~: 68260368)
+QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 26902, ~: 26962)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 71271543, ~: 80081087)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 67118170, ~: 76073918)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 67147892, ~: 76105399)
+QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 64971065, ~: 74197796)
+QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 65004847, ~: 74232436)
+QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 64962680, ~: 74189873)
+QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 64974173, ~: 74199723)
+QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 107958222, ~: 115516665)
 QueryProcessorTest:testGetTimeWeightedAverage_BadSecs() (gas: 10981)
 ReservoirPriceOracleTest:testClearRoute() (gas: 52216)
 ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 159654)
@@ -21,22 +21,22 @@ ReservoirPriceOracleTest:testDesignatePair() (gas: 29038)
 ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21133)
 ReservoirPriceOracleTest:testDesignatePair_NotOwner() (gas: 17541)
 ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30605)
-ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 33689, ~: 33805)
+ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 33681, ~: 33805)
 ReservoirPriceOracleTest:testGetQuote_AmountInTooLarge() (gas: 12950)
-ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401370, ~: 401124)
+ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401378, ~: 401124)
 ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10127860)
-ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 35812, ~: 35926)
+ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 35804, ~: 35867)
 ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 111603)
 ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 111924)
 ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 122238)
 ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20788)
 ReservoirPriceOracleTest:testGetQuote_PriceZero() (gas: 15930)
-ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5198013, ~: 5198035)
-ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10269557, ~: 10269655)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5198032, ~: 5198035)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10269567, ~: 10269655)
 ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 256, μ: 8927, ~: 8927)
 ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38250)
 ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 36635)
-ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26211, ~: 26327)
+ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26203, ~: 26327)
 ReservoirPriceOracleTest:testPriceCache_Inverted() (gas: 21949)
 ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 10928)
 ReservoirPriceOracleTest:testSetRoute() (gas: 61014)
@@ -50,19 +50,19 @@ ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 13019)
 ReservoirPriceOracleTest:testUndesignatePair() (gas: 30215)
 ReservoirPriceOracleTest:testUndesignatePair_NotOwner() (gas: 15344)
 ReservoirPriceOracleTest:testUpdatePrice_AboveThresholdBelowMaxReward(uint256) (runs: 256, μ: 163637, ~: 163657)
-ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 148524, ~: 148195)
+ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 148532, ~: 148476)
 ReservoirPriceOracleTest:testUpdatePrice_BeyondMaxReward(uint256) (runs: 256, μ: 161152, ~: 161177)
 ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 152255)
 ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15927172)
 ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5288225)
 ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ContractNoReceive() (gas: 151436)
-ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 209559, ~: 209771)
+ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 209567, ~: 209771)
 ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ZeroRecipient() (gas: 145106)
 ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19027)
 ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10930)
-ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21574, ~: 21656)
-ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17696, ~: 17994)
-ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30053, ~: 29807)
+ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21571, ~: 21656)
+ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17706, ~: 17994)
+ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30061, ~: 29807)
 RoutesLibTest:testGetDecimalDifference() (gas: 3966)
 RoutesLibTest:testIsCompositeRoute() (gas: 4332)
 RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 8097, ~: 7862)