diff --git a/TODO.md b/TODO.md
index 93381aa5ca74baf13d3cd4ecbde3d508c04df0e2..6113adfd41d45712ec55cefa9fa6d3c03840288d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -20,6 +20,9 @@
 * Write a test to verify that concurrent modification attempts are correctly
   detected.
 
+* Spending time declaring 150 operations, only to run 5 instructions
+  afterwards, is not smart. Could we do better?
+
 ## For Later Releases
 
 * Optimize `flatten_map` to linear time by using a vector to push
diff --git a/fuzz/src/Main.ml b/fuzz/src/Main.ml
index bf6af5230486bd58e431f66e3d13d5061ef2e977..a7122e825a0242df78bb1311c5728b61f66e0ad7 100644
--- a/fuzz/src/Main.ml
+++ b/fuzz/src/Main.ml
@@ -31,15 +31,6 @@ module Settings = struct
   let () =
     dprintf "module Settings = struct\n"
 
-  (* We do not want to fail in this setup phase when we run out of data, so
-     we define these modified generators. *)
-
-  let interval_ i j () =
-    try interval_ i j () with End_of_file -> i
-
-  let bool () =
-    try bool() with End_of_file -> true
-
   (* Pick a nonzero chunk size at each depth. We allow different chunk sizes
      at depths 0, 1, and 2, then impose a uniform chunk size, for simplicity.
      Most tests are shallow anyway. *)