diff --git a/README.adoc b/README.adoc
index f7320a3..7543e8f 100644
--- a/README.adoc
+++ b/README.adoc
@@ -11111,8 +11111,12 @@ It has been used to answer:
 To benchmark on the host, we do:
 
 ....
-./build-userland-in-tree --force-rebuild --optimization-level 3 ./userland/cpp/bst_vs_heap_vs_hashmap.cpp
-./userland/cpp/bst_vs_heap_vs_hashmap.out 10000000 10000 | tee bst_vs_heap_vs_hashmap.dat
+./build-userland-in-tree \
+  --force-rebuild \
+  --optimization-level 3 \
+  ./userland/cpp/bst_vs_heap_vs_hashmap.cpp \
+;
+./userland/cpp/bst_vs_heap_vs_hashmap.out 10000000 10000 0 | tee bst_vs_heap_vs_hashmap.dat
 gnuplot \
   -e 'input_noext="bst_vs_heap_vs_hashmap"' \
   -e 'heap_zoom_max=50' \
@@ -11139,7 +11143,7 @@ To benchmark on gem5, we first build the benchmark with <<m5ops-instructions>> e
   --emulator gem5 \
   --static \
   --userland userland/cpp/bst_vs_heap_vs_hashmap.cpp \
-  --userland-args='100000' \
+  --userland-args='100000 1 0' \
   -- \
   --cpu-type=DerivO3CPU \
   --caches \
diff --git a/userland/cpp/bst_vs_heap_vs_hashmap.cpp b/userland/cpp/bst_vs_heap_vs_hashmap.cpp
index 454ecec..072cfd8 100644
--- a/userland/cpp/bst_vs_heap_vs_hashmap.cpp
+++ b/userland/cpp/bst_vs_heap_vs_hashmap.cpp
@@ -14,11 +14,12 @@
 int main(int argc, char **argv) {
     typedef uint64_t I;
     std::vector<I> randoms;
-    size_t i, j, n, granule, base;
+    size_t i, n, granule, base;
     std::priority_queue<I> heap;
     std::set<I> bst;
     std::unordered_set<I> hashmap;
-    unsigned int seed = std::random_device()();
+    unsigned int seed;
+    size_t j = 0;
 
     // CLI arguments.
     if (argc > 1) {
@@ -26,17 +27,16 @@ int main(int argc, char **argv) {
     } else {
         n = 10;
     }
-#ifdef LKMC_M5OPS_ENABLE
-    // Let's comment useless stuff out to speed up gem5 simulations.
-    granule = 1;
-    j = 0;
-#else
     if (argc > 2) {
         granule = std::stoi(argv[2]);
     } else {
         granule = 1;
     }
-#endif
+    if (argc > 3) {
+        seed = std::stoi(argv[3]);
+    } else {
+        seed = std::random_device()();
+    }
 
     // Action.
     for (i = 0; i < n; ++i) {
@@ -51,42 +51,48 @@ int main(int argc, char **argv) {
         base = i * granule;
 
         // Heap.
-#ifndef LKMC_M5OPS_ENABLE
+#ifdef LKMC_M5OPS_ENABLE
+        LKMC_M5OPS_RESETSTATS;
+#else
         start = clk::now();
         for (j = 0; j < granule; ++j) {
 #endif
-            LKMC_M5OPS_RESETSTATS;
-            heap.emplace(randoms[base + j]);
-            LKMC_M5OPS_DUMPSTATS;
-#ifndef LKMC_M5OPS_ENABLE
+        heap.emplace(randoms[base + j]);
+#ifdef LKMC_M5OPS_ENABLE
+        LKMC_M5OPS_DUMPSTATS;
+#else
         }
         end = clk::now();
         auto dt_heap = (end - start) / granule;
 #endif
 
         // BST.
-#ifndef LKMC_M5OPS_ENABLE
+#ifdef LKMC_M5OPS_ENABLE
+        LKMC_M5OPS_RESETSTATS;
+#else
         start = clk::now();
         for (j = 0; j < granule; ++j) {
 #endif
-            LKMC_M5OPS_RESETSTATS;
-            bst.insert(randoms[base + j]);
-            LKMC_M5OPS_DUMPSTATS;
-#ifndef LKMC_M5OPS_ENABLE
+        bst.insert(randoms[base + j]);
+#ifdef LKMC_M5OPS_ENABLE
+        LKMC_M5OPS_DUMPSTATS;
+#else
         }
         end = clk::now();
         auto dt_bst = (end - start) / granule;
 #endif
 
         // Hashmap.
-#ifndef LKMC_M5OPS_ENABLE
+#ifdef LKMC_M5OPS_ENABLE
+        LKMC_M5OPS_RESETSTATS;
+#else
         start = clk::now();
         for (j = 0; j < granule; ++j) {
 #endif
-            LKMC_M5OPS_RESETSTATS;
-            hashmap.insert(randoms[base + j]);
-            LKMC_M5OPS_DUMPSTATS;
-#ifndef LKMC_M5OPS_ENABLE
+        hashmap.insert(randoms[base + j]);
+#ifdef LKMC_M5OPS_ENABLE
+        LKMC_M5OPS_DUMPSTATS;
+#else
         }
         end = clk::now();
         auto dt_hashmap = (end - start) / granule;