diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index 452cbd6..3d750b6 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -964,8 +964,8 @@ bool checkRangeRead(Node *n, const std::span<const uint8_t> begin,
                     const std::span<const uint8_t> end, int64_t readVersion,
                     Arena &arena) {
 
-  int cl = std::min(begin.size(), end.size());
-  int lcp = longestCommonPrefix(begin.data(), end.data(), cl);
+  int lcp = longestCommonPrefix(begin.data(), end.data(),
+                                std::min(begin.size(), end.size()));
 
   SearchStepWise search{n, begin.subspan(0, lcp)};
   for (;;) {
@@ -984,7 +984,7 @@ bool checkRangeRead(Node *n, const std::span<const uint8_t> begin,
          0);
 
   // Check that we can start FirstGeq where Search left off
-  int consumed = lcp - search.remaining.size();
+  const int consumed = lcp - search.remaining.size();
   assert(consumed >= 0);
   auto left =
       firstGeq(search.n, begin.subspan(consumed, int(begin.size()) - consumed));
@@ -1015,7 +1015,7 @@ bool checkRangeRead(Node *n, const std::span<const uint8_t> begin,
 
   bool first = true;
   for (auto *iter = left.n; iter != nullptr; first = false) {
-    int cl = std::min(searchPath.size(), end.size());
+    const int cl = std::min(searchPath.size(), end.size());
     assert(depth == int(searchPath.size()));
     assert(lcp == longestCommonPrefix(searchPath.data(), end.data(), cl));