diff --git a/include/xrpl/protocol/STEitherAmount.h b/include/xrpl/protocol/STEitherAmount.h
index 57812221fd7..187984cebd5 100644
--- a/include/xrpl/protocol/STEitherAmount.h
+++ b/include/xrpl/protocol/STEitherAmount.h
@@ -127,43 +127,37 @@ class STEitherAmount : public STBase, public CountedObject<STEitherAmount>
 };
 
 template <ValidAmountType T>
-T const&
-get(STEitherAmount const& amount)
+decltype(auto)
+get(auto&& amount)
 {
-    if (std::holds_alternative<T>(amount.getValue()))
-        return std::get<T>(amount.getValue());
-    Throw<std::logic_error>("Incorrect type to STEitherAmount::get");
-}
-
-template <ValidAmountType T>
-T&
-get(STEitherAmount& amount)
-{
-    if (std::holds_alternative<T>(amount.getValue()))
-        return std::get<T>(amount.getValue());
-    Throw<std::logic_error>("Incorrect type to STEitherAmount::get");
-}
-
-template <typename T>
-std::optional<T>
-get(std::optional<STEitherAmount> const& amount);
-
-template <>
-inline std::optional<STAmount>
-get(std::optional<STEitherAmount> const& amount)
-{
-    if (amount)
-        return get<STAmount>(*amount);
-    return std::nullopt;
-}
-
-template <>
-inline std::optional<STMPTAmount>
-get(std::optional<STEitherAmount> const& amount)
-{
-    if (amount)
-        return get<STMPTAmount>(*amount);
-    return std::nullopt;
+    if constexpr (std::
+                      is_same_v<std::decay_t<decltype(amount)>, STEitherAmount>)
+    {
+        if (std::holds_alternative<T>(amount.getValue()))
+            return std::get<T>(amount.getValue());
+        Throw<std::logic_error>("Invalid STEitherAmount conversion");
+    }
+    else if constexpr (std::is_same_v<
+                           std::decay_t<decltype(amount)>,
+                           std::optional<STEitherAmount>>)
+    {
+        static std::optional<T> t;
+        if (amount.has_value())
+            return std::make_optional(get<T>(*amount));
+        return t;
+    }
+    else if constexpr (std::is_convertible_v<
+                           std::decay_t<decltype(amount)>,
+                           STEitherAmount>)
+    {
+        T a = get<T>(amount.operator STEitherAmount());
+        return a;
+    }
+    else
+    {
+        bool const alwaysFalse = !std::is_same_v<T, T>;
+        static_assert(alwaysFalse, "Converting non-STEitherAmount");
+    }
 }
 
 STEitherAmount
@@ -178,6 +172,15 @@ amountFromJsonNoThrow(STAmount& result, Json::Value const& jvSource);
 inline bool
 operator==(STEitherAmount const& lhs, STEitherAmount const& rhs)
 {
+    return std::visit(
+        [&]<typename T1, typename T2>(T1 const& a1, T2 const& a2) {
+            if constexpr (std::is_same_v<T1, T2>)
+                return a1 == a2;
+            else
+                return false;
+        },
+        lhs.getValue(),
+        rhs.getValue());
     if (lhs.isIssue() == rhs.isIssue())
         return lhs.getValue() == rhs.getValue();
     return false;
diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp
index fcd5fbef9bf..64413d1c3f4 100644
--- a/src/test/app/MPToken_test.cpp
+++ b/src/test/app/MPToken_test.cpp
@@ -337,7 +337,8 @@ class MPToken_test : public beast::unit_test::suite
                 env,
                 alice,
                 {.holders = {&bob},
-                 .xrpHolders = acctReserve + get<STAmount>(XRP(1)).xrp()});
+                 .xrpHolders =
+                     acctReserve + get<STAmount>(XRP(1).value()).xrp()});
             mptAlice1.create();
 
             MPTTester mptAlice2(env, alice, {.fund = false});