diff --git a/bios/Arcade/Arcade/.variants/cvs.zip.3c69f366 b/bios/Arcade/Arcade/.variants/cvs.zip.3c69f366
new file mode 100644
index 00000000..00ddcfa0
Binary files /dev/null and b/bios/Arcade/Arcade/.variants/cvs.zip.3c69f366 differ
diff --git a/bios/Arcade/Arcade/.variants/cvs.zip.95581230 b/bios/Arcade/Arcade/.variants/cvs.zip.95581230
deleted file mode 100644
index 91621c12..00000000
Binary files a/bios/Arcade/Arcade/.variants/cvs.zip.95581230 and /dev/null differ
diff --git a/bios/Arcade/Arcade/a2diskiing.zip b/bios/Arcade/Arcade/a2diskiing.zip
deleted file mode 100644
index 603826a8..00000000
Binary files a/bios/Arcade/Arcade/a2diskiing.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/coco_fdc_v11.zip b/bios/Arcade/Arcade/coco_fdc_v11.zip
deleted file mode 100644
index 7e5ea5ea..00000000
Binary files a/bios/Arcade/Arcade/coco_fdc_v11.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/cvs.zip b/bios/Arcade/Arcade/cvs.zip
index 00ddcfa0..91621c12 100644
Binary files a/bios/Arcade/Arcade/cvs.zip and b/bios/Arcade/Arcade/cvs.zip differ
diff --git a/bios/Arcade/Arcade/dragon64.zip b/bios/Arcade/Arcade/dragon64.zip
deleted file mode 100644
index 6f21fe5b..00000000
Binary files a/bios/Arcade/Arcade/dragon64.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/hp82937.zip b/bios/Arcade/Arcade/hp82937.zip
deleted file mode 100644
index f96bbb3a..00000000
Binary files a/bios/Arcade/Arcade/hp82937.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/hp98034.zip b/bios/Arcade/Arcade/hp98034.zip
deleted file mode 100644
index 222d7db3..00000000
Binary files a/bios/Arcade/Arcade/hp98034.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/mz80k.zip b/bios/Arcade/Arcade/mz80k.zip
deleted file mode 100644
index 6eab951b..00000000
Binary files a/bios/Arcade/Arcade/mz80k.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/pc8001.zip b/bios/Arcade/Arcade/pc8001.zip
deleted file mode 100644
index c110785c..00000000
Binary files a/bios/Arcade/Arcade/pc8001.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/pcw9512.zip b/bios/Arcade/Arcade/pcw9512.zip
deleted file mode 100644
index 7b7ef466..00000000
Binary files a/bios/Arcade/Arcade/pcw9512.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/trs80.zip b/bios/Arcade/Arcade/trs80.zip
deleted file mode 100644
index 95d3dec1..00000000
Binary files a/bios/Arcade/Arcade/trs80.zip and /dev/null differ
diff --git a/bios/Arcade/Arcade/tvc64.zip b/bios/Arcade/Arcade/tvc64.zip
deleted file mode 100644
index 825e3ac5..00000000
Binary files a/bios/Arcade/Arcade/tvc64.zip and /dev/null differ
diff --git a/bios/Arcade/MAME/a2mouse.zip b/bios/Arcade/MAME/a2mouse.zip
deleted file mode 100755
index 67ab6c38..00000000
Binary files a/bios/Arcade/MAME/a2mouse.zip and /dev/null differ
diff --git a/bios/Arcade/MAME/bbc_tube_a500.zip b/bios/Arcade/MAME/bbc_tube_a500.zip
index 0d34613a..806d26f5 100755
Binary files a/bios/Arcade/MAME/bbc_tube_a500.zip and b/bios/Arcade/MAME/bbc_tube_a500.zip differ
diff --git a/bios/Arcade/MAME/bbc_tube_a500d.zip b/bios/Arcade/MAME/bbc_tube_a500d.zip
index 0ab79682..75de02d5 100755
Binary files a/bios/Arcade/MAME/bbc_tube_a500d.zip and b/bios/Arcade/MAME/bbc_tube_a500d.zip differ
diff --git a/bios/Arcade/MAME/sw1000xg.zip b/bios/Arcade/MAME/sw1000xg.zip
index 78c7573c..f758a6cb 100755
Binary files a/bios/Arcade/MAME/sw1000xg.zip and b/bios/Arcade/MAME/sw1000xg.zip differ
diff --git a/bios/Elektronika/BK/.variants/bk0010.zip.65a6d1db b/bios/Elektronika/BK/.variants/bk0010.zip.65a6d1db
deleted file mode 100644
index 963085ac..00000000
Binary files a/bios/Elektronika/BK/.variants/bk0010.zip.65a6d1db and /dev/null differ
diff --git a/bios/Mattel/Aquarius/.variants/aquarius_ar.zip.73026a45 b/bios/Mattel/Aquarius/.variants/aquarius_ar.zip.73026a45
new file mode 100644
index 00000000..1074fb6a
Binary files /dev/null and b/bios/Mattel/Aquarius/.variants/aquarius_ar.zip.73026a45 differ
diff --git a/bios/Mattel/Aquarius/aquarius_ar.zip b/bios/Mattel/Aquarius/aquarius_ar.zip
index 1074fb6a..b99fc7c7 100644
Binary files a/bios/Mattel/Aquarius/aquarius_ar.zip and b/bios/Mattel/Aquarius/aquarius_ar.zip differ
diff --git a/bios/Tandy/TRS-80/trs80.zip b/bios/Tandy/TRS-80/trs80.zip
index 9e0ee8d7..0c7c5f91 100644
Binary files a/bios/Tandy/TRS-80/trs80.zip and b/bios/Tandy/TRS-80/trs80.zip differ
diff --git a/bios/Tandy/TRS-80/trs80m3.zip b/bios/Tandy/TRS-80/trs80m3.zip
index be6a3efb..632c0cab 100644
Binary files a/bios/Tandy/TRS-80/trs80m3.zip and b/bios/Tandy/TRS-80/trs80m3.zip differ
diff --git a/tests/test_archive_recipes.py b/tests/test_archive_recipes.py
index 39d5cb7b..5b7a82cf 100644
--- a/tests/test_archive_recipes.py
+++ b/tests/test_archive_recipes.py
@@ -20,9 +20,12 @@ REPO_ROOT = Path(__file__).resolve().parents[1]
 sys.path.insert(0, str(REPO_ROOT / "scripts"))
 
 # Sets whose archive also carries the ROMs of devices the machine references
-# (listxml device_ref): the NAOMI boards pull the JVS I/O board and the Maple
-# interface, and MAME finds those ROMs in the machine's own archive too.
+# (listxml device_ref). A device looks for its ROMs under its own name, then
+# under the system's (device_t::searchpath, src/emu/device.cpp:140-152), so
+# MAME finds them in the machine's own archive too. A device set is not a
+# system: the devices it holds are never looked for in its archive.
 DEVICE_ROMS = {
+    # NAOMI boards: the JVS I/O board and the Maple interface
     "airlbios.zip": ("jvs13551.zip", "mie.zip"),
     "f355bios.zip": ("jvs13551.zip", "mie.zip"),
     "f355dlx.zip": ("jvs13551.zip", "mie.zip"),
@@ -30,18 +33,41 @@ DEVICE_ROMS = {
     "naomi.zip": ("jvs13551.zip", "mie.zip"),
     "naomi2.zip": ("jvs13551.zip", "mie.zip"),
     "naomigd.zip": ("jvs13551.zip", "mie.zip"),
+    # Teletext character ROM: SAA5050 in bbcmet (acorn/bbcm.cpp:701), which
+    # bbcm builds on (line 764)
+    "bbcm.zip": ("saa5050.zip",),
+    # DragonDOS, the default cartridge (trs/dragon.cpp:544, 562)
+    "dragon32.zip": ("dragon_fdc.zip",),
+    "dragon64.zip": ("dragon_fdc.zip",),
+    # PC-80S31 disk unit (nec/pc6001.cpp:1644 through pc6601_fdc_config,
+    # nec/pc8001.cpp:1257)
+    "pc6001mk2sr.zip": ("pc80s31.zip",),
+    "pc8001mk2sr.zip": ("pc80s31.zip",),
 }
 
 # Archives that share a set name without being that set.
 NOT_ROMSETS = {"samples", "artwork"}
 
-# The defect added whole slot-option trees, dozens of members at a time.
-MIN_EXTRA = 3
+MIN_EXTRA = 1
 
 # Kept as they are: rewriting them would drop bytes the collection holds
-# nowhere else, and no recipe names the set those bytes belong to.
+# nowhere else, or they are another emulator's archive under a MAME set name.
 KEPT = {
-    "bios/Acorn/BBC Micro/.variants/bbcb.zip": "zdfs-0.90.rom is held only here",
+    "bios/Acorn/BBC Micro/.variants/bbcb.zip": (
+        "MAME 0.150's bbcb loads its DFS ROMs from the machine archive "
+        "(src/mess/drivers/bbc.c ROM_START(bbcb)), older than every imported "
+        "listxml; zdfs-0.90.rom is held only here"
+    ),
+    "bios/Arcade/Arcade/.variants/cvs.zip.3c69f366": (
+        "the 2001 mame.dk distribution of cvs.zip; its cvs.txt is held only here"
+    ),
+    "bios/Mattel/Aquarius/.variants/aquarius_ar.zip.73026a45": (
+        "a platform pack copy; its TMCTV.png is held only here"
+    ),
+    "bios/Sega/Dreamcast/dc.zip": (
+        "RetroBat's dc/dc.zip holds dc_boot.bin and dc_flash.bin, the names the "
+        "Dreamcast BIOS goes by outside MAME, not MAME's dc set"
+    ),
 }