diff --git a/Cargo.lock b/Cargo.lock
index ecc5b3a..fdfcca8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,54 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "abi_stable"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d6512d3eb05ffe5004c59c206de7f99c34951504056ce23fc953842f12c445"
-dependencies = [
- "abi_stable_derive",
- "abi_stable_shared",
- "const_panic",
- "core_extensions",
- "crossbeam-channel",
- "generational-arena",
- "libloading 0.7.4",
- "lock_api",
- "parking_lot",
- "paste",
- "repr_offset",
- "rustc_version",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "abi_stable_derive"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7178468b407a4ee10e881bc7a328a65e739f0863615cca4429d43916b05e898"
-dependencies = [
- "abi_stable_shared",
- "as_derive_utils",
- "core_extensions",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 1.0.109",
- "typed-arena",
-]
-
-[[package]]
-name = "abi_stable_shared"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b5df7688c123e63f4d4d649cba63f2967ba7f7861b1664fca3f77d3dad2b63"
-dependencies = [
- "core_extensions",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.25.1"
@@ -201,18 +153,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "as_derive_utils"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff3c96645900a44cf11941c111bd08a6573b0e2f9f69bc9264b179d8fae753c4"
-dependencies = [
- "core_extensions",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "assert_cmd"
 version = "2.1.2"
@@ -562,10 +502,20 @@ dependencies = [
  "wasmtime-wasi",
 ]
 
+[[package]]
+name = "comline-catalog"
+version = "0.10.0"
+source = "git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51#3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51"
+
+[[package]]
+name = "comline-catalog"
+version = "0.10.0"
+source = "git+https://github.com/ComlineProject/specification?rev=69d88327431275017ccce99fec43060467515a9f#69d88327431275017ccce99fec43060467515a9f"
+
 [[package]]
 name = "comline-codegen"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/generation?rev=bb89a516af2fdfa28ce7b9c137b53c1478ef4807#bb89a516af2fdfa28ce7b9c137b53c1478ef4807"
+source = "git+https://github.com/ComlineProject/generation?rev=6a73541e142ba5895fd628ee444449694382e70a#6a73541e142ba5895fd628ee444449694382e70a"
 dependencies = [
  "comline-core",
  "eyre",
@@ -579,7 +529,7 @@ dependencies = [
 [[package]]
 name = "comline-codegen-rust"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/comline-rust?rev=de0b8e51665bbf56f24e23a6f0164044428a9e61#de0b8e51665bbf56f24e23a6f0164044428a9e61"
+source = "git+https://github.com/ComlineProject/comline-rust?rev=eb04c130356e44a2b88b74a6805e24d0e80bdbcc#eb04c130356e44a2b88b74a6805e24d0e80bdbcc"
 dependencies = [
  "comline-codegen",
  "comline-core",
@@ -589,7 +539,7 @@ dependencies = [
 [[package]]
 name = "comline-codegen-typescript"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/comline-typescript?rev=9952c5ad7400c4005b30e892f6a5e9f974799a48#9952c5ad7400c4005b30e892f6a5e9f974799a48"
+source = "git+https://github.com/ComlineProject/comline-typescript?rev=4cad8af36f807f395bdf83dcc29aa290187ca0d0#4cad8af36f807f395bdf83dcc29aa290187ca0d0"
 dependencies = [
  "comline-codegen",
  "comline-core",
@@ -599,12 +549,13 @@ dependencies = [
 [[package]]
 name = "comline-core"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/core?rev=b933209052b06b328ee3da3355665faa0787063d#b933209052b06b328ee3da3355665faa0787063d"
+source = "git+https://github.com/ComlineProject/core?rev=1669a2fe4dbc5592a96a2964d7ae13e985b76701#1669a2fe4dbc5592a96a2964d7ae13e985b76701"
 dependencies = [
  "ariadne",
  "blake3",
  "chumsky",
  "ciborium",
+ "comline-catalog 0.10.0 (git+https://github.com/ComlineProject/specification?rev=69d88327431275017ccce99fec43060467515a9f)",
  "comline-core-stdlib",
  "downcast-rs",
  "eyre",
@@ -628,12 +579,12 @@ dependencies = [
 [[package]]
 name = "comline-core-stdlib"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/core?rev=b933209052b06b328ee3da3355665faa0787063d#b933209052b06b328ee3da3355665faa0787063d"
+source = "git+https://github.com/ComlineProject/core?rev=1669a2fe4dbc5592a96a2964d7ae13e985b76701#1669a2fe4dbc5592a96a2964d7ae13e985b76701"
 
 [[package]]
 name = "comline-doc-html"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/generation?rev=bb89a516af2fdfa28ce7b9c137b53c1478ef4807#bb89a516af2fdfa28ce7b9c137b53c1478ef4807"
+source = "git+https://github.com/ComlineProject/generation?rev=6a73541e142ba5895fd628ee444449694382e70a#6a73541e142ba5895fd628ee444449694382e70a"
 dependencies = [
  "comline-codegen",
  "eyre",
@@ -644,7 +595,7 @@ dependencies = [
 [[package]]
 name = "comline-doc-markdown"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/generation?rev=bb89a516af2fdfa28ce7b9c137b53c1478ef4807#bb89a516af2fdfa28ce7b9c137b53c1478ef4807"
+source = "git+https://github.com/ComlineProject/generation?rev=6a73541e142ba5895fd628ee444449694382e70a#6a73541e142ba5895fd628ee444449694382e70a"
 dependencies = [
  "comline-codegen",
  "eyre",
@@ -655,11 +606,9 @@ dependencies = [
 [[package]]
 name = "comline-runtime"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/runtime?rev=cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9#cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9"
+source = "git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51#3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51"
 dependencies = [
- "abi_stable",
  "bytemuck",
- "libloading 0.8.9",
  "rmp",
  "rmp-serde",
  "serde",
@@ -669,8 +618,9 @@ dependencies = [
 [[package]]
 name = "comline-runtime-conformance"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/runtime?rev=cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9#cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9"
+source = "git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51#3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51"
 dependencies = [
+ "comline-catalog 0.10.0 (git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51)",
  "comline-runtime",
  "serde",
  "serde_json",
@@ -709,15 +659,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "const_panic"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9603f79528ece8163c496f8932121cb36cfe46259e9c907bb3d8205139d7caa3"
-dependencies = [
- "typewit",
-]
-
 [[package]]
 name = "constant_time_eq"
 version = "0.4.2"
@@ -730,21 +671,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48"
 
-[[package]]
-name = "core_extensions"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bb5e5d0269fd4f739ea6cedaf29c16d81c27a7ce7582008e90eb50dcd57003"
-dependencies = [
- "core_extensions_proc_macros",
-]
-
-[[package]]
-name = "core_extensions_proc_macros"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533d38ecd2709b7608fb8e18e4504deb99e9a72879e6aa66373a76d8dc4259ea"
-
 [[package]]
 name = "cpp_demangle"
 version = "0.5.1"
@@ -1203,15 +1129,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generational-arena"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -1617,26 +1534,6 @@ version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.16"
@@ -1655,15 +1552,6 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
-[[package]]
-name = "lock_api"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
-dependencies = [
- "scopeguard",
-]
-
 [[package]]
 name = "log"
 version = "0.4.29"
@@ -1911,35 +1799,6 @@ version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
 
-[[package]]
-name = "parking_lot"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-link",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -2144,15 +2003,6 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
-[[package]]
-name = "redox_syscall"
-version = "0.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
-dependencies = [
- "bitflags 2.13.1",
-]
-
 [[package]]
 name = "ref-cast"
 version = "1.0.27"
@@ -2217,15 +2067,6 @@ version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
-[[package]]
-name = "repr_offset"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1070755bd29dffc19d0971cab794e607839ba2ef4b69a9e6fbc8733c1b72ea"
-dependencies = [
- "tstr",
-]
-
 [[package]]
 name = "rmp"
 version = "0.8.15"
@@ -2312,15 +2153,6 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.6"
@@ -2959,45 +2791,18 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae62f7eae5eb549c71b76658648b72cc6111f2d87d24a1e31fa907f4943e3ce"
 
-[[package]]
-name = "tstr"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f8e0294f14baae476d0dd0a2d780b2e24d66e349a9de876f5126777a37bdba7"
-dependencies = [
- "tstr_proc_macros",
-]
-
-[[package]]
-name = "tstr_proc_macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78122066b0cb818b8afd08f7ed22f7fdbc3e90815035726f0840d0d26c0747a"
-
 [[package]]
 name = "twox-hash"
 version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
 
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
 [[package]]
 name = "typenum"
 version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
-[[package]]
-name = "typewit"
-version = "1.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214ca0b2191785cbc06209b9ca1861e048e39b5ba33574b3cedd58363d5bb5f6"
-
 [[package]]
 name = "ucd-trie"
 version = "0.1.7"
@@ -3486,22 +3291,6 @@ dependencies = [
  "wiggle-generate",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -3511,12 +3300,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-link"
 version = "0.2.1"
diff --git a/Cargo.toml b/Cargo.toml
index 75b9a9f..20817a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,23 +32,23 @@ eyre = "0.6.8"
 # needs real I/O (git fetch, filesystem), so it's off by default for
 # `comline-core`'s wasm32 consumers (the playground editor, the language
 # server); the CLI is the one consumer that actually runs `comline build`.
-comline-core = { git = "https://github.com/ComlineProject/core", rev = "b933209052b06b328ee3da3355665faa0787063d", features = ["deps"] }
+comline-core = { git = "https://github.com/ComlineProject/core", rev = "1669a2fe4dbc5592a96a2964d7ae13e985b76701", features = ["deps"] }
 # All three pinned to revs that agree on one `comline-codegen`, and bumped
 # together: comline-rust and comline-typescript's codegen crates consume
 # `comline-codegen`'s types, so the rev below must be byte-identical to the
 # one *they* pin - Cargo only unifies a git dependency across identical rev
 # strings, and two copies of `GenRequest` are two incompatible types.
-comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "bb89a516af2fdfa28ce7b9c137b53c1478ef4807" }
+comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "6a73541e142ba5895fd628ee444449694382e70a" }
 # The official Markdown and HTML documentation renderers (`comline doc`),
 # linked in like the official generators. Same generation rev as
 # `comline-codegen`.
-comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "bb89a516af2fdfa28ce7b9c137b53c1478ef4807" }
-comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "bb89a516af2fdfa28ce7b9c137b53c1478ef4807" }
-comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "de0b8e51665bbf56f24e23a6f0164044428a9e61", optional = true }
-comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "9952c5ad7400c4005b30e892f6a5e9f974799a48", optional = true }
+comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "6a73541e142ba5895fd628ee444449694382e70a" }
+comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "6a73541e142ba5895fd628ee444449694382e70a" }
+comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "eb04c130356e44a2b88b74a6805e24d0e80bdbcc", optional = true }
+comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "4cad8af36f807f395bdf83dcc29aa290187ca0d0", optional = true }
 # `comline conformance`: the conformance runner (corpus loading, judging,
 # profile proofs) and its case format, a public spec. Pinned by git rev.
-comline-runtime-conformance = { git = "https://github.com/ComlineProject/runtime", rev = "cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9" }
+comline-runtime-conformance = { git = "https://github.com/ComlineProject/runtime", rev = "3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51" }
 # `comline doc open` / `--open`: the system's default handler for a file (a
 # browser for HTML). Exact pin; no default features (`reveal` pulls in D-Bus).
 opener = { version = "=0.9.0", default-features = false }
diff --git a/src/commands/accept.rs b/src/commands/accept.rs
index 22a6d5d..dd4e763 100644
--- a/src/commands/accept.rs
+++ b/src/commands/accept.rs
@@ -47,7 +47,7 @@ pub fn unverified_in(package_dir: &Path) -> Result<Vec<Unverified>> {
             found.push(Unverified {
                 protocol: protocol.to_string(),
                 set: set.to_vec(),
-                reason: reason.map(str::to_string),
+                reason,
             });
         }
     }
@@ -82,7 +82,7 @@ pub fn decide(
         let reason = p
             .reason
             .as_deref()
-            .map(|r| format!(": \"{r}\""))
+            .map(|r| format!(": {r}"))
             .unwrap_or_default();
         ui::detail(format!(
             "{} gives up {}{reason}",
diff --git a/tests/cli/conformance.rs b/tests/cli/conformance.rs
index 1729ab3..6426196 100644
--- a/tests/cli/conformance.rs
+++ b/tests/cli/conformance.rs
@@ -42,8 +42,9 @@ fn implementation(bin: &str) -> String {
         .to_string()
 }
 
-/// The runtime corpus the CLI's `comline-runtime-conformance` comes with:
-/// that crate's directory, from `cargo metadata`.
+/// The runtime corpus the CLI's `comline-runtime-conformance` comes with: the
+/// specification it vendors in `spec/`, in that crate's directory (from
+/// `cargo metadata`).
 fn corpus() -> &'static PathBuf {
     static CORPUS: OnceLock<PathBuf> = OnceLock::new();
     CORPUS.get_or_init(|| {
@@ -64,7 +65,7 @@ fn corpus() -> &'static PathBuf {
             .as_str()
             .unwrap()
             .to_string();
-        Path::new(&manifest).parent().unwrap().to_path_buf()
+        Path::new(&manifest).parent().unwrap().join("spec")
     })
 }
 
diff --git a/tests/fixtures/conformance/Cargo.lock b/tests/fixtures/conformance/Cargo.lock
index 1f7d76f..b3ff5f2 100644
--- a/tests/fixtures/conformance/Cargo.lock
+++ b/tests/fixtures/conformance/Cargo.lock
@@ -2,78 +2,12 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "abi_stable"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d6512d3eb05ffe5004c59c206de7f99c34951504056ce23fc953842f12c445"
-dependencies = [
- "abi_stable_derive",
- "abi_stable_shared",
- "const_panic",
- "core_extensions",
- "crossbeam-channel",
- "generational-arena",
- "libloading 0.7.4",
- "lock_api",
- "parking_lot",
- "paste",
- "repr_offset",
- "rustc_version",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "abi_stable_derive"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7178468b407a4ee10e881bc7a328a65e739f0863615cca4429d43916b05e898"
-dependencies = [
- "abi_stable_shared",
- "as_derive_utils",
- "core_extensions",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 1.0.109",
- "typed-arena",
-]
-
-[[package]]
-name = "abi_stable_shared"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b5df7688c123e63f4d4d649cba63f2967ba7f7861b1664fca3f77d3dad2b63"
-dependencies = [
- "core_extensions",
-]
-
-[[package]]
-name = "as_derive_utils"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff3c96645900a44cf11941c111bd08a6573b0e2f9f69bc9264b179d8fae753c4"
-dependencies = [
- "core_extensions",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
-[[package]]
-name = "bitflags"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
-
 [[package]]
 name = "bytemuck"
 version = "1.25.2"
@@ -91,19 +25,18 @@ checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn",
 ]
 
 [[package]]
-name = "cfg-if"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
+name = "comline-catalog"
+version = "0.10.0"
+source = "git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51#3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51"
 
 [[package]]
 name = "comline-reference"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/runtime?rev=cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9#cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9"
+source = "git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51#3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51"
 dependencies = [
  "comline-runtime",
  "comline-runtime-conformance",
@@ -114,11 +47,9 @@ dependencies = [
 [[package]]
 name = "comline-runtime"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/runtime?rev=cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9#cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9"
+source = "git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51#3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51"
 dependencies = [
- "abi_stable",
  "bytemuck",
- "libloading 0.8.9",
  "rmp",
  "rmp-serde",
  "serde",
@@ -128,8 +59,9 @@ dependencies = [
 [[package]]
 name = "comline-runtime-conformance"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/runtime?rev=cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9#cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9"
+source = "git+https://github.com/ComlineProject/runtime?rev=3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51#3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51"
 dependencies = [
+ "comline-catalog",
  "comline-runtime",
  "serde",
  "serde_json",
@@ -143,95 +75,12 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "const_panic"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9603f79528ece8163c496f8932121cb36cfe46259e9c907bb3d8205139d7caa3"
-dependencies = [
- "typewit",
-]
-
-[[package]]
-name = "core_extensions"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bb5e5d0269fd4f739ea6cedaf29c16d81c27a7ce7582008e90eb50dcd57003"
-dependencies = [
- "core_extensions_proc_macros",
-]
-
-[[package]]
-name = "core_extensions_proc_macros"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533d38ecd2709b7608fb8e18e4504deb99e9a72879e6aa66373a76d8dc4259ea"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
-
-[[package]]
-name = "generational-arena"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
-[[package]]
-name = "libc"
-version = "0.2.191"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
-dependencies = [
- "scopeguard",
-]
-
 [[package]]
 name = "memchr"
 version = "2.8.3"
@@ -247,35 +96,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-link",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.107"
@@ -294,24 +114,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "repr_offset"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1070755bd29dffc19d0971cab794e607839ba2ef4b69a9e6fbc8733c1b72ea"
-dependencies = [
- "tstr",
-]
-
 [[package]]
 name = "rmp"
 version = "0.8.15"
@@ -331,27 +133,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "semver"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
-
 [[package]]
 name = "serde"
 version = "1.0.229"
@@ -379,7 +160,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn",
 ]
 
 [[package]]
@@ -395,23 +176,6 @@ dependencies = [
  "zmij",
 ]
 
-[[package]]
-name = "smallvec"
-version = "1.16.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "3.0.9"
@@ -423,67 +187,12 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "tstr"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f8e0294f14baae476d0dd0a2d780b2e24d66e349a9de876f5126777a37bdba7"
-dependencies = [
- "tstr_proc_macros",
-]
-
-[[package]]
-name = "tstr_proc_macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78122066b0cb818b8afd08f7ed22f7fdbc3e90815035726f0840d0d26c0747a"
-
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
-[[package]]
-name = "typewit"
-version = "1.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214ca0b2191785cbc06209b9ca1861e048e39b5ba33574b3cedd58363d5bb5f6"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-
 [[package]]
 name = "zmij"
 version = "1.0.23"
diff --git a/tests/fixtures/conformance/Cargo.toml b/tests/fixtures/conformance/Cargo.toml
index 6dea418..321d909 100644
--- a/tests/fixtures/conformance/Cargo.toml
+++ b/tests/fixtures/conformance/Cargo.toml
@@ -12,5 +12,5 @@ publish = false
 [dependencies]
 # The runtime rev the CLI pins `comline-runtime-conformance` at, so the
 # reference answers as the vectors the CLI reads were blessed.
-comline-reference = { git = "https://github.com/ComlineProject/runtime", rev = "cf5e06780793d8e71b0ec1133da8fd6c0e42b8e9" }
+comline-reference = { git = "https://github.com/ComlineProject/runtime", rev = "3b9cc9dc53a83fb2830d91b267bd5f477f0a1e51" }
 serde_json = "1.0"
diff --git a/tests/fixtures/generators/Cargo.lock b/tests/fixtures/generators/Cargo.lock
index 432fdfe..6c4d6ab 100644
--- a/tests/fixtures/generators/Cargo.lock
+++ b/tests/fixtures/generators/Cargo.lock
@@ -76,10 +76,15 @@ dependencies = [
  "half",
 ]
 
+[[package]]
+name = "comline-catalog"
+version = "0.10.0"
+source = "git+https://github.com/ComlineProject/specification?rev=69d88327431275017ccce99fec43060467515a9f#69d88327431275017ccce99fec43060467515a9f"
+
 [[package]]
 name = "comline-codegen"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/generation?rev=55d3fdc064ae3216f313975ce08071f3e5f32d3f#55d3fdc064ae3216f313975ce08071f3e5f32d3f"
+source = "git+https://github.com/ComlineProject/generation?rev=6a73541e142ba5895fd628ee444449694382e70a#6a73541e142ba5895fd628ee444449694382e70a"
 dependencies = [
  "comline-core",
  "eyre",
@@ -93,7 +98,7 @@ dependencies = [
 [[package]]
 name = "comline-codegen-rust"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/comline-rust?rev=be90c80b97266025c4a4b69588f26cff1ca51e06#be90c80b97266025c4a4b69588f26cff1ca51e06"
+source = "git+https://github.com/ComlineProject/comline-rust?rev=eb04c130356e44a2b88b74a6805e24d0e80bdbcc#eb04c130356e44a2b88b74a6805e24d0e80bdbcc"
 dependencies = [
  "comline-codegen",
  "comline-core",
@@ -103,10 +108,11 @@ dependencies = [
 [[package]]
 name = "comline-core"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/core?rev=d11d82b95c5dfa0c72476eb0947772533b7ce7e5#d11d82b95c5dfa0c72476eb0947772533b7ce7e5"
+source = "git+https://github.com/ComlineProject/core?rev=1669a2fe4dbc5592a96a2964d7ae13e985b76701#1669a2fe4dbc5592a96a2964d7ae13e985b76701"
 dependencies = [
  "blake3",
  "ciborium",
+ "comline-catalog",
  "comline-core-stdlib",
  "eyre",
  "lz4_flex",
@@ -120,12 +126,12 @@ dependencies = [
 [[package]]
 name = "comline-core-stdlib"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/core?rev=d11d82b95c5dfa0c72476eb0947772533b7ce7e5#d11d82b95c5dfa0c72476eb0947772533b7ce7e5"
+source = "git+https://github.com/ComlineProject/core?rev=1669a2fe4dbc5592a96a2964d7ae13e985b76701#1669a2fe4dbc5592a96a2964d7ae13e985b76701"
 
 [[package]]
 name = "comline-doc-html"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/generation?rev=55d3fdc064ae3216f313975ce08071f3e5f32d3f#55d3fdc064ae3216f313975ce08071f3e5f32d3f"
+source = "git+https://github.com/ComlineProject/generation?rev=6a73541e142ba5895fd628ee444449694382e70a#6a73541e142ba5895fd628ee444449694382e70a"
 dependencies = [
  "comline-codegen",
  "eyre",
@@ -136,7 +142,7 @@ dependencies = [
 [[package]]
 name = "comline-doc-markdown"
 version = "0.1.0"
-source = "git+https://github.com/ComlineProject/generation?rev=55d3fdc064ae3216f313975ce08071f3e5f32d3f#55d3fdc064ae3216f313975ce08071f3e5f32d3f"
+source = "git+https://github.com/ComlineProject/generation?rev=6a73541e142ba5895fd628ee444449694382e70a#6a73541e142ba5895fd628ee444449694382e70a"
 dependencies = [
  "comline-codegen",
  "eyre",
diff --git a/tests/fixtures/generators/Cargo.toml b/tests/fixtures/generators/Cargo.toml
index 6e3c9b4..16e2925 100644
--- a/tests/fixtures/generators/Cargo.toml
+++ b/tests/fixtures/generators/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 [dependencies]
 # The same revs the CLI pins, so the real generator's output is comparable
 # byte for byte with the CLI's built-in one.
-comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "55d3fdc064ae3216f313975ce08071f3e5f32d3f" }
-comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "55d3fdc064ae3216f313975ce08071f3e5f32d3f" }
-comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "55d3fdc064ae3216f313975ce08071f3e5f32d3f" }
-comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "be90c80b97266025c4a4b69588f26cff1ca51e06" }
+comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "6a73541e142ba5895fd628ee444449694382e70a" }
+comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "6a73541e142ba5895fd628ee444449694382e70a" }
+comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "6a73541e142ba5895fd628ee444449694382e70a" }
+comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "eb04c130356e44a2b88b74a6805e24d0e80bdbcc" }