diff --git a/tests/test_dread.toml b/tests/test_dread.toml
index 51afe6bb..7eba40ed 100644
--- a/tests/test_dread.toml
+++ b/tests/test_dread.toml
@@ -219,8 +219,8 @@ code = '''
 # the end of a directory
 [cases.test_dread_read_idempotent]
 defines.PARENT = [false, true]
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
 # neighbors only make sense if we have a parent
 if = 'PARENT || NEIGHBORS == 0'
@@ -315,17 +315,17 @@ defines.N = 5
 # where in the dir read do we mkdir?
 defines.I = 'range(6)'
 defines.PARENT = true
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x1, 0x2, 0x3]
 # more neighbors ensures mdir splits which can be its own source
 # of problems
 defines.NEIGHBOR_N = [1, 10, 100]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
-# 3 => seek with offset before mutation
-# 4 => rewind then seek with offset before mutation
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
+# SEEK=3 => seek with offset before mutation
+# SEEK=4 => rewind then seek with offset before mutation
 defines.SEEK = [0, 1, 2, 3, 4]
 # neighbors only make sense if we have a parent
 if = 'PARENT || NEIGHBORS == 0'
@@ -440,17 +440,17 @@ defines.N = 5
 # where in the dir read do we mkdir?
 defines.I = 'range(6)'
 defines.PARENT = true
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x1, 0x2, 0x3]
 # more neighbors ensures mdir splits which can be its own source
 # of problems
 defines.NEIGHBOR_N = [1, 10, 100]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
-# 3 => seek with offset before mutation
-# 4 => rewind then seek with offset before mutation
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
+# SEEK=3 => seek with offset before mutation
+# SEEK=4 => rewind then seek with offset before mutation
 defines.SEEK = [0, 1, 2, 3, 4]
 # neighbors only make sense if we have a parent
 if = 'PARENT || NEIGHBORS == 0'
@@ -575,17 +575,17 @@ defines.N = 5
 # where in the dir read do we mkdir?
 defines.I = 'range(6)'
 defines.PARENT = true
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x1, 0x2, 0x3]
 # more neighbors ensures mdir splits which can be its own source
 # of problems
 defines.NEIGHBOR_N = [1, 10, 100]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
-# 3 => seek with offset before mutation
-# 4 => rewind then seek with offset before mutation
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
+# SEEK=3 => seek with offset before mutation
+# SEEK=4 => rewind then seek with offset before mutation
 defines.SEEK = [0, 1, 2, 3, 4]
 # neighbors only make sense if we have a parent
 if = 'PARENT || NEIGHBORS == 0'
@@ -717,12 +717,12 @@ defines.I = 'range(6)'
 # where do we mkdir?
 defines.J = 'range(6)'
 defines.PARENT = [false, true]
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 # neighbors only make sense if we have a parent
 if = 'PARENT || NEIGHBORS == 0'
@@ -818,12 +818,12 @@ defines.I = 'range(5)'
 # where do we rm?
 defines.J = 'range(5)'
 defines.PARENT = [false, true]
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 # neighbors only make sense if we have a parent
 if = 'PARENT || NEIGHBORS == 0'
@@ -922,16 +922,16 @@ defines.I = 'range(5)'
 defines.J = 'range(5)'
 defines.K = 'range(5)'
 defines.BEFORE = [false, true]
-# 0 => no
-# 1 => yes
-# 2 => yes, and rename to new parent
+# PARENT=0 => no
+# PARENT=1 => yes
+# PARENT=2 => yes, and rename to new parent
 defines.PARENT = [0, 1, 2]
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 # neighbors only make sense if we have a parent
 if = 'PARENT || NEIGHBORS == 0'
@@ -1044,12 +1044,12 @@ defines.I = 'range(6)'
 defines.J = 'range(6)'
 defines.K = 'range(6)'
 defines.PARENT = [false, true]
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 if = [
     'J != K',
@@ -1155,12 +1155,12 @@ defines.I = 'range(5)'
 defines.J = 'range(5)'
 defines.K = 'range(5)'
 defines.PARENT = [false, true]
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 if = [
     'J != K',
@@ -1266,16 +1266,16 @@ defines.I = 'range(5)'
 defines.J = 'range(5)'
 defines.K = 'range(5)'
 defines.BEFORE = [false, true]
-# 0 => no
-# 1 => yes
-# 2 => yes, and rename to new parent
+# PARENT=0 => no
+# PARENT=1 => yes
+# PARENT=2 => yes, and rename to new parent
 defines.PARENT = [0, 1, 2]
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 # neighbors only make sense if we have a parent
 if = [
@@ -1396,12 +1396,12 @@ code = '''
 defines.N = 5
 # where in the dir read do we remove?
 defines.I = 'range(6)'
-# bit 0x2 = left neighbor
-# bit 0x1 = right neighbor
+# NEIGHBORS&0x2 = left neighbor
+# NEIGHBORS&0x1 = right neighbor
 defines.NEIGHBORS = [0x0, 0x1, 0x2, 0x3]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 code = '''
     lfs_t lfs;
@@ -1491,9 +1491,9 @@ code = '''
 [cases.test_dread_recursive_rm]
 defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512]
 defines.PARENT = [false, true]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 # limit powerloss testing due to time
 if = '!TEST_PLS || N <= 32'
@@ -1622,13 +1622,13 @@ code = '''
 [cases.test_dread_recursive_mv]
 defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512]
 defines.BEFORE = [false, true]
-# 0 => no
-# 1 => yes
-# 2 => yes, and rename to new parent
+# PARENT=0 => no
+# PARENT=1 => yes
+# PARENT=2 => yes, and rename to new parent
 defines.PARENT = [0, 1, 2]
-# 0 => don't seek
-# 1 => seek
-# 2 => rewind then seek
+# SEEK=0 => don't seek
+# SEEK=1 => seek
+# SEEK=2 => rewind then seek
 defines.SEEK = [0, 1, 2]
 # limit powerloss testing due to time
 if = '!TEST_PLS || N <= 32'
diff --git a/tests/test_forphan.toml b/tests/test_forphan.toml
index ca647c58..70ee79e1 100644
--- a/tests/test_forphan.toml
+++ b/tests/test_forphan.toml
@@ -1183,8 +1183,8 @@ defines.SIZE = [
     '4*BLOCK_SIZE',
 ]
 defines.CHUNK = 'lfs_min(64, SIZE)'
-# 0x1 => sync before orphaning
-# 0x2 => sync after orphaning
+# SYNC=0x1 => sync before orphaning
+# SYNC=0x2 => sync after orphaning
 defines.SYNC = [0, 1, 2, 3]
 code = '''
     lfs_t lfs;
@@ -1665,9 +1665,9 @@ code = '''
 
 [cases.test_forphan_orphan_open]
 defines.ORPHANS = [1, 2, 3, 100]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 code = '''
     lfs_t lfs;
@@ -1757,9 +1757,9 @@ code = '''
 
 [cases.test_forphan_orphan_mkdir]
 defines.ORPHANS = [1, 2, 3, 100]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 code = '''
     lfs_t lfs;
@@ -1838,9 +1838,9 @@ code = '''
 
 [cases.test_forphan_orphan_remove]
 defines.ORPHANS = [1, 2, 3, 100]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 code = '''
     lfs_t lfs;
@@ -1915,9 +1915,9 @@ defines.DIR = [false, true]
 defines.INTERDIR = [false, true]
 defines.DISTANCE = [0, 1, 100]
 defines.ORPHANS = [1, 2, 3, 100]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 code = '''
     lfs_t lfs;
@@ -2061,9 +2061,9 @@ code = '''
 
 [cases.test_forphan_orphan_rename_src]
 defines.ORPHANS = [1, 2, 3, 100]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 code = '''
     lfs_t lfs;
@@ -3363,13 +3363,13 @@ code = '''
 '''
 
 [cases.test_forphan_zombie_open]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -3468,13 +3468,13 @@ code = '''
 '''
 
 [cases.test_forphan_zombie_mkdir]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -3561,13 +3561,13 @@ code = '''
 '''
 
 [cases.test_forphan_zombie_remove]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -3650,13 +3650,13 @@ code = '''
 defines.DIR = [false, true]
 defines.INTERDIR = [false, true]
 defines.DISTANCE = [0, 1, 100]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -3807,13 +3807,13 @@ code = '''
 '''
 
 [cases.test_forphan_zombie_rename_src]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -4123,13 +4123,13 @@ code = '''
 
 [cases.test_forphan_file_on_zombie_remove]
 defines.DIR = [false, true]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -4224,13 +4224,13 @@ code = '''
 defines.DIR = [false, true]
 defines.INTERDIR = [false, true]
 defines.DISTANCE = [0, 1, 100]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -5613,13 +5613,13 @@ defines.EXISTS = [false, true]
 defines.INTERDIR = [false, true]
 defines.DISTANCE = [0, 1, 100]
 defines.SYNC = [false, true]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTRENAME = [false, true]
 if = 'REMOUNT <= CLOSE'
@@ -5773,13 +5773,13 @@ defines.DIR = [false, true]
 defines.EXISTS = [false, true]
 defines.INTERDIR = [false, true]
 defines.DISTANCE = [0, 1, 100]
-# 0 => don't close (before end of test)
-# 1 => close after op
-# 2 => close before op
+# CLOSE=0 => don't close (before end of test)
+# CLOSE=1 => close after op
+# CLOSE=2 => close before op
 defines.CLOSE = [0, 1, 2]
-# 0 => don't remount
-# 1 => remount after op
-# 2 => remount before op
+# REMOUNT=0 => don't remount
+# REMOUNT=1 => remount after op
+# REMOUNT=2 => remount before op
 defines.REMOUNT = [0, 1, 2]
 defines.POSTHUMOUS = [false, true]
 if = 'REMOUNT <= CLOSE'
diff --git a/tests/test_fsync.toml b/tests/test_fsync.toml
index 741cacaa..5a3668e6 100644
--- a/tests/test_fsync.toml
+++ b/tests/test_fsync.toml
@@ -591,13 +591,13 @@ code = '''
 # Test one writer, multiple readers
 [cases.test_fsync_wrrr]
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SIZE = [
     'CACHE_SIZE/2',
@@ -679,13 +679,13 @@ code = '''
 
 [cases.test_fsync_wrrr_fuzz]
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 20
@@ -782,13 +782,13 @@ code = '''
 # Test multiple writers
 [cases.test_fsync_wwww]
 defines.W = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SIZE = [
     'CACHE_SIZE/2',
@@ -865,13 +865,13 @@ code = '''
 
 [cases.test_fsync_wwww_fuzz]
 defines.W = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 20
@@ -958,13 +958,13 @@ code = '''
 [cases.test_fsync_wwrr]
 defines.W = 4
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SIZE = [
     'CACHE_SIZE/2',
@@ -1058,13 +1058,13 @@ code = '''
 [cases.test_fsync_wwrr_fuzz]
 defines.W = 4
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 20
@@ -1172,13 +1172,13 @@ code = '''
 # Test multiple rd/wrers
 [cases.test_fsync_rwrw]
 defines.RW = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SIZE = [
     'CACHE_SIZE/2',
@@ -1271,13 +1271,13 @@ code = '''
 
 [cases.test_fsync_rwrw_fuzz]
 defines.RW = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 20
@@ -1383,13 +1383,13 @@ code = '''
 # Test multiple rw files without fixed size
 [cases.test_fsync_rwrw_sparse_fuzz]
 defines.RW = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 40
@@ -1517,13 +1517,13 @@ code = '''
 # Test multiple rw files while also truncating/fruncating
 [cases.test_fsync_rwtfrwtf_sparse_fuzz]
 defines.RW = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 40
@@ -2325,13 +2325,13 @@ code = '''
 # Test one desynced writer, multiple readers
 [cases.test_fsync_drrr]
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SIZE = [
     'CACHE_SIZE/2',
@@ -2418,13 +2418,13 @@ code = '''
 
 [cases.test_fsync_drrr_fuzz]
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 20
@@ -2526,13 +2526,13 @@ code = '''
 # Test one writer, multiple desynced readers
 [cases.test_fsync_wddd]
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SIZE = [
     'CACHE_SIZE/2',
@@ -2611,13 +2611,13 @@ code = '''
 
 [cases.test_fsync_wddd_fuzz]
 defines.R = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 20
@@ -2711,13 +2711,13 @@ code = '''
 # Test multiple desynced rd/wrers
 [cases.test_fsync_rwdrwd]
 defines.RW = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SIZE = [
     'CACHE_SIZE/2',
@@ -2819,13 +2819,13 @@ code = '''
 
 [cases.test_fsync_rwdrwd_fuzz]
 defines.RW = 4
-# 0 => no sync, readers not updated
-# 1 => sync via lfsr_file_sync
-# 2 => sync via LFS_O_SYNC
+# FLUSH=0 => no sync, readers not updated
+# FLUSH=1 => sync via lfsr_file_sync
+# FLUSH=2 => sync via LFS_O_SYNC
 defines.SYNC = [0, 1, 2]
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 20
@@ -2940,9 +2940,9 @@ code = '''
 # Test multiple rwd files without fixed size
 [cases.test_fsync_rwdrwd_sparse_fuzz]
 defines.RW = 4
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 40
@@ -3089,9 +3089,9 @@ code = '''
 # Test multiple rwd files while also truncating/fruncating
 [cases.test_fsync_rwtfdrwtfd_sparse_fuzz]
 defines.RW = 4
-# 0 => no flush
-# 1 => flush via lfsr_file_flush
-# 2 => flush via LFS_O_FLUSH
+# FLUSH=0 => no flush
+# FLUSH=1 => flush via lfsr_file_flush
+# FLUSH=2 => flush via LFS_O_FLUSH
 defines.FLUSH = [0, 1, 2]
 defines.SEED = 'range(10)'
 defines.N = 40
diff --git a/tests/test_fwrite.toml b/tests/test_fwrite.toml
index 7407f0e1..5cb0a1da 100644
--- a/tests/test_fwrite.toml
+++ b/tests/test_fwrite.toml
@@ -124,12 +124,12 @@ defines.SIZE = [
     '4*BLOCK_SIZE',
 ]
 defines.CHUNK = [32, 8, 1]
-# bit 0 => first chunk 
-# bit 1 => middle chunk
-# bit 2 => last chunk
+# MASK&0x1 => first chunk
+# MASK&0x2 => middle chunk
+# MASK&0x4 => last chunk
 defines.MASK = [0, 1, 2, 3, 4, 5, 6, 7]
-# 0 => in-order
-# 1 => reversed
+# ORDER=0 => in-order
+# ORDER=1 => reversed
 defines.ORDER = [0, 1]
 defines.SYNC = [false, true]
 defines.REMOUNT = [false, true]
@@ -302,12 +302,12 @@ defines.SIZE = [
     '4*BLOCK_SIZE',
 ]
 defines.CHUNK = [32, 8, 1]
-# bit 0 => first chunk 
-# bit 1 => middle chunk
-# bit 2 => last chunk
+# MASK&0x1 => first chunk
+# MASK&0x2 => middle chunk
+# MASK&0x4 => last chunk
 defines.MASK = [0, 1, 2, 3, 4, 5, 6, 7]
-# 0 => in-order
-# 1 => reversed
+# ORDER=0 => in-order
+# ORDER=1 => reversed
 defines.ORDER = [0, 1]
 defines.SYNC = [false, true]
 defines.REMOUNT = [false, true]
@@ -1003,9 +1003,9 @@ defines.SIZE = [
     '4*BLOCK_SIZE',
 ]
 defines.CHUNK = [32, 8, 1]
-# 0 => no init
-# 1 => fill with data
-# 2 => truncate to size
+# INIT=0 => no init
+# INIT=1 => fill with data
+# INIT=2 => truncate to size
 defines.INIT = [0, 1, 2]
 defines.SYNC = [false, true]
 defines.REMOUNT = [false, true]
@@ -1132,12 +1132,12 @@ defines.SIZE = [
     '4*BLOCK_SIZE',
 ]
 defines.CHUNK = [32, 8, 1]
-# bit 0 => first chunk 
-# bit 1 => middle chunk
-# bit 2 => last chunk
+# MASK&0x1 => first chunk
+# MASK&0x2 => middle chunk
+# MASK&0x4 => last chunk
 defines.MASK = [0, 1, 2, 3, 4, 5, 6, 7]
-# 0 => in-order
-# 1 => reversed
+# ORDER=0 => in-order
+# ORDER=1 => reversed
 defines.ORDER = [0, 1]
 # writing this many times guarantees a compaction
 defines.WRITES = '2*(BLOCK_SIZE/PROG_SIZE)'
@@ -1319,12 +1319,12 @@ defines.SIZE = [
     '4*BLOCK_SIZE',
 ]
 defines.CHUNK = [32, 8, 1]
-# bit 0 => first chunk 
-# bit 1 => middle chunk
-# bit 2 => last chunk
+# MASK&0x1 => first chunk
+# MASK&0x2 => middle chunk
+# MASK&0x4 => last chunk
 defines.MASK = [0, 1, 2, 3, 4, 5, 6, 7]
-# 0 => in-order
-# 1 => reversed
+# ORDER=0 => in-order
+# ORDER=1 => reversed
 defines.ORDER = [0, 1]
 # writing this many times guarantees a compaction
 defines.WRITES = '2*(BLOCK_SIZE/PROG_SIZE)'
@@ -1512,9 +1512,9 @@ defines.SIZE = [
     '4*BLOCK_SIZE',
 ]
 defines.CHUNK = [32, 8, 1]
-# 0 => no init
-# 1 => fill with data
-# 2 => truncate to size
+# INIT=0 => no init
+# INIT=1 => fill with data
+# INIT=2 => truncate to size
 defines.INIT = [0, 1, 2]
 defines.SYNC = [false, true]
 defines.REMOUNT = [false, true]
@@ -1653,9 +1653,9 @@ defines.SIZE = [
 ]
 # chunk is more an upper limit here
 defines.CHUNK = [32, 8]
-# 0 => no init
-# 1 => fill with data
-# 2 => truncate to size
+# INIT=0 => no init
+# INIT=1 => fill with data
+# INIT=2 => truncate to size
 defines.INIT = [0, 1, 2]
 defines.SYNC = [false, true]
 defines.REMOUNT = [false, true]
@@ -1880,9 +1880,9 @@ defines.SIZE = [
 ]
 # chunk is more an upper limit here
 defines.CHUNK = [32, 8]
-# 0 => no init
-# 1 => fill with data
-# 2 => truncate to size
+# INIT=0 => no init
+# INIT=1 => fill with data
+# INIT=2 => truncate to size
 defines.INIT = [0, 1, 2]
 defines.SYNC = [false, true]
 if = [
@@ -2020,9 +2020,9 @@ defines.SIZE = [
 ]
 # chunk is more an upper limit here
 defines.CHUNK = [32, 8]
-# 0 => no init
-# 1 => fill with data
-# 2 => truncate to size
+# INIT=0 => no init
+# INIT=1 => fill with data
+# INIT=2 => truncate to size
 defines.INIT = [0, 1, 2]
 defines.SYNC = [false, true]
 if = [
@@ -2180,9 +2180,9 @@ defines.SIZE = [
     '2*BLOCK_SIZE',
     '4*BLOCK_SIZE',
 ]
-# 0 => no init
-# 1 => fill with data
-# 2 => truncate to size
+# INIT=0 => no init
+# INIT=1 => fill with data
+# INIT=2 => truncate to size
 defines.INIT = [0, 1, 2]
 defines.MODE = ['LFS_O_RDONLY', 'LFS_O_WRONLY', 'LFS_O_RDWR']
 if = [
@@ -2283,9 +2283,9 @@ defines.SIZE = [
 ]
 # chunk is more an upper limit here
 defines.CHUNK = [32, 8]
-# 0 => no init
-# 1 => fill with data
-# 2 => truncate to size
+# INIT=0 => no init
+# INIT=1 => fill with data
+# INIT=2 => truncate to size
 defines.INIT = [0, 1, 2]
 defines.SYNC = [false, true]
 defines.REMOUNT = [false, true]
diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml
index 50112836..982f053e 100644
--- a/tests/test_rbyd.toml
+++ b/tests/test_rbyd.toml
@@ -1938,8 +1938,8 @@ code = '''
 
 [cases.test_rbyd_atomic_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 in = 'lfs.c'
 code = '''
@@ -2026,8 +2026,8 @@ code = '''
 
 [cases.test_rbyd_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -2293,8 +2293,8 @@ code = '''
 
 [cases.test_rbyd_atomic_traverse_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 in = 'lfs.c'
 code = '''
@@ -2362,8 +2362,8 @@ code = '''
 
 [cases.test_rbyd_traverse_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -2433,8 +2433,8 @@ code = '''
 # use emubd's copy-on-write copy to speed this up significantly
 [cases.test_rbyd_update_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -2719,8 +2719,8 @@ code = '''
 # use emubd's copy-on-write copy to speed this up significantly
 [cases.test_rbyd_remove_permutations]
 defines.N = 'range(1, 7)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -2870,8 +2870,8 @@ code = '''
 # use emubd's copy-on-write copy to speed this up significantly
 [cases.test_rbyd_remove_traverse_permutations]
 defines.N = 'range(1, 7)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -3438,8 +3438,8 @@ code = '''
 # use emubd's copy-on-write copy to speed this up significantly
 [cases.test_rbyd_remove_all_permutations]
 defines.N = 'range(1, 7)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -3911,8 +3911,8 @@ code = '''
 
 [cases.test_rbyd_create_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -4182,8 +4182,8 @@ code = '''
 
 [cases.test_rbyd_create_traverse_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -4724,8 +4724,8 @@ code = '''
 [cases.test_rbyd_mixed_permutations]
 defines.N = 'range(1, 7)'
 defines.M = 'range(1, 4)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -5101,8 +5101,8 @@ code = '''
 [cases.test_rbyd_mixed_traverse_permutations]
 defines.N = 'range(1, 7)'
 defines.M = 'range(1, 4)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -5210,8 +5210,8 @@ code = '''
 [cases.test_rbyd_mixed_update_permutations]
 defines.N = 'range(1, 4)'
 defines.M = 'range(1, 3)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -5340,8 +5340,8 @@ code = '''
 [cases.test_rbyd_mixed_remove_permutations]
 defines.N = 'range(1, 7)'
 defines.M = 'range(1, 4)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -5537,8 +5537,8 @@ code = '''
 [cases.test_rbyd_mixed_remove_all_permutations]
 defines.N = 'range(1, 4)'
 defines.M = 'range(1, 3)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -5752,8 +5752,8 @@ code = '''
 
 [cases.test_rbyd_unrelated_create_permutations]
 defines.N = 'range(1, 8)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -5891,8 +5891,8 @@ code = '''
 [cases.test_rbyd_unrelated_mixed_permutations]
 defines.N = 'range(1, 7)'
 defines.M = 'range(1, 4)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -6419,8 +6419,8 @@ code = '''
 # use emubd's copy-on-write copy to speed this up significantly
 [cases.test_rbyd_delete_permutations]
 defines.N = 'range(1, 7)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -6575,8 +6575,8 @@ code = '''
 [cases.test_rbyd_delete_range_permutations]
 defines.N = 'range(1, 7)'
 defines.M = 'range(1, 4)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -6767,8 +6767,8 @@ code = '''
 # use emubd's copy-on-write copy to speed this up significantly
 [cases.test_rbyd_delete_traverse_permutations]
 defines.N = 'range(1, 7)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -6893,8 +6893,8 @@ code = '''
 [cases.test_rbyd_delete_traverse_range_permutations]
 defines.N = 'range(1, 7)'
 defines.M = 'range(1, 4)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -7287,8 +7287,8 @@ code = '''
 # use emubd's copy-on-write copy to speed this up significantly
 [cases.test_rbyd_delete_all_permutations]
 defines.N = 'range(1, 7)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -7432,8 +7432,8 @@ code = '''
 [cases.test_rbyd_delete_all_range_permutations]
 defines.N = 'range(1, 7)'
 defines.M = 'range(1, 4)'
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -8043,8 +8043,8 @@ code = '''
 [cases.test_rbyd_sparse_permutations]
 defines.N = 'range(1, 8)'
 defines.W = 5
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -8130,8 +8130,8 @@ code = '''
 [cases.test_rbyd_sparse_traverse_permutations]
 defines.N = 'range(1, 8)'
 defines.W = 5
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -9144,8 +9144,8 @@ code = '''
 [cases.test_rbyd_sparse_mixed_permutations]
 defines.N = 'range(1, 8)'
 defines.W = 5
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -9255,8 +9255,8 @@ code = '''
 [cases.test_rbyd_sparse_mixed_traverse_permutations]
 defines.N = 'range(1, 8)'
 defines.W = 5
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -9376,8 +9376,8 @@ code = '''
 defines.N = 'range(1, 7)'
 defines.W = 5
 defines.D = [1, 2]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -9505,8 +9505,8 @@ code = '''
 defines.N = 'range(1, 7)'
 defines.W = 5
 defines.D = [1, 2]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -9643,8 +9643,8 @@ code = '''
 defines.N = 'range(1, 7)'
 defines.W = 5
 defines.D = [1, 2]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -9793,8 +9793,8 @@ code = '''
 defines.N = 'range(1, 7)'
 defines.W = 5
 defines.D = [1, 2]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -9922,8 +9922,8 @@ code = '''
 defines.N = 'range(1, 7)'
 defines.W = 5
 defines.D = [1, 2]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -10060,8 +10060,8 @@ code = '''
 defines.N = 'range(1, 7)'
 defines.W = 5
 defines.D = [1, 2]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -10209,8 +10209,8 @@ code = '''
 [cases.test_rbyd_sparse_delete_permutations]
 defines.N = 'range(1, 7)'
 defines.W = 5
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -10365,8 +10365,8 @@ code = '''
 [cases.test_rbyd_sparse_attr_permutations]
 defines.N = 'range(1, 7)'
 defines.W = 5
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -10891,8 +10891,8 @@ code = '''
 [cases.test_rbyd_subwide_lookup_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 in = 'lfs.c'
 code = '''
@@ -10976,8 +10976,8 @@ code = '''
 [cases.test_rbyd_subwide_remove_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -11115,8 +11115,8 @@ code = '''
 [cases.test_rbyd_subwide_replace_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -11258,8 +11258,8 @@ code = '''
 [cases.test_rbyd_subwide_mixed_lookup_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 in = 'lfs.c'
 code = '''
@@ -11345,8 +11345,8 @@ code = '''
 [cases.test_rbyd_subwide_mixed_remove_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -11493,8 +11493,8 @@ code = '''
 [cases.test_rbyd_subwide_mixed_replace_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -11645,8 +11645,8 @@ code = '''
 [cases.test_rbyd_subwide_weighted_lookup_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 in = 'lfs.c'
 code = '''
@@ -11729,8 +11729,8 @@ code = '''
 [cases.test_rbyd_subwide_weighted_remove_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -11870,8 +11870,8 @@ code = '''
 [cases.test_rbyd_subwide_weighted_replace_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -12006,8 +12006,8 @@ code = '''
 [cases.test_rbyd_supwide_lookup_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 in = 'lfs.c'
 code = '''
@@ -12091,8 +12091,8 @@ code = '''
 [cases.test_rbyd_supwide_remove_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'
@@ -12230,8 +12230,8 @@ code = '''
 [cases.test_rbyd_supwide_replace_permutations]
 defines.N = 'range(1, 7)'
 defines.SHIFT = [0, 3, -3]
-# -1 => exhaust all permutations
-#  n => reproduce a specific permutation
+# PERMUTATION=-1 => exhaust all permutations
+# PERMUTATION=n  => reproduce a specific permutation
 defines.PERMUTATION = -1
 # large progs take too long for now
 if = 'PROG_SIZE < 512'