diff --git a/include/xrpl/ledger/helpers/AccountRootHelpers.h b/include/xrpl/ledger/helpers/AccountRootHelpers.h
index baf6644e0e..aa62d3f76d 100644
--- a/include/xrpl/ledger/helpers/AccountRootHelpers.h
+++ b/include/xrpl/ledger/helpers/AccountRootHelpers.h
@@ -85,7 +85,7 @@ accountReserve(ReadView const& view, AccountID const& id, beast::Journal j, Adju
  *  @return The hypothetical reserve amount
  */
 XRPAmount
-baseAccountReserve(ReadView const& view, Adjustment adj);
+baseAccountReserve(ReadView const& view, std::int32_t ownerCount, std::int32_t accountCount = 1);
 
 /** Check if an account has insufficient reserve.
  *
diff --git a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
index 36eeb75d43..35ff80b107 100644
--- a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
@@ -165,10 +165,7 @@ xrpLiquid(ReadView const& view, AccountID const& id, std::int32_t ownerCountAdj,
     // Pseudo-accounts have no reserve requirement
     auto const reserve = isPseudoAccount(sle)
         ? XRPAmount{0}
-        : baseAccountReserve(
-              view,
-              {.ownerCountDelta = static_cast<std::int32_t>(currentOwnerCount),
-               .accountCountDelta = static_cast<std::int32_t>(currentAccountCount) - 1});
+        : baseAccountReserve(view, currentOwnerCount, currentAccountCount);
 
     auto const fullBalance = sle->getFieldAmount(sfBalance);
 
@@ -288,10 +285,7 @@ accountReserve(ReadView const& view, SLE::const_ref sle, beast::Journal j, Adjus
     std::uint32_t const currentOwnerCount = ownerCount(sle, j, adj.ownerCountDelta);
     std::uint32_t const currentAccountCount = accountCountImpl(sle, adj.accountCountDelta, j);
 
-    return baseAccountReserve(
-        view,
-        {.ownerCountDelta = static_cast<std::int32_t>(currentOwnerCount),
-         .accountCountDelta = static_cast<std::int32_t>(currentAccountCount) - 1});
+    return baseAccountReserve(view, currentOwnerCount, currentAccountCount);
 }
 
 XRPAmount
diff --git a/src/test/app/AMMExtendedMPT_test.cpp b/src/test/app/AMMExtendedMPT_test.cpp
index 6fbf134f86..a409cbee88 100644
--- a/src/test/app/AMMExtendedMPT_test.cpp
+++ b/src/test/app/AMMExtendedMPT_test.cpp
@@ -463,9 +463,8 @@ private:
 
         // Provide micro amounts to compensate for fees to make results round
         // nice.
-        auto const startingXrp = XRP(100) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 2}) +
-            env.current()->fees().base * 3;
+        auto const startingXrp =
+            XRP(100) + baseAccountReserve(*env.current(), 2) + env.current()->fees().base * 3;
 
         env.fund(startingXrp, gw_, alice_);
         env.fund(XRP(2'000), bob_);
diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp
index 1875d42f03..c7fe147511 100644
--- a/src/test/app/AMMExtended_test.cpp
+++ b/src/test/app/AMMExtended_test.cpp
@@ -546,9 +546,8 @@ private:
         // fees:
         //  1 for each trust limit == 3 (alice_ < mtgox/amazon/bitstamp) +
         //  1 for payment          == 4
-        auto const startingXrp = XRP(100) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 3}) +
-            env.current()->fees().base * 4;
+        auto const startingXrp =
+            XRP(100) + baseAccountReserve(*env.current(), 3) + env.current()->fees().base * 4;
 
         env.fund(startingXrp, gw1, gw2, gw3, localAlice);
         env.fund(XRP(2'000), localBob);
diff --git a/src/test/app/CheckMPT_test.cpp b/src/test/app/CheckMPT_test.cpp
index 65d58e51cb..b7cded444e 100644
--- a/src/test/app/CheckMPT_test.cpp
+++ b/src/test/app/CheckMPT_test.cpp
@@ -410,7 +410,7 @@ class CheckMPT_test : public beast::unit_test::Suite
 
         // Insufficient reserve.
         Account const cheri{"cheri"};
-        env.fund(baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) - drops(1), cheri);
+        env.fund(baseAccountReserve(*env.current(), 1) - drops(1), cheri);
 
         env(check::create(cheri, bob, usd(50)),
             Fee(drops(env.current()->fees().base)),
diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp
index cc9ba67afd..f97ca9435c 100644
--- a/src/test/app/Check_test.cpp
+++ b/src/test/app/Check_test.cpp
@@ -471,7 +471,7 @@ class Check_test : public beast::unit_test::Suite
 
         // Insufficient reserve.
         Account const cheri{"cheri"};
-        env.fund(baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) - drops(1), cheri);
+        env.fund(baseAccountReserve(*env.current(), 1) - drops(1), cheri);
         env.close();
 
         env(check::create(cheri, bob, usd(50)),
diff --git a/src/test/app/Credentials_test.cpp b/src/test/app/Credentials_test.cpp
index 6772514389..9e7575cd50 100644
--- a/src/test/app/Credentials_test.cpp
+++ b/src/test/app/Credentials_test.cpp
@@ -639,8 +639,8 @@ struct Credentials_test : public beast::unit_test::Suite
         {
             Env env{*this, features};
 
-            env.fund(drops(baseAccountReserve(*env.current(), {.ownerCountDelta = 1})), issuer);
-            env.fund(drops(baseAccountReserve(*env.current(), {.ownerCountDelta = 0})), subject);
+            env.fund(drops(baseAccountReserve(*env.current(), 1)), issuer);
+            env.fund(drops(baseAccountReserve(*env.current(), 0)), subject);
             env.close();
 
             {
diff --git a/src/test/app/Delegate_test.cpp b/src/test/app/Delegate_test.cpp
index 2aaaeb4ef2..0779d410e2 100644
--- a/src/test/app/Delegate_test.cpp
+++ b/src/test/app/Delegate_test.cpp
@@ -262,7 +262,7 @@ class Delegate_test : public beast::unit_test::Suite
             Account const bob{"bob"};
 
             auto const txFee = env.current()->fees().base;
-            env.fund(baseAccountReserve(*env.current(), {.ownerCountDelta = 0}) + txFee, alice);
+            env.fund(baseAccountReserve(*env.current(), 0) + txFee, alice);
             env.fund(XRP(100000), bob);
             env.close();
 
@@ -279,8 +279,7 @@ class Delegate_test : public beast::unit_test::Suite
 
             auto const txFee = env.current()->fees().base;
 
-            env.fund(
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) + (txFee * 4), alice);
+            env.fund(baseAccountReserve(*env.current(), 1) + (txFee * 4), alice);
             env.fund(XRP(100000), bob, carol);
             env.close();
 
@@ -306,8 +305,8 @@ class Delegate_test : public beast::unit_test::Suite
             Account const alice{"alice"};
             Account const bob{"bob"};
 
-            env.fund(drops(baseAccountReserve(*env.current(), {.ownerCountDelta = 1})), alice);
-            env.fund(drops(baseAccountReserve(*env.current(), {.ownerCountDelta = 2})), bob);
+            env.fund(drops(baseAccountReserve(*env.current(), 1)), alice);
+            env.fund(drops(baseAccountReserve(*env.current(), 2)), bob);
             env.close();
 
             // alice gives bob permission
@@ -410,7 +409,7 @@ class Delegate_test : public beast::unit_test::Suite
                 Account const carol{"carol"};
 
                 auto const baseFee = env.current()->fees().base;
-                auto const reserve = baseAccountReserve(*env.current(), {.ownerCountDelta = 1});
+                auto const reserve = baseAccountReserve(*env.current(), 1);
                 auto const paymentAmount = XRP(1);
                 auto const highFee = reserve + baseFee;
                 BEAST_EXPECT(highFee > reserve);
@@ -476,11 +475,9 @@ class Delegate_test : public beast::unit_test::Suite
             Account const carol{"carol"};
 
             auto const baseFee = env.current()->fees().base;
-            auto const baseReserve = baseAccountReserve(*env.current(), {.ownerCountDelta = 0});
+            auto const baseReserve = baseAccountReserve(*env.current(), 0);
 
-            env.fund(
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) + baseFee + XRP(1),
-                alice);
+            env.fund(baseAccountReserve(*env.current(), 1) + baseFee + XRP(1), alice);
             env.fund(baseReserve, bob);
             env.fund(XRP(1000), carol);
             env.close();
@@ -513,7 +510,7 @@ class Delegate_test : public beast::unit_test::Suite
             Account const carol{"carol"};
 
             auto const baseFee = env.current()->fees().base;
-            auto const reserve = baseAccountReserve(*env.current(), {.ownerCountDelta = 1});
+            auto const reserve = baseAccountReserve(*env.current(), 1);
 
             // Alice is funded with (reserve + baseFee): after DelegateSet she has
             // exactly 'reserve', which is insufficient to send XRP(10) while keeping
diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp
index 65affea416..c615bded16 100644
--- a/src/test/app/DepositAuth_test.cpp
+++ b/src/test/app/DepositAuth_test.cpp
@@ -52,8 +52,7 @@ namespace xrpl::test {
 static XRPAmount
 reserve(jtx::Env& env, std::uint32_t count)
 {
-    return baseAccountReserve(
-        *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+    return baseAccountReserve(*env.current(), count);
 }
 
 // Helper function that returns true if acct has the lsfDepositAuth flag set.
@@ -1027,7 +1026,7 @@ struct DepositPreauth_test : public beast::unit_test::Suite
             {
                 // not enough reserve
                 Account const john{"john"};
-                env.fund(baseAccountReserve(*env.current(), {.ownerCountDelta = 0}), john);
+                env.fund(baseAccountReserve(*env.current(), 0), john);
                 env.close();
                 auto jv =
                     deposit::authCredentials(john, {{.issuer = issuer, .credType = credType}});
diff --git a/src/test/app/FlowMPT_test.cpp b/src/test/app/FlowMPT_test.cpp
index f5c2ad424c..01dea70939 100644
--- a/src/test/app/FlowMPT_test.cpp
+++ b/src/test/app/FlowMPT_test.cpp
@@ -726,8 +726,7 @@ struct FlowMPT_test : public beast::unit_test::Suite
     static XRPAmount
     reserve(jtx::Env& env, std::uint32_t count)
     {
-        return baseAccountReserve(
-            *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+        return baseAccountReserve(*env.current(), count);
     }
 
     // Helper function that returns the Offers on an account.
diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp
index d94bece477..83b050e07c 100644
--- a/src/test/app/Flow_test.cpp
+++ b/src/test/app/Flow_test.cpp
@@ -707,8 +707,7 @@ struct Flow_test : public beast::unit_test::Suite
     static XRPAmount
     reserve(jtx::Env& env, std::uint32_t count)
     {
-        return baseAccountReserve(
-            *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+        return baseAccountReserve(*env.current(), count);
     }
 
     // Helper function that returns the Offers on an account.
diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp
index e18a801fff..423fe7b6cc 100644
--- a/src/test/app/Loan_test.cpp
+++ b/src/test/app/Loan_test.cpp
@@ -690,22 +690,11 @@ protected:
             case AssetType::MPT: {
                 // Enough to cover initial fees
                 if (!env.le(keylet::account(issuer)))
-                {
-                    env.fund(
-                        baseAccountReserve(*env.current(), {.ownerCountDelta = 10}) * 10, issuer);
-                }
+                    env.fund(baseAccountReserve(*env.current(), 10) * 10, issuer);
                 if (!env.le(keylet::account(lender)))
-                {
-                    env.fund(
-                        baseAccountReserve(*env.current(), {.ownerCountDelta = 10}) * 10,
-                        noripple(lender));
-                }
+                    env.fund(baseAccountReserve(*env.current(), 10) * 10, noripple(lender));
                 if (!env.le(keylet::account(borrower)))
-                {
-                    env.fund(
-                        baseAccountReserve(*env.current(), {.ownerCountDelta = 10}) * 10,
-                        noripple(borrower));
-                }
+                    env.fund(baseAccountReserve(*env.current(), 10) * 10, noripple(borrower));
 
                 MPTTester mptt{env, issuer, kMptInitNoFund};
                 mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
@@ -790,18 +779,11 @@ protected:
         using namespace jtx;
 
         // Enough to cover initial fees
-        env.fund(baseAccountReserve(*env.current(), {.ownerCountDelta = 10}) * 10, issuer);
+        env.fund(baseAccountReserve(*env.current(), 10) * 10, issuer);
         if (lender != issuer)
-        {
-            env.fund(
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 10}) * 10, noripple(lender));
-        }
+            env.fund(baseAccountReserve(*env.current(), 10) * 10, noripple(lender));
         if (borrower != issuer && borrower != lender)
-        {
-            env.fund(
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 10}) * 10,
-                noripple(borrower));
-        }
+            env.fund(baseAccountReserve(*env.current(), 10) * 10, noripple(borrower));
 
         describeLoan(env, brokerParams, loanParams, assetType, issuer, lender, borrower);
 
@@ -3107,8 +3089,7 @@ protected:
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
             Env const env{*this, testableAmendments()};
             return {
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 0}).drops() /
-                    kDropsPerXrp.drops(),
+                baseAccountReserve(*env.current(), 0).drops() / kDropsPerXrp.drops(),
                 env.current()->fees().increment.drops() / kDropsPerXrp.drops()};
         }();
 
diff --git a/src/test/app/OfferMPT_test.cpp b/src/test/app/OfferMPT_test.cpp
index dd32178bdd..d7597dcd54 100644
--- a/src/test/app/OfferMPT_test.cpp
+++ b/src/test/app/OfferMPT_test.cpp
@@ -58,8 +58,7 @@ class OfferMPT_test : public beast::unit_test::Suite
     static XRPAmount
     reserve(jtx::Env& env, std::uint32_t count)
     {
-        return baseAccountReserve(
-            *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+        return baseAccountReserve(*env.current(), count);
     }
 
     static std::uint32_t
@@ -1794,8 +1793,7 @@ public:
             //  1 for each trust limit == 3 (alice < mtgox/amazon/bitstamp) +
             //  1 for payment          == 4
             auto const base = env.current()->fees().base;
-            auto const startingXrp =
-                XRP(100) + baseAccountReserve(*env.current(), {.ownerCountDelta = 3}) + base * 4;
+            auto const startingXrp = XRP(100) + baseAccountReserve(*env.current(), 3) + base * 4;
 
             env.fund(startingXrp, gw1, gw2, gw3, alice, bob);
             env.close();
@@ -1815,9 +1813,7 @@ public:
             env(offer(alice, usD1(200), XRP(200)));
 
             BEAST_EXPECT(env.balance(alice, usD1) == usD1(100));
-            BEAST_EXPECT(
-                env.balance(alice) ==
-                STAmount(baseAccountReserve(*env.current(), {.ownerCountDelta = 3})));
+            BEAST_EXPECT(env.balance(alice) == STAmount(baseAccountReserve(*env.current(), 3)));
 
             BEAST_EXPECT(env.balance(bob, usD1) == usD1(400));
         };
@@ -1867,9 +1863,8 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
 
-        auto const startingXrp = XRP(100) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) +
-            env.current()->fees().base * 2;
+        auto const startingXrp =
+            XRP(100) + baseAccountReserve(*env.current(), 1) + env.current()->fees().base * 2;
 
         env.fund(startingXrp, gw, alice, bob);
 
@@ -1888,7 +1883,7 @@ public:
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
-            STAmount(baseAccountReserve(*env.current(), {.ownerCountDelta = 1})).getText());
+            STAmount(baseAccountReserve(*env.current(), 1)).getText());
 
         jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "400");
@@ -1907,9 +1902,8 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
 
-        auto const startingXrp = XRP(100) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) +
-            env.current()->fees().base * 2;
+        auto const startingXrp =
+            XRP(100) + baseAccountReserve(*env.current(), 1) + env.current()->fees().base * 2;
 
         env.fund(startingXrp, gw, alice, bob);
 
@@ -1930,7 +1924,7 @@ public:
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
-            STAmount(baseAccountReserve(*env.current(), {.ownerCountDelta = 1})).getText());
+            STAmount(baseAccountReserve(*env.current(), 1)).getText());
 
         jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "300");
@@ -1950,8 +1944,7 @@ public:
             Env env{*this, features};
 
             auto const base = env.current()->fees().base;
-            auto const startingXrp =
-                XRP(100.1) + baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) + base * 2;
+            auto const startingXrp = XRP(100.1) + baseAccountReserve(*env.current(), 1) + base * 2;
 
             env.fund(startingXrp, gw, alice, bob);
             env.close();
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index 6753db709c..7d6acb29e3 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -61,8 +61,7 @@ class OfferBaseUtil_test : public beast::unit_test::Suite
     static XRPAmount
     reserve(jtx::Env& env, std::uint32_t count)
     {
-        return baseAccountReserve(
-            *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+        return baseAccountReserve(*env.current(), count);
     }
 
     static std::uint32_t
@@ -1963,9 +1962,8 @@ public:
         // fees:
         //  1 for each trust limit == 3 (alice < mtgox/amazon/bitstamp) +
         //  1 for payment          == 4
-        auto const startingXrp = XRP(100) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 3}) +
-            env.current()->fees().base * 4;
+        auto const startingXrp =
+            XRP(100) + baseAccountReserve(*env.current(), 3) + env.current()->fees().base * 4;
 
         env.fund(startingXrp, gw1, gw2, gw3, alice, bob);
         env.close();
@@ -1988,7 +1986,7 @@ public:
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
-            STAmount(baseAccountReserve(*env.current(), {.ownerCountDelta = 3})).getText());
+            STAmount(baseAccountReserve(*env.current(), 3)).getText());
 
         jrr = ledgerEntryState(env, bob, gw1, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-400");
@@ -2047,9 +2045,8 @@ public:
         auto const bob = Account{"bob"};
         auto const usd = gw["USD"];
 
-        auto const startingXrp = XRP(100) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) +
-            env.current()->fees().base * 2;
+        auto const startingXrp =
+            XRP(100) + baseAccountReserve(*env.current(), 1) + env.current()->fees().base * 2;
 
         env.fund(startingXrp, gw, alice, bob);
         env.close();
@@ -2070,7 +2067,7 @@ public:
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
-            STAmount(baseAccountReserve(*env.current(), {.ownerCountDelta = 1})).getText());
+            STAmount(baseAccountReserve(*env.current(), 1)).getText());
 
         jrr = ledgerEntryState(env, bob, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-400");
@@ -2090,9 +2087,8 @@ public:
         auto const bob = Account{"bob"};
         auto const usd = gw["USD"];
 
-        auto const startingXrp = XRP(100) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) +
-            env.current()->fees().base * 2;
+        auto const startingXrp =
+            XRP(100) + baseAccountReserve(*env.current(), 1) + env.current()->fees().base * 2;
 
         env.fund(startingXrp, gw, alice, bob);
         env.close();
@@ -2115,7 +2111,7 @@ public:
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
-            STAmount(baseAccountReserve(*env.current(), {.ownerCountDelta = 1})).getText());
+            STAmount(baseAccountReserve(*env.current(), 1)).getText());
 
         jrr = ledgerEntryState(env, bob, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-300");
@@ -2136,9 +2132,8 @@ public:
         auto const xts = gw["XTS"];
         auto const xxx = gw["XXX"];
 
-        auto const startingXrp = XRP(100.1) +
-            baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) +
-            env.current()->fees().base * 2;
+        auto const startingXrp =
+            XRP(100.1) + baseAccountReserve(*env.current(), 1) + env.current()->fees().base * 2;
 
         env.fund(startingXrp, gw, alice, bob);
         env.close();
diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp
index 95df66f5d3..97c3d29ac6 100644
--- a/src/test/app/Oracle_test.cpp
+++ b/src/test/app/Oracle_test.cpp
@@ -61,7 +61,7 @@ private:
         // Insufficient reserve
         {
             Env env(*this);
-            env.fund(baseAccountReserve(*env.current(), {.ownerCountDelta = 0}), owner);
+            env.fund(baseAccountReserve(*env.current(), 0), owner);
             Oracle const oracle(
                 env,
                 {.owner = owner,
@@ -71,10 +71,7 @@ private:
         // Insufficient reserve if the data series extends to greater than 5
         {
             Env env(*this);
-            env.fund(
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) +
-                    env.current()->fees().base * 2,
-                owner);
+            env.fund(baseAccountReserve(*env.current(), 1) + env.current()->fees().base * 2, owner);
             Oracle oracle(
                 env, {.owner = owner, .fee = static_cast<int>(env.current()->fees().base.drops())});
             BEAST_EXPECT(oracle.exists());
@@ -642,10 +639,7 @@ private:
         {
             Env env(*this);
             auto const baseFee = static_cast<int>(env.current()->fees().base.drops());
-            env.fund(
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) +
-                    env.current()->fees().base * 2,
-                owner);
+            env.fund(baseAccountReserve(*env.current(), 1) + env.current()->fees().base * 2, owner);
             Oracle oracle(env, {.owner = owner, .fee = baseFee});
             oracle.set(UpdateArg{.series = {{"XRP", "USD", 742, 2}}, .fee = baseFee});
         }
diff --git a/src/test/app/Sponsor_test.cpp b/src/test/app/Sponsor_test.cpp
index a50b7cee49..74847ea40b 100644
--- a/src/test/app/Sponsor_test.cpp
+++ b/src/test/app/Sponsor_test.cpp
@@ -76,8 +76,7 @@ accountReserve(jtx::Env& env, std::uint32_t count = 1)
 static STAmount
 reserve(jtx::Env& env, std::uint32_t count)
 {
-    return baseAccountReserve(
-        *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+    return baseAccountReserve(*env.current(), count);
 }
 
 static void
@@ -2032,7 +2031,7 @@ public:
 
         // Account is not sponsored by normal Sponsor specification
         {
-            env(pay(alice, bob, drops(baseAccountReserve(*env.current(), {.ownerCountDelta = 0}))),
+            env(pay(alice, bob, drops(baseAccountReserve(*env.current(), 0))),
                 sponsor::As(sponsor, spfSponsorReserve),
                 Sig(sfSponsorSignature, sponsor));
             env.close();
diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp
index 10d159a895..c236971a9a 100644
--- a/src/test/app/Ticket_test.cpp
+++ b/src/test/app/Ticket_test.cpp
@@ -504,7 +504,7 @@ class Ticket_test : public beast::unit_test::Suite
         Account const alice{"alice"};
 
         // Fund alice not quite enough to make the reserve for a Ticket.
-        env.fund(baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) - drops(1), alice);
+        env.fund(baseAccountReserve(*env.current(), 1) - drops(1), alice);
         env.close();
 
         env(ticket::create(alice, 1), Ter(tecINSUFFICIENT_RESERVE));
@@ -512,10 +512,7 @@ class Ticket_test : public beast::unit_test::Suite
         env.require(Owners(alice, 0), tickets(alice, 0));
 
         // Give alice enough to exactly meet the reserve for one Ticket.
-        env(
-            pay(env.master,
-                alice,
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 1}) - env.balance(alice)));
+        env(pay(env.master, alice, baseAccountReserve(*env.current(), 1) - env.balance(alice)));
         env.close();
 
         env(ticket::create(alice, 1));
@@ -528,8 +525,7 @@ class Ticket_test : public beast::unit_test::Suite
         env(
             pay(env.master,
                 alice,
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 250}) - drops(1) -
-                    env.balance(alice)));
+                baseAccountReserve(*env.current(), 250) - drops(1) - env.balance(alice)));
         env.close();
 
         // alice doesn't quite have the reserve for a total of 250
@@ -540,10 +536,7 @@ class Ticket_test : public beast::unit_test::Suite
 
         // Give alice enough so she can make the reserve for all 250
         // Tickets.
-        env(
-            pay(env.master,
-                alice,
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 250}) - env.balance(alice)));
+        env(pay(env.master, alice, baseAccountReserve(*env.current(), 250) - env.balance(alice)));
         env.close();
 
         std::uint32_t const ticketSeq{env.seq(alice) + 1};
diff --git a/src/test/app/TrustSet_test.cpp b/src/test/app/TrustSet_test.cpp
index bbecedd4fd..e4bf6cb078 100644
--- a/src/test/app/TrustSet_test.cpp
+++ b/src/test/app/TrustSet_test.cpp
@@ -192,7 +192,7 @@ public:
 
         auto const txFee = env.current()->fees().base;
         auto const baseReserve = env.current()->fees().reserve;
-        auto const threelineReserve = baseAccountReserve(*env.current(), {.ownerCountDelta = 3});
+        auto const threelineReserve = baseAccountReserve(*env.current(), 3);
 
         env.fund(XRP(10000), gwA, gwB, assistor);
 
diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp
index 0c0c15a60b..3c58fa8142 100644
--- a/src/test/app/Vault_test.cpp
+++ b/src/test/app/Vault_test.cpp
@@ -1877,8 +1877,7 @@ class Vault_test : public beast::unit_test::Suite
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
             Env const env{*this, testableAmendments()};
             return {
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 0}).drops() /
-                    kDropsPerXrp.drops(),
+                baseAccountReserve(*env.current(), 0).drops() / kDropsPerXrp.drops(),
                 env.current()->fees().increment.drops() / kDropsPerXrp.drops()};
         }();
 
@@ -2951,8 +2950,7 @@ class Vault_test : public beast::unit_test::Suite
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
             Env const env{*this, testableAmendments()};
             return {
-                baseAccountReserve(*env.current(), {.ownerCountDelta = 0}).drops() /
-                    kDropsPerXrp.drops(),
+                baseAccountReserve(*env.current(), 0).drops() / kDropsPerXrp.drops(),
                 env.current()->fees().increment.drops() / kDropsPerXrp.drops()};
         }();
 
diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp
index 74bce77f04..75e0f0e3ef 100644
--- a/src/test/app/XChain_test.cpp
+++ b/src/test/app/XChain_test.cpp
@@ -142,8 +142,7 @@ struct SEnv
     XRPAmount
     reserve(std::uint32_t count)
     {
-        return baseAccountReserve(
-            *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+        return baseAccountReserve(*env.current(), count);
     }
 
     XRPAmount
@@ -373,8 +372,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
     XRPAmount
     reserve(std::uint32_t count)
     {
-        return baseAccountReserve(
-            *XEnv(*this).env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+        return baseAccountReserve(*XEnv(*this).env.current(), count);
     }
 
     XRPAmount
diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp
index 8381089762..6b9a075735 100644
--- a/src/test/jtx/impl/AMMTest.cpp
+++ b/src/test/jtx/impl/AMMTest.cpp
@@ -198,8 +198,7 @@ AMMTestBase::testAMM(std::function<void(jtx::AMM&, jtx::Env&)> const& cb, TestAM
 XRPAmount
 AMMTest::reserve(jtx::Env& env, std::uint32_t count)
 {
-    return baseAccountReserve(
-        *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+    return baseAccountReserve(*env.current(), count);
 }
 
 XRPAmount
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index d742c9a406..a89d07849b 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -331,8 +331,7 @@ class PaymentSandbox_test : public beast::unit_test::Suite
         };
 
         auto reserve = [](jtx::Env& env, std::uint32_t count) -> XRPAmount {
-            return baseAccountReserve(
-                *env.current(), {.ownerCountDelta = static_cast<std::int32_t>(count)});
+            return baseAccountReserve(*env.current(), count);
         };
 
         Env env(*this, features);
diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp
index 35776bd85a..9310bf384a 100644
--- a/src/test/rpc/AccountTx_test.cpp
+++ b/src/test/rpc/AccountTx_test.cpp
@@ -776,9 +776,7 @@ class AccountTx_test : public beast::unit_test::Suite
 
         // All it takes is a large enough XRP payment to resurrect
         // becky's account.  Try too small a payment.
-        env(pay(alice,
-                becky,
-                drops(baseAccountReserve(*env.current(), {.ownerCountDelta = 0})) - drops(1)),
+        env(pay(alice, becky, drops(baseAccountReserve(*env.current(), 0)) - drops(1)),
             Ter(tecNO_DST_INSUF_XRP));
         env.close();