diff --git a/.gas-snapshot b/.gas-snapshot
index 96949aa3..c885f68c 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -17,22 +17,22 @@ AuthTest:testFailTransferOwnershipAsOwnerWithOutOfOrderAuthority(address) (runs:
 AuthTest:testFailTransferOwnershipWithRestrictiveAuthority() (gas: 129338)
 AuthTest:testFailTransferOwnershipWithRestrictiveAuthority(address,address) (runs: 256, μ: 129588, ~: 129588)
 AuthTest:testSetAuthorityAsOwner() (gas: 32214)
-AuthTest:testSetAuthorityAsOwner(address) (runs: 256, μ: 32150, ~: 32384)
+AuthTest:testSetAuthorityAsOwner(address) (runs: 256, μ: 32384, ~: 32384)
 AuthTest:testSetAuthorityAsOwnerWithOutOfOrderAuthority() (gas: 226419)
 AuthTest:testSetAuthorityWithPermissiveAuthority() (gas: 125962)
-AuthTest:testSetAuthorityWithPermissiveAuthority(address,address) (runs: 256, μ: 130880, ~: 131055)
+AuthTest:testSetAuthorityWithPermissiveAuthority(address,address) (runs: 256, μ: 130958, ~: 131055)
 AuthTest:testTransferOwnershipAsOwner() (gas: 15298)
-AuthTest:testTransferOwnershipAsOwner(address) (runs: 256, μ: 15412, ~: 15469)
+AuthTest:testTransferOwnershipAsOwner(address) (runs: 256, μ: 15469, ~: 15469)
 AuthTest:testTransferOwnershipWithPermissiveAuthority() (gas: 127926)
-AuthTest:testTransferOwnershipWithPermissiveAuthority(address,address) (runs: 256, μ: 130962, ~: 131000)
+AuthTest:testTransferOwnershipWithPermissiveAuthority(address,address) (runs: 256, μ: 130981, ~: 131000)
 Bytes32AddressLibTest:testFillLast12Bytes() (gas: 223)
 Bytes32AddressLibTest:testFromLast20Bytes() (gas: 191)
 CREATE3Test:testDeployERC20() (gas: 853111)
-CREATE3Test:testDeployERC20(bytes32,string,string,uint8) (runs: 256, μ: 926485, ~: 922792)
+CREATE3Test:testDeployERC20(bytes32,string,string,uint8) (runs: 256, μ: 923654, ~: 921961)
 CREATE3Test:testFailDoubleDeployDifferentBytecode() (gas: 9079256848778914174)
-CREATE3Test:testFailDoubleDeployDifferentBytecode(bytes32,bytes,bytes) (runs: 256, μ: 5097107207950975693, ~: 8937393460516727446)
+CREATE3Test:testFailDoubleDeployDifferentBytecode(bytes32,bytes,bytes) (runs: 256, μ: 5062195514745832485, ~: 8937393460516727435)
 CREATE3Test:testFailDoubleDeploySameBytecode() (gas: 9079256848778906218)
-CREATE3Test:testFailDoubleDeploySameBytecode(bytes32,bytes) (runs: 256, μ: 4992372128335546560, ~: 8937393460516728665)
+CREATE3Test:testFailDoubleDeploySameBytecode(bytes32,bytes) (runs: 256, μ: 5027837975401088877, ~: 8937393460516728677)
 DSTestPlusTest:testBound() (gas: 14214)
 DSTestPlusTest:testBound(uint256,uint256,uint256) (runs: 256, μ: 2787, ~: 2793)
 DSTestPlusTest:testBrutalizeMemory() (gas: 823)
@@ -40,35 +40,35 @@ DSTestPlusTest:testFailBoundMinBiggerThanMax() (gas: 309)
 DSTestPlusTest:testFailBoundMinBiggerThanMax(uint256,uint256,uint256) (runs: 256, μ: 460, ~: 462)
 DSTestPlusTest:testRelApproxEqBothZeroesPasses() (gas: 425)
 ERC1155Test:testApproveAll() (gas: 31009)
-ERC1155Test:testApproveAll(address,bool) (runs: 256, μ: 16950, ~: 11440)
+ERC1155Test:testApproveAll(address,bool) (runs: 256, μ: 16872, ~: 11440)
 ERC1155Test:testBatchBalanceOf() (gas: 157631)
-ERC1155Test:testBatchBalanceOf(address[],uint256[],uint256[],bytes) (runs: 256, μ: 3308830, ~: 2596398)
+ERC1155Test:testBatchBalanceOf(address[],uint256[],uint256[],bytes) (runs: 256, μ: 3307946, ~: 2596398)
 ERC1155Test:testBatchBurn() (gas: 151074)
-ERC1155Test:testBatchBurn(address,uint256[],uint256[],uint256[],bytes) (runs: 256, μ: 3456094, ~: 3058687)
+ERC1155Test:testBatchBurn(address,uint256[],uint256[],uint256[],bytes) (runs: 256, μ: 3425444, ~: 3021348)
 ERC1155Test:testBatchMintToEOA() (gas: 137337)
-ERC1155Test:testBatchMintToEOA(address,uint256[],uint256[],bytes) (runs: 256, μ: 3262826, ~: 2923515)
+ERC1155Test:testBatchMintToEOA(address,uint256[],uint256[],bytes) (runs: 256, μ: 3261893, ~: 2923515)
 ERC1155Test:testBatchMintToERC1155Recipient() (gas: 995703)
-ERC1155Test:testBatchMintToERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 7338856, ~: 6396323)
+ERC1155Test:testBatchMintToERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 7336290, ~: 6396323)
 ERC1155Test:testBurn() (gas: 38598)
-ERC1155Test:testBurn(address,uint256,uint256,bytes,uint256) (runs: 256, μ: 40382, ~: 42098)
+ERC1155Test:testBurn(address,uint256,uint256,bytes,uint256) (runs: 256, μ: 40221, ~: 42098)
 ERC1155Test:testFailBalanceOfBatchWithArrayMismatch() (gas: 7933)
 ERC1155Test:testFailBalanceOfBatchWithArrayMismatch(address[],uint256[]) (runs: 256, μ: 53386, ~: 54066)
 ERC1155Test:testFailBatchBurnInsufficientBalance() (gas: 136156)
-ERC1155Test:testFailBatchBurnInsufficientBalance(address,uint256[],uint256[],uint256[],bytes) (runs: 256, μ: 1278880, ~: 440335)
+ERC1155Test:testFailBatchBurnInsufficientBalance(address,uint256[],uint256[],uint256[],bytes) (runs: 256, μ: 1278568, ~: 440335)
 ERC1155Test:testFailBatchBurnWithArrayLengthMismatch() (gas: 135542)
 ERC1155Test:testFailBatchBurnWithArrayLengthMismatch(address,uint256[],uint256[],uint256[],bytes) (runs: 256, μ: 77137, ~: 78751)
 ERC1155Test:testFailBatchMintToNonERC1155Recipient() (gas: 167292)
-ERC1155Test:testFailBatchMintToNonERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 3133211, ~: 2673077)
+ERC1155Test:testFailBatchMintToNonERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 3131966, ~: 2673077)
 ERC1155Test:testFailBatchMintToRevertingERC1155Recipient() (gas: 358811)
-ERC1155Test:testFailBatchMintToRevertingERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 3324749, ~: 2864613)
+ERC1155Test:testFailBatchMintToRevertingERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 3323504, ~: 2864613)
 ERC1155Test:testFailBatchMintToWrongReturnDataERC1155Recipient() (gas: 310743)
-ERC1155Test:testFailBatchMintToWrongReturnDataERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 3276707, ~: 2816572)
+ERC1155Test:testFailBatchMintToWrongReturnDataERC1155Recipient(uint256[],uint256[],bytes) (runs: 256, μ: 3275462, ~: 2816572)
 ERC1155Test:testFailBatchMintToZero() (gas: 131737)
-ERC1155Test:testFailBatchMintToZero(uint256[],uint256[],bytes) (runs: 256, μ: 3073711, ~: 2612336)
+ERC1155Test:testFailBatchMintToZero(uint256[],uint256[],bytes) (runs: 256, μ: 3072466, ~: 2612336)
 ERC1155Test:testFailBatchMintWithArrayMismatch() (gas: 9600)
 ERC1155Test:testFailBatchMintWithArrayMismatch(address,uint256[],uint256[],bytes) (runs: 256, μ: 69252, ~: 68809)
 ERC1155Test:testFailBurnInsufficientBalance() (gas: 34852)
-ERC1155Test:testFailBurnInsufficientBalance(address,uint256,uint256,uint256,bytes) (runs: 256, μ: 34366197998848897, ~: 38209)
+ERC1155Test:testFailBurnInsufficientBalance(address,uint256,uint256,uint256,bytes) (runs: 256, μ: 35951, ~: 38209)
 ERC1155Test:testFailMintToNonERC155Recipient() (gas: 68191)
 ERC1155Test:testFailMintToNonERC155Recipient(uint256,uint256,bytes) (runs: 256, μ: 68507, ~: 69197)
 ERC1155Test:testFailMintToRevertingERC155Recipient() (gas: 259435)
@@ -78,58 +78,58 @@ ERC1155Test:testFailMintToWrongReturnDataERC155Recipient(uint256,uint256,bytes)
 ERC1155Test:testFailMintToZero() (gas: 33705)
 ERC1155Test:testFailMintToZero(uint256,uint256,bytes) (runs: 256, μ: 33815, ~: 34546)
 ERC1155Test:testFailSafeBatchTransferFromToNonERC1155Recipient() (gas: 321377)
-ERC1155Test:testFailSafeBatchTransferFromToNonERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3493703, ~: 2963551)
+ERC1155Test:testFailSafeBatchTransferFromToNonERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3490437, ~: 2963551)
 ERC1155Test:testFailSafeBatchTransferFromToRevertingERC1155Recipient() (gas: 512956)
-ERC1155Test:testFailSafeBatchTransferFromToRevertingERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3685241, ~: 3155082)
+ERC1155Test:testFailSafeBatchTransferFromToRevertingERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3681974, ~: 3155082)
 ERC1155Test:testFailSafeBatchTransferFromToWrongReturnDataERC1155Recipient() (gas: 464847)
-ERC1155Test:testFailSafeBatchTransferFromToWrongReturnDataERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3637158, ~: 3107003)
+ERC1155Test:testFailSafeBatchTransferFromToWrongReturnDataERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3633892, ~: 3107003)
 ERC1155Test:testFailSafeBatchTransferFromToZero() (gas: 286556)
-ERC1155Test:testFailSafeBatchTransferFromToZero(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3458524, ~: 2928396)
+ERC1155Test:testFailSafeBatchTransferFromToZero(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 3455257, ~: 2928396)
 ERC1155Test:testFailSafeBatchTransferFromWithArrayLengthMismatch() (gas: 162674)
 ERC1155Test:testFailSafeBatchTransferFromWithArrayLengthMismatch(address,uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 81184, ~: 82042)
 ERC1155Test:testFailSafeBatchTransferInsufficientBalance() (gas: 163555)
-ERC1155Test:testFailSafeBatchTransferInsufficientBalance(address,uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 1497997, ~: 499517)
+ERC1155Test:testFailSafeBatchTransferInsufficientBalance(address,uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 1497154, ~: 499517)
 ERC1155Test:testFailSafeTransferFromInsufficientBalance() (gas: 63245)
-ERC1155Test:testFailSafeTransferFromInsufficientBalance(address,uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 63728, ~: 67405)
+ERC1155Test:testFailSafeTransferFromInsufficientBalance(address,uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 63986, ~: 67405)
 ERC1155Test:testFailSafeTransferFromSelfInsufficientBalance() (gas: 34297)
-ERC1155Test:testFailSafeTransferFromSelfInsufficientBalance(address,uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 36121, ~: 38512)
+ERC1155Test:testFailSafeTransferFromSelfInsufficientBalance(address,uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 36266, ~: 38512)
 ERC1155Test:testFailSafeTransferFromToNonERC155Recipient() (gas: 96510)
-ERC1155Test:testFailSafeTransferFromToNonERC155Recipient(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 96657, ~: 100546)
+ERC1155Test:testFailSafeTransferFromToNonERC155Recipient(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 96580, ~: 100546)
 ERC1155Test:testFailSafeTransferFromToRevertingERC1155Recipient() (gas: 287731)
-ERC1155Test:testFailSafeTransferFromToRevertingERC1155Recipient(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 287828, ~: 291719)
+ERC1155Test:testFailSafeTransferFromToRevertingERC1155Recipient(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 287750, ~: 291719)
 ERC1155Test:testFailSafeTransferFromToWrongReturnDataERC1155Recipient() (gas: 239587)
-ERC1155Test:testFailSafeTransferFromToWrongReturnDataERC1155Recipient(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 239707, ~: 243598)
+ERC1155Test:testFailSafeTransferFromToWrongReturnDataERC1155Recipient(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 239629, ~: 243598)
 ERC1155Test:testFailSafeTransferFromToZero() (gas: 62014)
-ERC1155Test:testFailSafeTransferFromToZero(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 62146, ~: 66037)
+ERC1155Test:testFailSafeTransferFromToZero(uint256,uint256,uint256,bytes,bytes) (runs: 256, μ: 62068, ~: 66037)
 ERC1155Test:testMintToEOA() (gas: 34765)
-ERC1155Test:testMintToEOA(address,uint256,uint256,bytes) (runs: 256, μ: 35475, ~: 35907)
+ERC1155Test:testMintToEOA(address,uint256,uint256,bytes) (runs: 256, μ: 35426, ~: 35907)
 ERC1155Test:testMintToERC1155Recipient() (gas: 661411)
 ERC1155Test:testMintToERC1155Recipient(uint256,uint256,bytes) (runs: 256, μ: 691094, ~: 684374)
 ERC1155Test:testSafeBatchTransferFromToEOA() (gas: 297822)
-ERC1155Test:testSafeBatchTransferFromToEOA(address,uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 4739386, ~: 3780789)
+ERC1155Test:testSafeBatchTransferFromToEOA(address,uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 4692589, ~: 3776319)
 ERC1155Test:testSafeBatchTransferFromToERC1155Recipient() (gas: 1175327)
-ERC1155Test:testSafeBatchTransferFromToERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 7695725, ~: 6552884)
+ERC1155Test:testSafeBatchTransferFromToERC1155Recipient(uint256[],uint256[],uint256[],bytes,bytes) (runs: 256, μ: 7683519, ~: 6515438)
 ERC1155Test:testSafeTransferFromSelf() (gas: 64177)
-ERC1155Test:testSafeTransferFromSelf(uint256,uint256,bytes,uint256,address,bytes) (runs: 256, μ: 64561, ~: 68564)
+ERC1155Test:testSafeTransferFromSelf(uint256,uint256,bytes,uint256,address,bytes) (runs: 256, μ: 64824, ~: 68564)
 ERC1155Test:testSafeTransferFromToEOA() (gas: 93167)
-ERC1155Test:testSafeTransferFromToEOA(uint256,uint256,bytes,uint256,address,bytes) (runs: 256, μ: 92452, ~: 97450)
+ERC1155Test:testSafeTransferFromToEOA(uint256,uint256,bytes,uint256,address,bytes) (runs: 256, μ: 93578, ~: 97450)
 ERC1155Test:testSafeTransferFromToERC1155Recipient() (gas: 739583)
 ERC1155Test:testSafeTransferFromToERC1155Recipient(uint256,uint256,bytes,uint256,bytes) (runs: 256, μ: 769591, ~: 765729)
-ERC20Invariants:invariantBalanceSum() (runs: 256, calls: 3840, reverts: 2399)
-ERC20Test:invariantMetadata() (runs: 256, calls: 3840, reverts: 2599)
+ERC20Invariants:invariantBalanceSum() (runs: 256, calls: 3840, reverts: 2388)
+ERC20Test:invariantMetadata() (runs: 256, calls: 3840, reverts: 2610)
 ERC20Test:testApprove() (gas: 31058)
 ERC20Test:testApprove(address,uint256) (runs: 256, μ: 30424, ~: 31280)
 ERC20Test:testBurn() (gas: 56970)
 ERC20Test:testBurn(address,uint256,uint256) (runs: 256, μ: 56678, ~: 59645)
 ERC20Test:testFailBurnInsufficientBalance(address,uint256,uint256) (runs: 256, μ: 51897, ~: 55492)
 ERC20Test:testFailPermitBadDeadline() (gas: 36935)
-ERC20Test:testFailPermitBadDeadline(uint256,address,uint256,uint256) (runs: 256, μ: 32149, ~: 37218)
+ERC20Test:testFailPermitBadDeadline(uint256,address,uint256,uint256) (runs: 256, μ: 32148, ~: 37218)
 ERC20Test:testFailPermitBadNonce() (gas: 36874)
-ERC20Test:testFailPermitBadNonce(uint256,address,uint256,uint256,uint256) (runs: 256, μ: 31629, ~: 37187)
+ERC20Test:testFailPermitBadNonce(uint256,address,uint256,uint256,uint256) (runs: 256, μ: 31628, ~: 37187)
 ERC20Test:testFailPermitPastDeadline() (gas: 11191)
 ERC20Test:testFailPermitPastDeadline(uint256,address,uint256,uint256) (runs: 256, μ: 12037, ~: 13101)
 ERC20Test:testFailPermitReplay() (gas: 66274)
-ERC20Test:testFailPermitReplay(uint256,address,uint256,uint256) (runs: 256, μ: 56825, ~: 66592)
+ERC20Test:testFailPermitReplay(uint256,address,uint256,uint256) (runs: 256, μ: 57071, ~: 66592)
 ERC20Test:testFailTransferFromInsufficientAllowance() (gas: 80882)
 ERC20Test:testFailTransferFromInsufficientAllowance(address,uint256,uint256) (runs: 256, μ: 79858, ~: 83393)
 ERC20Test:testFailTransferFromInsufficientBalance() (gas: 81358)
@@ -137,7 +137,7 @@ ERC20Test:testFailTransferFromInsufficientBalance(address,uint256,uint256) (runs
 ERC20Test:testFailTransferInsufficientBalance() (gas: 52806)
 ERC20Test:testFailTransferInsufficientBalance(address,uint256,uint256) (runs: 256, μ: 51720, ~: 55310)
 ERC20Test:testInfiniteApproveTransferFrom() (gas: 89793)
-ERC20Test:testMetadata(string,string,uint8) (runs: 256, μ: 867830, ~: 863173)
+ERC20Test:testMetadata(string,string,uint8) (runs: 256, μ: 869043, ~: 863173)
 ERC20Test:testMint() (gas: 53746)
 ERC20Test:testMint(address,uint256) (runs: 256, μ: 52214, ~: 53925)
 ERC20Test:testPermit() (gas: 63193)
@@ -145,8 +145,8 @@ ERC20Test:testPermit(uint248,address,uint256,uint256) (runs: 256, μ: 62584, ~:
 ERC20Test:testTransfer() (gas: 60272)
 ERC20Test:testTransfer(address,uint256) (runs: 256, μ: 58773, ~: 60484)
 ERC20Test:testTransferFrom() (gas: 83777)
-ERC20Test:testTransferFrom(address,uint256,uint256) (runs: 256, μ: 86461, ~: 92841)
-ERC4626Test:invariantMetadata() (runs: 256, calls: 3840, reverts: 2897)
+ERC20Test:testTransferFrom(address,uint256,uint256) (runs: 256, μ: 86308, ~: 92841)
+ERC4626Test:invariantMetadata() (runs: 256, calls: 3840, reverts: 2901)
 ERC4626Test:testFailDepositWithNoApproval() (gas: 13369)
 ERC4626Test:testFailDepositWithNotEnoughApproval() (gas: 87005)
 ERC4626Test:testFailDepositZero() (gas: 7780)
@@ -156,24 +156,24 @@ ERC4626Test:testFailRedeemWithNotEnoughShareAmount() (gas: 203643)
 ERC4626Test:testFailRedeemZero() (gas: 7967)
 ERC4626Test:testFailWithdrawWithNoUnderlyingAmount() (gas: 32289)
 ERC4626Test:testFailWithdrawWithNotEnoughUnderlyingAmount() (gas: 203607)
-ERC4626Test:testMetadata(string,string) (runs: 256, μ: 1502883, ~: 1494729)
+ERC4626Test:testMetadata(string,string) (runs: 256, μ: 1503475, ~: 1494729)
 ERC4626Test:testMintZero() (gas: 54607)
 ERC4626Test:testMultipleMintDepositRedeemWithdraw() (gas: 411804)
-ERC4626Test:testSingleDepositWithdraw(uint128) (runs: 256, μ: 201539, ~: 201550)
-ERC4626Test:testSingleMintRedeem(uint128) (runs: 256, μ: 201465, ~: 201476)
+ERC4626Test:testSingleDepositWithdraw(uint128) (runs: 256, μ: 201540, ~: 201550)
+ERC4626Test:testSingleMintRedeem(uint128) (runs: 256, μ: 201466, ~: 201476)
 ERC4626Test:testVaultInteractionsForSomeoneElse() (gas: 286238)
 ERC4626Test:testWithdrawZero() (gas: 52468)
-ERC721Test:invariantMetadata() (runs: 256, calls: 3840, reverts: 2221)
+ERC721Test:invariantMetadata() (runs: 256, calls: 3840, reverts: 2183)
 ERC721Test:testApprove() (gas: 78427)
 ERC721Test:testApprove(address,uint256) (runs: 256, μ: 78637, ~: 78637)
 ERC721Test:testApproveAll() (gas: 31063)
 ERC721Test:testApproveAll(address,bool) (runs: 256, μ: 16970, ~: 11538)
 ERC721Test:testApproveBurn() (gas: 65550)
-ERC721Test:testApproveBurn(address,uint256) (runs: 256, μ: 65359, ~: 65619)
+ERC721Test:testApproveBurn(address,uint256) (runs: 256, μ: 65613, ~: 65624)
 ERC721Test:testBurn() (gas: 46107)
-ERC721Test:testBurn(address,uint256) (runs: 256, μ: 46140, ~: 46145)
+ERC721Test:testBurn(address,uint256) (runs: 256, μ: 46152, ~: 46163)
 ERC721Test:testFailApproveUnAuthorized() (gas: 55598)
-ERC721Test:testFailApproveUnAuthorized(address,uint256,address) (runs: 256, μ: 55872, ~: 55873)
+ERC721Test:testFailApproveUnAuthorized(address,uint256,address) (runs: 256, μ: 55873, ~: 55873)
 ERC721Test:testFailApproveUnMinted() (gas: 10236)
 ERC721Test:testFailApproveUnMinted(uint256,address) (runs: 256, μ: 10363, ~: 10363)
 ERC721Test:testFailBalanceOfZeroAddress() (gas: 5555)
@@ -212,75 +212,75 @@ ERC721Test:testFailSafeTransferFromToRevertingERC721Recipient(uint256) (runs: 25
 ERC721Test:testFailSafeTransferFromToRevertingERC721RecipientWithData() (gas: 233396)
 ERC721Test:testFailSafeTransferFromToRevertingERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 233823, ~: 233819)
 ERC721Test:testFailTransferFromNotOwner() (gas: 57872)
-ERC721Test:testFailTransferFromNotOwner(address,address,uint256) (runs: 256, μ: 57631, ~: 58162)
+ERC721Test:testFailTransferFromNotOwner(address,address,uint256) (runs: 256, μ: 57515, ~: 58162)
 ERC721Test:testFailTransferFromToZero() (gas: 53381)
 ERC721Test:testFailTransferFromToZero(uint256) (runs: 256, μ: 53463, ~: 53463)
 ERC721Test:testFailTransferFromUnOwned() (gas: 8000)
-ERC721Test:testFailTransferFromUnOwned(address,address,uint256) (runs: 256, μ: 8276, ~: 8241)
+ERC721Test:testFailTransferFromUnOwned(address,address,uint256) (runs: 256, μ: 8311, ~: 8241)
 ERC721Test:testFailTransferFromWrongFrom() (gas: 53361)
-ERC721Test:testFailTransferFromWrongFrom(address,address,address,uint256) (runs: 256, μ: 53194, ~: 53752)
-ERC721Test:testMetadata(string,string) (runs: 256, μ: 1341573, ~: 1332786)
+ERC721Test:testFailTransferFromWrongFrom(address,address,address,uint256) (runs: 256, μ: 53566, ~: 53752)
+ERC721Test:testMetadata(string,string) (runs: 256, μ: 1341878, ~: 1332786)
 ERC721Test:testMint() (gas: 54336)
 ERC721Test:testMint(address,uint256) (runs: 256, μ: 54521, ~: 54521)
 ERC721Test:testSafeMintToEOA() (gas: 56993)
-ERC721Test:testSafeMintToEOA(uint256,address) (runs: 256, μ: 57421, ~: 57421)
+ERC721Test:testSafeMintToEOA(uint256,address) (runs: 256, μ: 56976, ~: 57421)
 ERC721Test:testSafeMintToERC721Recipient() (gas: 427035)
 ERC721Test:testSafeMintToERC721Recipient(uint256) (runs: 256, μ: 426053, ~: 427142)
 ERC721Test:testSafeMintToERC721RecipientWithData() (gas: 448149)
 ERC721Test:testSafeMintToERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 480015, ~: 470905)
 ERC721Test:testSafeTransferFromToEOA() (gas: 95666)
-ERC721Test:testSafeTransferFromToEOA(uint256,address) (runs: 256, μ: 96098, ~: 96099)
+ERC721Test:testSafeTransferFromToEOA(uint256,address) (runs: 256, μ: 95352, ~: 96099)
 ERC721Test:testSafeTransferFromToERC721Recipient() (gas: 485549)
 ERC721Test:testSafeTransferFromToERC721Recipient(uint256) (runs: 256, μ: 484593, ~: 485682)
 ERC721Test:testSafeTransferFromToERC721RecipientWithData() (gas: 506317)
-ERC721Test:testSafeTransferFromToERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 538048, ~: 529082)
+ERC721Test:testSafeTransferFromToERC721RecipientWithData(uint256,bytes) (runs: 256, μ: 538126, ~: 529082)
 ERC721Test:testTransferFrom() (gas: 86347)
-ERC721Test:testTransferFrom(uint256,address) (runs: 256, μ: 86456, ~: 86456)
+ERC721Test:testTransferFrom(uint256,address) (runs: 256, μ: 86469, ~: 86477)
 ERC721Test:testTransferFromApproveAll() (gas: 92898)
-ERC721Test:testTransferFromApproveAll(uint256,address) (runs: 256, μ: 93181, ~: 93182)
+ERC721Test:testTransferFromApproveAll(uint256,address) (runs: 256, μ: 93182, ~: 93182)
 ERC721Test:testTransferFromSelf() (gas: 64776)
-ERC721Test:testTransferFromSelf(uint256,address) (runs: 256, μ: 65060, ~: 65061)
-FixedPointMathLibTest:testDifferentiallyFuzzSqrt(uint256) (runs: 256, μ: 14263, ~: 6467)
+ERC721Test:testTransferFromSelf(uint256,address) (runs: 256, μ: 65061, ~: 65061)
+FixedPointMathLibTest:testDifferentiallyFuzzSqrt(uint256) (runs: 256, μ: 13809, ~: 4181)
 FixedPointMathLibTest:testDivWadDown() (gas: 820)
-FixedPointMathLibTest:testDivWadDown(uint256,uint256) (runs: 256, μ: 716, ~: 813)
+FixedPointMathLibTest:testDivWadDown(uint256,uint256) (runs: 256, μ: 712, ~: 813)
 FixedPointMathLibTest:testDivWadDownEdgeCases() (gas: 439)
 FixedPointMathLibTest:testDivWadUp() (gas: 943)
-FixedPointMathLibTest:testDivWadUp(uint256,uint256) (runs: 256, μ: 799, ~: 952)
+FixedPointMathLibTest:testDivWadUp(uint256,uint256) (runs: 256, μ: 792, ~: 952)
 FixedPointMathLibTest:testDivWadUpEdgeCases() (gas: 442)
-FixedPointMathLibTest:testFailDivWadDownOverflow(uint256,uint256) (runs: 256, μ: 440, ~: 419)
+FixedPointMathLibTest:testFailDivWadDownOverflow(uint256,uint256) (runs: 256, μ: 442, ~: 419)
 FixedPointMathLibTest:testFailDivWadDownZeroDenominator() (gas: 332)
 FixedPointMathLibTest:testFailDivWadDownZeroDenominator(uint256) (runs: 256, μ: 387, ~: 387)
-FixedPointMathLibTest:testFailDivWadUpOverflow(uint256,uint256) (runs: 256, μ: 395, ~: 374)
+FixedPointMathLibTest:testFailDivWadUpOverflow(uint256,uint256) (runs: 256, μ: 397, ~: 374)
 FixedPointMathLibTest:testFailDivWadUpZeroDenominator() (gas: 332)
 FixedPointMathLibTest:testFailDivWadUpZeroDenominator(uint256) (runs: 256, μ: 386, ~: 386)
-FixedPointMathLibTest:testFailMulDivDownOverflow(uint256,uint256,uint256) (runs: 256, μ: 436, ~: 414)
+FixedPointMathLibTest:testFailMulDivDownOverflow(uint256,uint256,uint256) (runs: 256, μ: 434, ~: 414)
 FixedPointMathLibTest:testFailMulDivDownZeroDenominator() (gas: 328)
 FixedPointMathLibTest:testFailMulDivDownZeroDenominator(uint256,uint256) (runs: 256, μ: 385, ~: 385)
-FixedPointMathLibTest:testFailMulDivUpOverflow(uint256,uint256,uint256) (runs: 256, μ: 459, ~: 437)
+FixedPointMathLibTest:testFailMulDivUpOverflow(uint256,uint256,uint256) (runs: 256, μ: 457, ~: 437)
 FixedPointMathLibTest:testFailMulDivUpZeroDenominator() (gas: 329)
 FixedPointMathLibTest:testFailMulDivUpZeroDenominator(uint256,uint256) (runs: 256, μ: 428, ~: 428)
-FixedPointMathLibTest:testFailMulWadDownOverflow(uint256,uint256) (runs: 256, μ: 418, ~: 387)
-FixedPointMathLibTest:testFailMulWadUpOverflow(uint256,uint256) (runs: 256, μ: 395, ~: 364)
+FixedPointMathLibTest:testFailMulWadDownOverflow(uint256,uint256) (runs: 256, μ: 421, ~: 387)
+FixedPointMathLibTest:testFailMulWadUpOverflow(uint256,uint256) (runs: 256, μ: 398, ~: 364)
 FixedPointMathLibTest:testMulDivDown() (gas: 1813)
-FixedPointMathLibTest:testMulDivDown(uint256,uint256,uint256) (runs: 256, μ: 682, ~: 786)
+FixedPointMathLibTest:testMulDivDown(uint256,uint256,uint256) (runs: 256, μ: 686, ~: 786)
 FixedPointMathLibTest:testMulDivDownEdgeCases() (gas: 686)
 FixedPointMathLibTest:testMulDivUp() (gas: 2095)
-FixedPointMathLibTest:testMulDivUp(uint256,uint256,uint256) (runs: 256, μ: 813, ~: 1034)
+FixedPointMathLibTest:testMulDivUp(uint256,uint256,uint256) (runs: 256, μ: 821, ~: 1034)
 FixedPointMathLibTest:testMulDivUpEdgeCases() (gas: 785)
 FixedPointMathLibTest:testMulWadDown() (gas: 823)
-FixedPointMathLibTest:testMulWadDown(uint256,uint256) (runs: 256, μ: 691, ~: 803)
+FixedPointMathLibTest:testMulWadDown(uint256,uint256) (runs: 256, μ: 681, ~: 803)
 FixedPointMathLibTest:testMulWadDownEdgeCases() (gas: 822)
 FixedPointMathLibTest:testMulWadUp() (gas: 921)
-FixedPointMathLibTest:testMulWadUp(uint256,uint256) (runs: 256, μ: 838, ~: 1053)
+FixedPointMathLibTest:testMulWadUp(uint256,uint256) (runs: 256, μ: 821, ~: 1053)
 FixedPointMathLibTest:testMulWadUpEdgeCases() (gas: 899)
 FixedPointMathLibTest:testRPow() (gas: 2164)
 FixedPointMathLibTest:testSqrt() (gas: 2580)
-FixedPointMathLibTest:testSqrt(uint256) (runs: 256, μ: 998, ~: 1013)
-FixedPointMathLibTest:testSqrtBack(uint256) (runs: 256, μ: 15909, ~: 340)
-FixedPointMathLibTest:testSqrtBackHashed(uint256) (runs: 256, μ: 59019, ~: 59500)
+FixedPointMathLibTest:testSqrt(uint256) (runs: 256, μ: 997, ~: 1013)
+FixedPointMathLibTest:testSqrtBack(uint256) (runs: 256, μ: 15210, ~: 340)
+FixedPointMathLibTest:testSqrtBackHashed(uint256) (runs: 256, μ: 59066, ~: 59500)
 FixedPointMathLibTest:testSqrtBackHashedSingle() (gas: 58937)
-LibStringTest:testDifferentiallyFuzzToString(uint256,bytes) (runs: 256, μ: 23068, ~: 14223)
-LibStringTest:testDifferentiallyFuzzToStringInt(int256,bytes) (runs: 256, μ: 19802, ~: 7823)
+LibStringTest:testDifferentiallyFuzzToString(uint256,bytes) (runs: 256, μ: 20892, ~: 8988)
+LibStringTest:testDifferentiallyFuzzToStringInt(int256,bytes) (runs: 256, μ: 20081, ~: 8356)
 LibStringTest:testToString() (gas: 10069)
 LibStringTest:testToStringDirty() (gas: 8145)
 LibStringTest:testToStringIntNegative() (gas: 9634)
@@ -291,48 +291,48 @@ MerkleProofLibTest:testVerifyEmptyMerkleProofSuppliedLeafAndRootDifferent() (gas
 MerkleProofLibTest:testVerifyEmptyMerkleProofSuppliedLeafAndRootSame() (gas: 1452)
 MerkleProofLibTest:testVerifyInvalidProofSupplied() (gas: 2172)
 MultiRolesAuthorityTest:testCanCallPublicCapability() (gas: 34204)
-MultiRolesAuthorityTest:testCanCallPublicCapability(address,address,bytes4) (runs: 256, μ: 34380, ~: 34361)
+MultiRolesAuthorityTest:testCanCallPublicCapability(address,address,bytes4) (runs: 256, μ: 34390, ~: 34361)
 MultiRolesAuthorityTest:testCanCallWithAuthorizedRole() (gas: 80416)
-MultiRolesAuthorityTest:testCanCallWithAuthorizedRole(address,uint8,address,bytes4) (runs: 256, μ: 80692, ~: 80671)
+MultiRolesAuthorityTest:testCanCallWithAuthorizedRole(address,uint8,address,bytes4) (runs: 256, μ: 80705, ~: 80671)
 MultiRolesAuthorityTest:testCanCallWithCustomAuthority() (gas: 422439)
 MultiRolesAuthorityTest:testCanCallWithCustomAuthority(address,address,bytes4) (runs: 256, μ: 422858, ~: 422858)
 MultiRolesAuthorityTest:testCanCallWithCustomAuthorityOverridesPublicCapability() (gas: 247388)
 MultiRolesAuthorityTest:testCanCallWithCustomAuthorityOverridesPublicCapability(address,address,bytes4) (runs: 256, μ: 247841, ~: 247841)
 MultiRolesAuthorityTest:testCanCallWithCustomAuthorityOverridesUserWithRole() (gas: 256546)
-MultiRolesAuthorityTest:testCanCallWithCustomAuthorityOverridesUserWithRole(address,uint8,address,bytes4) (runs: 256, μ: 256868, ~: 256852)
+MultiRolesAuthorityTest:testCanCallWithCustomAuthorityOverridesUserWithRole(address,uint8,address,bytes4) (runs: 256, μ: 256885, ~: 256852)
 MultiRolesAuthorityTest:testSetPublicCapabilities() (gas: 27727)
 MultiRolesAuthorityTest:testSetPublicCapabilities(bytes4) (runs: 256, μ: 27836, ~: 27835)
 MultiRolesAuthorityTest:testSetRoleCapabilities() (gas: 28932)
-MultiRolesAuthorityTest:testSetRoleCapabilities(uint8,bytes4) (runs: 256, μ: 29074, ~: 29072)
+MultiRolesAuthorityTest:testSetRoleCapabilities(uint8,bytes4) (runs: 256, μ: 29073, ~: 29073)
 MultiRolesAuthorityTest:testSetRoles() (gas: 28918)
-MultiRolesAuthorityTest:testSetRoles(address,uint8) (runs: 256, μ: 29027, ~: 29014)
+MultiRolesAuthorityTest:testSetRoles(address,uint8) (runs: 256, μ: 29030, ~: 29016)
 MultiRolesAuthorityTest:testSetTargetCustomAuthority() (gas: 28102)
-MultiRolesAuthorityTest:testSetTargetCustomAuthority(address,address) (runs: 256, μ: 28136, ~: 28144)
+MultiRolesAuthorityTest:testSetTargetCustomAuthority(address,address) (runs: 256, μ: 28176, ~: 28146)
 OwnedTest:testCallFunctionAsNonOwner() (gas: 11344)
-OwnedTest:testCallFunctionAsNonOwner(address) (runs: 256, μ: 16215, ~: 16290)
+OwnedTest:testCallFunctionAsNonOwner(address) (runs: 256, μ: 16252, ~: 16290)
 OwnedTest:testCallFunctionAsOwner() (gas: 10435)
 OwnedTest:testTransferOwnership() (gas: 13123)
-OwnedTest:testTransferOwnership(address) (runs: 256, μ: 13117, ~: 13192)
-ReentrancyGuardTest:invariantReentrancyStatusAlways1() (runs: 256, calls: 3840, reverts: 255)
+OwnedTest:testTransferOwnership(address) (runs: 256, μ: 13154, ~: 13192)
+ReentrancyGuardTest:invariantReentrancyStatusAlways1() (runs: 256, calls: 3840, reverts: 266)
 ReentrancyGuardTest:testFailUnprotectedCall() (gas: 46147)
 ReentrancyGuardTest:testNoReentrancy() (gas: 7515)
 ReentrancyGuardTest:testProtectedCall() (gas: 33467)
 RolesAuthorityTest:testCanCallPublicCapability() (gas: 33409)
-RolesAuthorityTest:testCanCallPublicCapability(address,address,bytes4) (runs: 256, μ: 33550, ~: 33532)
+RolesAuthorityTest:testCanCallPublicCapability(address,address,bytes4) (runs: 256, μ: 33560, ~: 33532)
 RolesAuthorityTest:testCanCallWithAuthorizedRole() (gas: 79995)
-RolesAuthorityTest:testCanCallWithAuthorizedRole(address,uint8,address,bytes4) (runs: 256, μ: 80256, ~: 80238)
+RolesAuthorityTest:testCanCallWithAuthorizedRole(address,uint8,address,bytes4) (runs: 256, μ: 80272, ~: 80238)
 RolesAuthorityTest:testSetPublicCapabilities() (gas: 29095)
-RolesAuthorityTest:testSetPublicCapabilities(address,bytes4) (runs: 256, μ: 29204, ~: 29192)
+RolesAuthorityTest:testSetPublicCapabilities(address,bytes4) (runs: 256, μ: 29209, ~: 29192)
 RolesAuthorityTest:testSetRoleCapabilities() (gas: 30276)
-RolesAuthorityTest:testSetRoleCapabilities(uint8,address,bytes4) (runs: 256, μ: 30502, ~: 30489)
+RolesAuthorityTest:testSetRoleCapabilities(uint8,address,bytes4) (runs: 256, μ: 30506, ~: 30489)
 RolesAuthorityTest:testSetRoles() (gas: 29005)
-RolesAuthorityTest:testSetRoles(address,uint8) (runs: 256, μ: 29117, ~: 29106)
+RolesAuthorityTest:testSetRoles(address,uint8) (runs: 256, μ: 29122, ~: 29108)
 SSTORE2Test:testFailReadInvalidPointer() (gas: 2927)
-SSTORE2Test:testFailReadInvalidPointer(address,bytes) (runs: 256, μ: 3877, ~: 3892)
+SSTORE2Test:testFailReadInvalidPointer(address,bytes) (runs: 256, μ: 3889, ~: 3892)
 SSTORE2Test:testFailReadInvalidPointerCustomBounds() (gas: 3099)
-SSTORE2Test:testFailReadInvalidPointerCustomBounds(address,uint256,uint256,bytes) (runs: 256, μ: 4109, ~: 4130)
+SSTORE2Test:testFailReadInvalidPointerCustomBounds(address,uint256,uint256,bytes) (runs: 256, μ: 4107, ~: 4130)
 SSTORE2Test:testFailReadInvalidPointerCustomStartBound() (gas: 3004)
-SSTORE2Test:testFailReadInvalidPointerCustomStartBound(address,uint256,bytes) (runs: 256, μ: 3990, ~: 3988)
+SSTORE2Test:testFailReadInvalidPointerCustomStartBound(address,uint256,bytes) (runs: 256, μ: 3980, ~: 3988)
 SSTORE2Test:testFailWriteReadCustomBoundsOutOfRange(bytes,uint256,uint256,bytes) (runs: 256, μ: 46236, ~: 43603)
 SSTORE2Test:testFailWriteReadCustomStartBoundOutOfRange(bytes,uint256,bytes) (runs: 256, μ: 46017, ~: 43452)
 SSTORE2Test:testFailWriteReadEmptyOutOfBounds() (gas: 34470)
@@ -341,7 +341,7 @@ SSTORE2Test:testFailWriteReadOutOfStartBound() (gas: 34362)
 SSTORE2Test:testWriteRead() (gas: 53497)
 SSTORE2Test:testWriteRead(bytes,bytes) (runs: 256, μ: 44019, ~: 41555)
 SSTORE2Test:testWriteReadCustomBounds() (gas: 34869)
-SSTORE2Test:testWriteReadCustomBounds(bytes,uint256,uint256,bytes) (runs: 256, μ: 27262, ~: 5935)
+SSTORE2Test:testWriteReadCustomBounds(bytes,uint256,uint256,bytes) (runs: 256, μ: 29483, ~: 44592)
 SSTORE2Test:testWriteReadCustomStartBound() (gas: 34740)
 SSTORE2Test:testWriteReadCustomStartBound(bytes,uint256,bytes) (runs: 256, μ: 46484, ~: 44053)
 SSTORE2Test:testWriteReadEmptyBound() (gas: 34677)
@@ -468,16 +468,16 @@ SafeCastLibTest:testSafeCastTo80(uint256) (runs: 256, μ: 2736, ~: 2736)
 SafeCastLibTest:testSafeCastTo88(uint256) (runs: 256, μ: 2755, ~: 2755)
 SafeCastLibTest:testSafeCastTo96() (gas: 536)
 SafeCastLibTest:testSafeCastTo96(uint256) (runs: 256, μ: 2800, ~: 2800)
-SafeTransferLibTest:testApproveWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 2685, ~: 2231)
+SafeTransferLibTest:testApproveWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 2664, ~: 2231)
 SafeTransferLibTest:testApproveWithMissingReturn() (gas: 30757)
 SafeTransferLibTest:testApproveWithMissingReturn(address,uint256,bytes) (runs: 256, μ: 30334, ~: 31572)
 SafeTransferLibTest:testApproveWithNonContract() (gas: 3041)
-SafeTransferLibTest:testApproveWithNonContract(address,address,uint256,bytes) (runs: 256, μ: 4083, ~: 4123)
+SafeTransferLibTest:testApproveWithNonContract(address,address,uint256,bytes) (runs: 256, μ: 4127, ~: 4123)
 SafeTransferLibTest:testApproveWithReturnsTooMuch() (gas: 31140)
 SafeTransferLibTest:testApproveWithReturnsTooMuch(address,uint256,bytes) (runs: 256, μ: 30802, ~: 32040)
 SafeTransferLibTest:testApproveWithStandardERC20() (gas: 30888)
 SafeTransferLibTest:testApproveWithStandardERC20(address,uint256,bytes) (runs: 256, μ: 30528, ~: 31766)
-SafeTransferLibTest:testFailApproveWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 84521, ~: 77915)
+SafeTransferLibTest:testFailApproveWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 84443, ~: 77915)
 SafeTransferLibTest:testFailApproveWithReturnsFalse() (gas: 5633)
 SafeTransferLibTest:testFailApproveWithReturnsFalse(address,uint256,bytes) (runs: 256, μ: 6486, ~: 6481)
 SafeTransferLibTest:testFailApproveWithReturnsTooLittle() (gas: 5574)
@@ -487,7 +487,7 @@ SafeTransferLibTest:testFailApproveWithReverting() (gas: 5508)
 SafeTransferLibTest:testFailApproveWithReverting(address,uint256,bytes) (runs: 256, μ: 6409, ~: 6404)
 SafeTransferLibTest:testFailTransferETHToContractWithoutFallback() (gas: 7244)
 SafeTransferLibTest:testFailTransferETHToContractWithoutFallback(uint256,bytes) (runs: 256, μ: 7758, ~: 8055)
-SafeTransferLibTest:testFailTransferFromWithGarbage(address,address,uint256,bytes,bytes) (runs: 256, μ: 122350, ~: 117413)
+SafeTransferLibTest:testFailTransferFromWithGarbage(address,address,uint256,bytes,bytes) (runs: 256, μ: 123254, ~: 117413)
 SafeTransferLibTest:testFailTransferFromWithReturnsFalse() (gas: 13675)
 SafeTransferLibTest:testFailTransferFromWithReturnsFalse(address,address,uint256,bytes) (runs: 256, μ: 14605, ~: 14600)
 SafeTransferLibTest:testFailTransferFromWithReturnsTooLittle() (gas: 13556)
@@ -495,7 +495,7 @@ SafeTransferLibTest:testFailTransferFromWithReturnsTooLittle(address,address,uin
 SafeTransferLibTest:testFailTransferFromWithReturnsTwo(address,address,uint256,bytes) (runs: 256, μ: 14571, ~: 14566)
 SafeTransferLibTest:testFailTransferFromWithReverting() (gas: 9757)
 SafeTransferLibTest:testFailTransferFromWithReverting(address,address,uint256,bytes) (runs: 256, μ: 10685, ~: 10680)
-SafeTransferLibTest:testFailTransferWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 90454, ~: 83995)
+SafeTransferLibTest:testFailTransferWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 90366, ~: 83995)
 SafeTransferLibTest:testFailTransferWithReturnsFalse() (gas: 8538)
 SafeTransferLibTest:testFailTransferWithReturnsFalse(address,uint256,bytes) (runs: 256, μ: 9457, ~: 9452)
 SafeTransferLibTest:testFailTransferWithReturnsTooLittle() (gas: 8544)
@@ -504,35 +504,35 @@ SafeTransferLibTest:testFailTransferWithReturnsTwo(address,uint256,bytes) (runs:
 SafeTransferLibTest:testFailTransferWithReverting() (gas: 8500)
 SafeTransferLibTest:testFailTransferWithReverting(address,uint256,bytes) (runs: 256, μ: 9356, ~: 9351)
 SafeTransferLibTest:testTransferETH() (gas: 34592)
-SafeTransferLibTest:testTransferETH(address,uint256,bytes) (runs: 256, μ: 35119, ~: 37975)
-SafeTransferLibTest:testTransferFromWithGarbage(address,address,uint256,bytes,bytes) (runs: 256, μ: 2916, ~: 2247)
+SafeTransferLibTest:testTransferETH(address,uint256,bytes) (runs: 256, μ: 35865, ~: 37975)
+SafeTransferLibTest:testTransferFromWithGarbage(address,address,uint256,bytes,bytes) (runs: 256, μ: 2907, ~: 2247)
 SafeTransferLibTest:testTransferFromWithMissingReturn() (gas: 49196)
-SafeTransferLibTest:testTransferFromWithMissingReturn(address,address,uint256,bytes) (runs: 256, μ: 48341, ~: 49591)
+SafeTransferLibTest:testTransferFromWithMissingReturn(address,address,uint256,bytes) (runs: 256, μ: 48365, ~: 49607)
 SafeTransferLibTest:testTransferFromWithNonContract() (gas: 3047)
-SafeTransferLibTest:testTransferFromWithNonContract(address,address,address,uint256,bytes) (runs: 256, μ: 4246, ~: 4240)
+SafeTransferLibTest:testTransferFromWithNonContract(address,address,address,uint256,bytes) (runs: 256, μ: 4233, ~: 4240)
 SafeTransferLibTest:testTransferFromWithReturnsTooMuch() (gas: 49820)
-SafeTransferLibTest:testTransferFromWithReturnsTooMuch(address,address,uint256,bytes) (runs: 256, μ: 48989, ~: 50230)
+SafeTransferLibTest:testTransferFromWithReturnsTooMuch(address,address,uint256,bytes) (runs: 256, μ: 49012, ~: 50246)
 SafeTransferLibTest:testTransferFromWithStandardERC20() (gas: 47612)
-SafeTransferLibTest:testTransferFromWithStandardERC20(address,address,uint256,bytes) (runs: 256, μ: 46675, ~: 48042)
-SafeTransferLibTest:testTransferWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 2641, ~: 2187)
+SafeTransferLibTest:testTransferFromWithStandardERC20(address,address,uint256,bytes) (runs: 256, μ: 46796, ~: 48058)
+SafeTransferLibTest:testTransferWithGarbage(address,uint256,bytes,bytes) (runs: 256, μ: 2620, ~: 2187)
 SafeTransferLibTest:testTransferWithMissingReturn() (gas: 36672)
-SafeTransferLibTest:testTransferWithMissingReturn(address,uint256,bytes) (runs: 256, μ: 35919, ~: 37552)
+SafeTransferLibTest:testTransferWithMissingReturn(address,uint256,bytes) (runs: 256, μ: 36007, ~: 37552)
 SafeTransferLibTest:testTransferWithNonContract() (gas: 3018)
-SafeTransferLibTest:testTransferWithNonContract(address,address,uint256,bytes) (runs: 256, μ: 4147, ~: 4187)
+SafeTransferLibTest:testTransferWithNonContract(address,address,uint256,bytes) (runs: 256, μ: 4191, ~: 4187)
 SafeTransferLibTest:testTransferWithReturnsTooMuch() (gas: 37118)
-SafeTransferLibTest:testTransferWithReturnsTooMuch(address,uint256,bytes) (runs: 256, μ: 36322, ~: 37955)
+SafeTransferLibTest:testTransferWithReturnsTooMuch(address,uint256,bytes) (runs: 256, μ: 36410, ~: 37955)
 SafeTransferLibTest:testTransferWithStandardERC20() (gas: 36702)
 SafeTransferLibTest:testTransferWithStandardERC20(address,uint256,bytes) (runs: 256, μ: 36060, ~: 37605)
-SignedWadMathTest:testFailWadDivOverflow(int256,int256) (runs: 256, μ: 370, ~: 351)
+SignedWadMathTest:testFailWadDivOverflow(int256,int256) (runs: 256, μ: 368, ~: 351)
 SignedWadMathTest:testFailWadDivZeroDenominator(int256) (runs: 256, μ: 296, ~: 296)
-SignedWadMathTest:testFailWadMulOverflow(int256,int256) (runs: 256, μ: 326, ~: 296)
+SignedWadMathTest:testFailWadMulOverflow(int256,int256) (runs: 256, μ: 323, ~: 296)
 SignedWadMathTest:testWadDiv(uint256,uint256,bool,bool) (runs: 256, μ: 5696, ~: 5664)
 SignedWadMathTest:testWadMul(uint256,uint256,bool,bool) (runs: 256, μ: 5720, ~: 5688)
-WETHInvariants:invariantTotalSupplyEqualsBalance() (runs: 256, calls: 3840, reverts: 1944)
+WETHInvariants:invariantTotalSupplyEqualsBalance() (runs: 256, calls: 3840, reverts: 1929)
 WETHTest:testDeposit() (gas: 63535)
-WETHTest:testDeposit(uint256) (runs: 256, μ: 62610, ~: 65880)
+WETHTest:testDeposit(uint256) (runs: 256, μ: 62792, ~: 65880)
 WETHTest:testFallbackDeposit() (gas: 63249)
-WETHTest:testFallbackDeposit(uint256) (runs: 256, μ: 62334, ~: 65604)
+WETHTest:testFallbackDeposit(uint256) (runs: 256, μ: 62516, ~: 65604)
 WETHTest:testPartialWithdraw() (gas: 73281)
 WETHTest:testWithdraw() (gas: 54360)
-WETHTest:testWithdraw(uint256,uint256) (runs: 256, μ: 74609, ~: 78076)
\ No newline at end of file
+WETHTest:testWithdraw(uint256,uint256) (runs: 256, μ: 75443, ~: 78076)
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index ed210a37..0dbf8f59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,121 +1,167 @@
 {
   "name": "solmate",
   "version": "6.1.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@solidity-parser/parser": {
+  "packages": {
+    "": {
+      "name": "solmate",
+      "version": "6.1.0",
+      "license": "AGPL-3.0-only",
+      "devDependencies": {
+        "prettier": "^2.3.1",
+        "prettier-plugin-solidity": "^1.0.0-beta.13"
+      }
+    },
+    "node_modules/@solidity-parser/parser": {
       "version": "0.13.2",
       "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.13.2.tgz",
       "integrity": "sha512-RwHnpRnfrnD2MSPveYoPh8nhofEvX7fgjHk1Oq+NNvCcLx4r1js91CO9o+F/F3fBzOCyvm8kKRTriFICX/odWw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "antlr4ts": "^0.5.0-alpha.4"
       }
     },
-    "ansi-regex": {
+    "node_modules/ansi-regex": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
       "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "antlr4ts": {
+    "node_modules/antlr4ts": {
       "version": "0.5.0-alpha.4",
       "resolved": "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz",
       "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==",
       "dev": true
     },
-    "emoji-regex": {
+    "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "escape-string-regexp": {
+    "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "is-fullwidth-code-point": {
+    "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "lru-cache": {
+    "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "prettier": {
+    "node_modules/prettier": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
       "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
     },
-    "prettier-plugin-solidity": {
+    "node_modules/prettier-plugin-solidity": {
       "version": "1.0.0-beta.16",
       "resolved": "https://registry.npmjs.org/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-beta.16.tgz",
       "integrity": "sha512-xVBcnoWpe52dNnCCbqPHC9ZrTWXcNfldf852ZD0DBcHDqVMwjHTAPEdfBVy6FczbFpVa8bmxQil+G5XkEz5WHA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "@solidity-parser/parser": "^0.13.2",
         "emoji-regex": "^9.2.2",
         "escape-string-regexp": "^4.0.0",
         "semver": "^7.3.5",
         "solidity-comments-extractor": "^0.0.7",
         "string-width": "^4.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "prettier": "^2.3.0"
       }
     },
-    "semver": {
+    "node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "solidity-comments-extractor": {
+    "node_modules/solidity-comments-extractor": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/solidity-comments-extractor/-/solidity-comments-extractor-0.0.7.tgz",
       "integrity": "sha512-wciNMLg/Irp8OKGrh3S2tfvZiZ0NEyILfcRCXCD4mp7SgK/i9gzLfhY2hY7VMCQJ3kH9UB9BzNdibIVMchzyYw==",
       "dev": true
     },
-    "string-width": {
+    "node_modules/string-width": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=8"
       }
     },
-    "strip-ansi": {
+    "node_modules/string-width/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/strip-ansi": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "yallist": {
+    "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
diff --git a/src/test/Auth.t.sol b/src/test/Auth.t.sol
index 9e315288..721a4de7 100644
--- a/src/test/Auth.t.sol
+++ b/src/test/Auth.t.sol
@@ -20,7 +20,7 @@ contract OutOfOrderAuthority is Authority {
 contract AuthTest is DSTestPlus {
     MockAuthChild mockAuthChild;
 
-    function setUp() public {
+    function setUp() public virtual {
         mockAuthChild = new MockAuthChild();
     }
 
diff --git a/src/test/ERC1155.t.sol b/src/test/ERC1155.t.sol
index 9e32d88b..d9188dc2 100644
--- a/src/test/ERC1155.t.sol
+++ b/src/test/ERC1155.t.sol
@@ -114,7 +114,7 @@ contract ERC1155Test is DSTestPlus, ERC1155TokenReceiver {
     mapping(address => mapping(uint256 => uint256)) public userMintAmounts;
     mapping(address => mapping(uint256 => uint256)) public userTransferOrBurnAmounts;
 
-    function setUp() public {
+    function setUp() public virtual {
         token = new MockERC1155();
     }
 
diff --git a/src/test/ERC20.t.sol b/src/test/ERC20.t.sol
index 1506d8cf..937d218f 100644
--- a/src/test/ERC20.t.sol
+++ b/src/test/ERC20.t.sol
@@ -12,7 +12,7 @@ contract ERC20Test is DSTestPlus {
     bytes32 constant PERMIT_TYPEHASH =
         keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");
 
-    function setUp() public {
+    function setUp() public virtual {
         token = new MockERC20("Token", "TKN", 18);
     }
 
@@ -483,7 +483,7 @@ contract ERC20Invariants is DSTestPlus, DSInvariantTest {
     BalanceSum balanceSum;
     MockERC20 token;
 
-    function setUp() public {
+    function setUp() public virtual {
         token = new MockERC20("Token", "TKN", 18);
         balanceSum = new BalanceSum(token);
 
diff --git a/src/test/ERC4626.t.sol b/src/test/ERC4626.t.sol
index 816c8e48..4154bde7 100644
--- a/src/test/ERC4626.t.sol
+++ b/src/test/ERC4626.t.sol
@@ -10,7 +10,7 @@ contract ERC4626Test is DSTestPlus {
     MockERC20 underlying;
     MockERC4626 vault;
 
-    function setUp() public {
+    function setUp() public virtual {
         underlying = new MockERC20("Mock Token", "TKN", 18);
         vault = new MockERC4626(underlying, "Mock Token Vault", "vwTKN");
     }
diff --git a/src/test/ERC721.t.sol b/src/test/ERC721.t.sol
index 81de0ff6..1ef73302 100644
--- a/src/test/ERC721.t.sol
+++ b/src/test/ERC721.t.sol
@@ -56,7 +56,7 @@ contract NonERC721Recipient {}
 contract ERC721Test is DSTestPlus {
     MockERC721 token;
 
-    function setUp() public {
+    function setUp() public virtual {
         token = new MockERC721("Token", "TKN");
     }
 
diff --git a/src/test/MultiRolesAuthority.t.sol b/src/test/MultiRolesAuthority.t.sol
index eedf6a08..19264d47 100644
--- a/src/test/MultiRolesAuthority.t.sol
+++ b/src/test/MultiRolesAuthority.t.sol
@@ -11,7 +11,7 @@ import {MultiRolesAuthority} from "../auth/authorities/MultiRolesAuthority.sol";
 contract MultiRolesAuthorityTest is DSTestPlus {
     MultiRolesAuthority multiRolesAuthority;
 
-    function setUp() public {
+    function setUp() public virtual {
         multiRolesAuthority = new MultiRolesAuthority(address(this), Authority(address(0)));
     }
 
diff --git a/src/test/Owned.t.sol b/src/test/Owned.t.sol
index 08a02392..3c0cd34c 100644
--- a/src/test/Owned.t.sol
+++ b/src/test/Owned.t.sol
@@ -7,7 +7,7 @@ import {MockOwned} from "./utils/mocks/MockOwned.sol";
 contract OwnedTest is DSTestPlus {
     MockOwned mockOwned;
 
-    function setUp() public {
+    function setUp() public virtual {
         mockOwned = new MockOwned();
     }
 
diff --git a/src/test/ReentrancyGuard.t.sol b/src/test/ReentrancyGuard.t.sol
index 842e3672..323a6f8f 100644
--- a/src/test/ReentrancyGuard.t.sol
+++ b/src/test/ReentrancyGuard.t.sol
@@ -30,7 +30,7 @@ contract RiskyContract is ReentrancyGuard {
 contract ReentrancyGuardTest is DSTestPlus {
     RiskyContract riskyContract;
 
-    function setUp() public {
+    function setUp() public virtual {
         riskyContract = new RiskyContract();
     }
 
diff --git a/src/test/RolesAuthority.t.sol b/src/test/RolesAuthority.t.sol
index e01db7e5..4b759c60 100644
--- a/src/test/RolesAuthority.t.sol
+++ b/src/test/RolesAuthority.t.sol
@@ -11,7 +11,7 @@ import {RolesAuthority} from "../auth/authorities/RolesAuthority.sol";
 contract RolesAuthorityTest is DSTestPlus {
     RolesAuthority rolesAuthority;
 
-    function setUp() public {
+    function setUp() public virtual {
         rolesAuthority = new RolesAuthority(address(this), Authority(address(0)));
     }
 
diff --git a/src/test/SafeCastLib.t.sol b/src/test/SafeCastLib.t.sol
index cf627c23..52a6c070 100644
--- a/src/test/SafeCastLib.t.sol
+++ b/src/test/SafeCastLib.t.sol
@@ -25,7 +25,7 @@ contract SafeCastLibTest is DSTestPlus {
         assertEq(SafeCastLib.safeCastTo224(2.5e36), 2.5e36);
         assertEq(SafeCastLib.safeCastTo224(2.5e27), 2.5e27);
     }
-    
+
     function testSafeCastTo216() public {
         assertEq(SafeCastLib.safeCastTo216(2.5e36), 2.5e36);
         assertEq(SafeCastLib.safeCastTo216(2.5e27), 2.5e27);
@@ -396,7 +396,6 @@ contract SafeCastLibTest is DSTestPlus {
         assertEq(SafeCastLib.safeCastTo88(x), x);
     }
 
-
     function testSafeCastTo80(uint256 x) public {
         x = bound(x, 0, type(uint80).max);
 
diff --git a/src/test/SafeTransferLib.t.sol b/src/test/SafeTransferLib.t.sol
index b976e9f6..7f3616c0 100644
--- a/src/test/SafeTransferLib.t.sol
+++ b/src/test/SafeTransferLib.t.sol
@@ -26,7 +26,7 @@ contract SafeTransferLibTest is DSTestPlus {
 
     MockERC20 erc20;
 
-    function setUp() public {
+    function setUp() public virtual {
         reverting = new RevertingToken();
         returnsTwo = new ReturnsTwoToken();
         returnsFalse = new ReturnsFalseToken();
diff --git a/src/test/WETH.t.sol b/src/test/WETH.t.sol
index a13761ee..66843aea 100644
--- a/src/test/WETH.t.sol
+++ b/src/test/WETH.t.sol
@@ -11,7 +11,7 @@ import {WETH} from "../tokens/WETH.sol";
 contract WETHTest is DSTestPlus {
     WETH weth;
 
-    function setUp() public {
+    function setUp() public virtual {
         weth = new WETH();
     }
 
@@ -111,7 +111,7 @@ contract WETHInvariants is DSTestPlus, DSInvariantTest {
     WETHTester wethTester;
     WETH weth;
 
-    function setUp() public {
+    function setUp() public virtual {
         weth = new WETH();
         wethTester = new WETHTester{value: address(this).balance}(weth);
 
diff --git a/src/utils/SafeCastLib.sol b/src/utils/SafeCastLib.sol
index 5a7cc965..9e8a2af0 100644
--- a/src/utils/SafeCastLib.sol
+++ b/src/utils/SafeCastLib.sol
@@ -52,7 +52,7 @@ library SafeCastLib {
 
         y = uint192(x);
     }
-    
+
     function safeCastTo184(uint256 x) internal pure returns (uint184 y) {
         require(x < 1 << 184);