diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index ecb250a..6df3c9c 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -1848,8 +1848,11 @@ bool scan16(const InternalVersionT *vs, const uint8_t *is, int begin, int end,
 }
 
 // Returns true if v[i] <= readVersion for all i such that begin <= i < end
-bool scan16(const InternalVersionT *vs, int begin, int end,
-            InternalVersionT readVersion) {
+//
+// always_inline So that we can optimize when begin or end is a constant.
+__attribute((always_inline)) bool scan16(const InternalVersionT *vs, int begin,
+                                         int end,
+                                         InternalVersionT readVersion) {
   assert(0 <= begin && begin < 16);
   assert(0 <= end && end <= 16);
   assert(begin <= end);