diff --git a/src/xrpld/app/paths/Flow.cpp b/src/xrpld/app/paths/Flow.cpp
index 3b14b8b968..79b3e4434b 100644
--- a/src/xrpld/app/paths/Flow.cpp
+++ b/src/xrpld/app/paths/Flow.cpp
@@ -111,17 +111,17 @@ flow(
 
     ammContext.setMultiPath(strands.size() > 1);
 
-    if (j.trace())
+    if (auto stream = j.trace())
     {
-        j.trace() << "\nsrc: " << src << "\ndst: " << dst
+        stream << "\nsrc: " << src << "\ndst: " << dst
                   << "\nsrcIssue: " << srcIssue << "\ndstIssue: " << dstIssue;
-        j.trace() << "\nNumStrands: " << strands.size();
+        stream << "\nNumStrands: " << strands.size();
         for (auto const& curStrand : strands)
         {
-            j.trace() << "NumSteps: " << curStrand.size();
+            stream << "NumSteps: " << curStrand.size();
             for (auto const& step : curStrand)
             {
-                j.trace() << '\n' << *step << '\n';
+                stream << '\n' << *step << '\n';
             }
         }
     }
diff --git a/src/xrpld/app/rdb/backend/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/Node.cpp
index 6a0544091b..4e542988f6 100644
--- a/src/xrpld/app/rdb/backend/detail/Node.cpp
+++ b/src/xrpld/app/rdb/backend/detail/Node.cpp
@@ -565,8 +565,7 @@ getHashesByIndex(
 
     if (!lhO || !phO)
     {
-        auto stream = j.trace();
-        JLOG(stream) << "Don't have ledger " << ledgerIndex;
+        JLOG(j.trace()) << "Don't have ledger " << ledgerIndex;
         return {};
     }
 
diff --git a/src/xrpld/overlay/Slot.h b/src/xrpld/overlay/Slot.h
index ea9fc3285b..88afb04075 100644
--- a/src/xrpld/overlay/Slot.h
+++ b/src/xrpld/overlay/Slot.h
@@ -406,7 +406,7 @@ Slot<clock_type>::update(
                 v.state = PeerState::Selected;
             else if (v.state != PeerState::Squelched)
             {
-                if (journal_.trace())
+                if (journal_.active(beast::severities::kTrace))
                     str << k << " ";
                 v.state = PeerState::Squelched;
                 std::chrono::seconds duration =
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index bcb3a3cdaf..1d4bcad1a2 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -993,7 +993,7 @@ PeerImp::onReadMessage(error_code ec, std::size_t bytes_transferred)
 
     if (auto stream = journal_.trace())
     {
-        stream << "onReadMessage: "
+        std::move(stream) << "onReadMessage: "
                << (bytes_transferred > 0
                        ? to_string(bytes_transferred) + " bytes"
                        : "");
@@ -1075,7 +1075,7 @@ PeerImp::onWriteMessage(error_code ec, std::size_t bytes_transferred)
 
     if (auto stream = journal_.trace())
     {
-        stream << "onWriteMessage: "
+        std::move(stream) << "onWriteMessage: "
                << (bytes_transferred > 0
                        ? to_string(bytes_transferred) + " bytes"
                        : "");
diff --git a/src/xrpld/shamap/detail/SHAMap.cpp b/src/xrpld/shamap/detail/SHAMap.cpp
index d2415a2ff2..3f6cb7c7ea 100644
--- a/src/xrpld/shamap/detail/SHAMap.cpp
+++ b/src/xrpld/shamap/detail/SHAMap.cpp
@@ -950,15 +950,15 @@ SHAMap::fetchRoot(SHAMapHash const& hash, SHAMapSyncFilter* filter)
     {
         if (type_ == SHAMapType::TRANSACTION)
         {
-            stream << "Fetch root TXN node " << hash;
+            std::move(stream) << "Fetch root TXN node " << hash;
         }
         else if (type_ == SHAMapType::STATE)
         {
-            stream << "Fetch root STATE node " << hash;
+            std::move(stream) << "Fetch root STATE node " << hash;
         }
         else
         {
-            stream << "Fetch root SHAMap node " << hash;
+            std::move(stream) << "Fetch root SHAMap node " << hash;
         }
     }